the common/mm_io.h include implies common.h

lib/avilib-0.6.10/xio.cpp

@@ -21,7 +21,8 @@
  *
  */
 
-#include "common/os.h"
+#include "common/common.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -34,7 +35,7 @@
 
 #include "common/mm_io.h"
 
-extern "C" {
+#include "xio.h"
 
 #define MAX_INSTANCES 4000
 
@@ -165,5 +166,3 @@ xio_fstat(int fd,
   // Not implemented for mkvtoolnix.
   return -1;
 }
-
-}

src/common/bit_cursor.h

@@ -15,7 +15,7 @@
 #ifndef __MTX_COMMON_BIT_CURSOR_H
 #define __MTX_COMMON_BIT_CURSOR_H
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include "common/mm_io.h"
 

src/common/chapters/writer.cpp

@@ -11,12 +11,10 @@
    Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include <expat.h>
 
-#include <string>
-
 #include <matroska/KaxChapters.h>
 
 #include "common/chapters/chapters.h"

src/common/id3.cpp

@@ -11,7 +11,7 @@
    Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include "common/mm_io.h"
 

src/common/kax_file.h

@@ -14,7 +14,7 @@
 #ifndef __MTX_COMMON_KAX_FILE_H
 #define __MTX_COMMON_KAX_FILE_H
 
-#include "os.h"
+#include "common.h"
 
 #include <matroska/KaxSegment.h>
 #include <matroska/KaxCluster.h>

src/common/mm_multi_file_io.h

@@ -14,7 +14,7 @@
 #ifndef __MTX_COMMON_MM_MULTI_FILE_IO_H
 #define __MTX_COMMON_MM_MULTI_FILE_IO_H
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include <boost/filesystem.hpp>
 #include <string>

src/common/output.cpp

@@ -11,7 +11,7 @@
    Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include "common/ebml.h"
 #include "common/mm_io.h"

src/common/random.cpp

@@ -11,7 +11,7 @@
    Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
-#include "common/os.h"
+#include "common/common.h"
 
 #if !defined(SYS_WINDOWS)
 # include <sys/time.h>

src/common/random.h

@@ -14,7 +14,7 @@
 #ifndef __MTX_COMMON_RANDOM_H
 #define __MTX_COMMON_RANDOM_H
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include "common/mm_io.h"
 #include "common/smart_pointers.h"

src/common/vint.h

@@ -14,7 +14,7 @@
 #ifndef __MTX_COMMON_VINT_H
 #define __MTX_COMMON_VINT_H
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include <ebml/EbmlId.h>
 

src/common/wavpack.h

@@ -15,7 +15,8 @@
 #ifndef __MTX_COMMON_WAVPACK_COMMON_H
 #define __MTX_COMMON_WAVPACK_COMMON_H
 
-#include "common/os.h"
+#include "common/common.h"
+
 #include "common/mm_io.h"
 
 /* All integers are little endian. */

src/common/xml/element_writer.h

@@ -14,10 +14,9 @@
 #ifndef __MTX_COMMON_XML_ELEMENT_WRITER_H
 #define __MTX_COMMON_XML_ELEMENT_WRITER_H
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include <expat.h>
-#include <string>
 
 #include "common/mm_io.h"
 #include "common/xml/element_parser.h"

src/extract/mkvextract.h

@@ -13,12 +13,11 @@
 #ifndef __MKVEXTRACT_H
 #define __MKVEXTRACT_H
 
+#include "common/common.h"
+
 #include <avilib.h>
 
 #include <ogg/ogg.h>
-#include <vector>
-
-#include <ebml/EbmlElement.h>
 
 #include <matroska/KaxChapters.h>
 #include <matroska/KaxTags.h>

src/input/r_asf.h

@@ -14,7 +14,7 @@
 #ifndef __R_ASF_H
 #define __R_ASF_H
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include "common/mm_io.h"
 #include "merge/pr_generic.h"

src/input/r_corepicture.cpp

@@ -11,7 +11,7 @@
    Written by Steve Lhomme <steve.lhomme@free.fr>.
 */
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include <algorithm>
 

src/input/r_flac.h

@@ -14,13 +14,12 @@
 #ifndef __R_FLAC_H
 #define __R_FLAC_H
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include "common/mm_io.h"
 #include "merge/pr_generic.h"
 
 #if defined(HAVE_FLAC_FORMAT_H)
-#include <vector>
 
 #include <FLAC/export.h>
 #if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8

src/input/r_flv.h

@@ -14,7 +14,7 @@
 #ifndef __R_FLV_H
 #define __R_FLV_H
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include "common/mm_io.h"
 #include "merge/pr_generic.h"

src/input/r_ogm_flac.h

@@ -14,7 +14,7 @@
 #ifndef __R_OGM_FLAC_H
 #define __R_OGM_FLAC_H
 
-#include "common/os.h"
+#include "common/common.h"
 
 #if defined(HAVE_FLAC_FORMAT_H)
 

src/input/r_usf.cpp

@@ -11,7 +11,7 @@
    Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include <algorithm>
 

src/merge/cluster_helper.h

@@ -14,9 +14,7 @@
 #ifndef __CLUSTER_HELPER_C
 #define __CLUSTER_HELPER_C
 
-#include "common/os.h"
-
-#include <vector>
+#include "common/common.h"
 
 #include <matroska/KaxBlock.h>
 #include <matroska/KaxCluster.h>