From 322024d5edd014de0b7d3cef4955bafcfc90f197 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@gmail.com>
Date: Sat, 13 Mar 2010 16:34:26 +0100
Subject: [PATCH] the common.h include is implied by common/error.h so force it
 at the top (for PCH) remove dependencies implied by using common.h

---
 src/common/bitvalue.cpp            | 2 +-
 src/common/chapters/chapters.cpp   | 4 +---
 src/common/chapters/cue_parser.cpp | 4 ++--
 src/common/chapters/xml_parser.cpp | 4 ++--
 src/common/kate.h                  | 2 +-
 src/common/locale_string.h         | 4 +---
 src/common/mm_io.h                 | 3 +--
 src/common/theora.h                | 2 +-
 src/merge/pr_generic.h             | 4 +---
 9 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/common/bitvalue.cpp b/src/common/bitvalue.cpp
index 82b780c7f..8869bd760 100644
--- a/src/common/bitvalue.cpp
+++ b/src/common/bitvalue.cpp
@@ -11,7 +11,7 @@
    Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include "common/bitvalue.h"
 #include "common/error.h"
diff --git a/src/common/chapters/chapters.cpp b/src/common/chapters/chapters.cpp
index 0b612f08b..397df0a89 100644
--- a/src/common/chapters/chapters.cpp
+++ b/src/common/chapters/chapters.cpp
@@ -12,12 +12,10 @@
    \author Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include <algorithm>
-#include <boost/regex.hpp>
 #include <cassert>
-#include <string>
 
 #include <matroska/KaxChapters.h>
 
diff --git a/src/common/chapters/cue_parser.cpp b/src/common/chapters/cue_parser.cpp
index 35b7e6a70..860e3df9a 100644
--- a/src/common/chapters/cue_parser.cpp
+++ b/src/common/chapters/cue_parser.cpp
@@ -13,11 +13,11 @@
    Vegard Pettersen <vegard_p@broadpark.no>
 */
 
+#include "common/common.h"
+
 #include <ctype.h>
 #include <stdarg.h>
 
-#include <string>
-
 #include <matroska/KaxChapters.h>
 #include <matroska/KaxTag.h>
 #include <matroska/KaxTags.h>
diff --git a/src/common/chapters/xml_parser.cpp b/src/common/chapters/xml_parser.cpp
index e525d4b46..452d2fa08 100644
--- a/src/common/chapters/xml_parser.cpp
+++ b/src/common/chapters/xml_parser.cpp
@@ -11,12 +11,12 @@
    Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
+#include "common/common.h"
+
 #include <expat.h>
 #include <ctype.h>
 #include <stdarg.h>
 
-#include <string>
-
 #include <matroska/KaxChapters.h>
 
 #include "common/chapters/chapters.h"
diff --git a/src/common/kate.h b/src/common/kate.h
index 4f73e86c3..30cc2f21c 100644
--- a/src/common/kate.h
+++ b/src/common/kate.h
@@ -15,7 +15,7 @@
 #ifndef __MTX_COMMON_KATE_COMMON_H
 #define __MTX_COMMON_KATE_COMMON_H
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include "common/error.h"
 
diff --git a/src/common/locale_string.h b/src/common/locale_string.h
index 2c3835ec2..22f4c32ba 100644
--- a/src/common/locale_string.h
+++ b/src/common/locale_string.h
@@ -14,9 +14,7 @@
 #ifndef __MTX_COMMON_LOCALE_STRING_H
 #define __MTX_COMMON_LOCALE_STRING_H
 
-#include "common/os.h"
-
-#include <string>
+#include "common/common.h"
 
 #include "common/error.h"
 
diff --git a/src/common/mm_io.h b/src/common/mm_io.h
index c21b0413d..515be16a3 100644
--- a/src/common/mm_io.h
+++ b/src/common/mm_io.h
@@ -14,9 +14,8 @@
 #ifndef __MTX_COMMON_MM_IO_H
 #define __MTX_COMMON_MM_IO_H
 
-#include "common/os.h"
+#include "common/common.h"
 
-#include <string>
 #include <stack>
 #if HAVE_POSIX_FADVISE
 # include <unistd.h>
diff --git a/src/common/theora.h b/src/common/theora.h
index 568425e38..8b146152b 100644
--- a/src/common/theora.h
+++ b/src/common/theora.h
@@ -14,7 +14,7 @@
 #ifndef __MTX_COMMON_THEORA_COMMON_H
 #define __MTX_COMMON_THEORA_COMMON_H
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include "common/error.h"
 
diff --git a/src/merge/pr_generic.h b/src/merge/pr_generic.h
index de92db7f7..3023eb4bf 100644
--- a/src/merge/pr_generic.h
+++ b/src/merge/pr_generic.h
@@ -15,12 +15,10 @@
 #ifndef __PR_GENERIC_H
 #define __PR_GENERIC_H
 
-#include "common/os.h"
+#include "common/common.h"
 
 #include <boost/logic/tribool.hpp>
 #include <deque>
-#include <map>
-#include <vector>
 
 #include <matroska/KaxAttachments.h>
 #include <matroska/KaxBlock.h>