diff --git a/lib/arch/CArchMiscWindows.h b/lib/arch/CArchMiscWindows.h
index 2354f793..51433ba4 100644
--- a/lib/arch/CArchMiscWindows.h
+++ b/lib/arch/CArchMiscWindows.h
@@ -15,6 +15,8 @@
 #ifndef CARCHMISCWINDOWS_H
 #define CARCHMISCWINDOWS_H
 
+#include "common.h"
+
 //! Miscellaneous win32 functions.
 class CArchMiscWindows {
 public:
diff --git a/lib/arch/XArch.h b/lib/arch/XArch.h
index 131e07ed..44c9394d 100644
--- a/lib/arch/XArch.h
+++ b/lib/arch/XArch.h
@@ -15,6 +15,7 @@
 #ifndef XARCH_H
 #define XARCH_H
 
+#include "common.h"
 #include "stdstring.h"
 
 //! Generic thread exception
diff --git a/lib/base/CLog.h b/lib/base/CLog.h
index d76f9140..88feea92 100644
--- a/lib/base/CLog.h
+++ b/lib/base/CLog.h
@@ -17,7 +17,6 @@
 
 #include "common.h"
 #include "IArchMultithread.h"
-#include "IInterface.h"
 #include "stdlist.h"
 #include <stdarg.h>
 
diff --git a/lib/base/CString.h b/lib/base/CString.h
index e3eaa3b0..bc905009 100644
--- a/lib/base/CString.h
+++ b/lib/base/CString.h
@@ -15,6 +15,7 @@
 #ifndef CSTRING_H
 #define CSTRING_H
 
+#include "common.h"
 #include "stdstring.h"
 
 // use standard C++ string class for our string class
diff --git a/lib/base/ILogOutputter.h b/lib/base/ILogOutputter.h
index b4152c9e..585598c2 100644
--- a/lib/base/ILogOutputter.h
+++ b/lib/base/ILogOutputter.h
@@ -15,6 +15,7 @@
 #ifndef ILOGOUTPUTTER_H
 #define ILOGOUTPUTTER_H
 
+#include "IInterface.h"
 #include "CLog.h"
 
 //! Outputter interface
diff --git a/lib/mt/CCondVar.h b/lib/mt/CCondVar.h
index 1b92ffd7..78fbfe90 100644
--- a/lib/mt/CCondVar.h
+++ b/lib/mt/CCondVar.h
@@ -17,7 +17,6 @@
 
 #include "CMutex.h"
 #include "BasicTypes.h"
-#include "IArchMultithread.h"
 
 class CStopwatch;
 
diff --git a/lib/mt/CLock.h b/lib/mt/CLock.h
index 33a14f68..f00e0cd1 100644
--- a/lib/mt/CLock.h
+++ b/lib/mt/CLock.h
@@ -15,6 +15,8 @@
 #ifndef CLOCK_H
 #define CLOCK_H
 
+#include "common.h"
+
 class CMutex;
 class CCondVarBase;
 
diff --git a/lib/mt/CThread.h b/lib/mt/CThread.h
index aaa5a097..6592426b 100644
--- a/lib/mt/CThread.h
+++ b/lib/mt/CThread.h
@@ -15,7 +15,6 @@
 #ifndef CTHREAD_H
 #define CTHREAD_H
 
-#include "common.h"
 #include "IArchMultithread.h"
 
 class IJob;
diff --git a/lib/mt/CTimerThread.h b/lib/mt/CTimerThread.h
index 11a0da73..c0a43c51 100644
--- a/lib/mt/CTimerThread.h
+++ b/lib/mt/CTimerThread.h
@@ -15,6 +15,8 @@
 #ifndef CTIMERTHREAD_H
 #define CTIMERTHREAD_H
 
+#include "common.h"
+
 class CThread;
 
 //! A timer thread