clean-up the includes

src/cli.cc

@@ -11,10 +11,9 @@
 
 #include <getopt.h>
 #include <limits.h>
+#include <string.h>
 #include <unistd.h>
 
-#include <memory>
-
 static const char* version = PROJECT_NAME " version " PROJECT_VERSION "\n";
 
 static const char* usage = 1 + R"raw(

src/ogg.cc

@@ -8,9 +8,9 @@
  * specialized layer above libogg and stdio.
  */
 
-#include "opustags.h"
+#include <opustags.h>
 
-#include <cstdio>
+#include <string.h>
 
 using namespace std::literals::string_literals;
 

src/opus.cc

@@ -22,11 +22,9 @@
  *
  */
 
-#include "opustags.h"
+#include <opustags.h>
 
-#include <cstdlib>
-#include <cstdio>
-#include <cstring>
+#include <string.h>
 
 #ifdef __APPLE__
 #include <libkern/OSByteOrder.h>

src/opustags.h

@@ -21,11 +21,11 @@
  *
  */
 
-#include <ogg/ogg.h>
+#pragma once
+
+#include <ogg/ogg.h>
+#include <stdio.h>
 
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
 #include <list>
 #include <memory>
 #include <string>

t/cli.cc

@@ -1,6 +1,8 @@
 #include <opustags.h>
 #include "tap.h"
 
+#include <string.h>
+
 const char *user_comments = R"raw(
 TITLE=a b c
 

t/ogg.cc

@@ -1,6 +1,8 @@
 #include <opustags.h>
 #include "tap.h"
 
+#include <string.h>
+
 static void check_ref_ogg()
 {
 	ot::file input = fopen("gobble.opus", "r");

t/opus.cc

@@ -1,15 +1,7 @@
-/**
- * \file t/opus.cc
- *
- * Entry point of the unit test suite.
- * Follows the TAP protocol.
- *
- */
-
 #include <opustags.h>
 #include "tap.h"
 
-#include <cstring>
+#include <string.h>
 
 using namespace std::literals::string_literals;
 

t/tap.h

@@ -5,6 +5,8 @@
  * Helpers for following the Test Anything Protocol.
  */
 
+#pragma once
+
 #include <exception>
 #include <iostream>