WooHoo me again ;)

I took out the following from the includes in the intern dir that still had
it:
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif

Kent
--
mein@cs.umn.edu

128 files changed, 0 insertions, 579 deletions

diff --git a/intern/bmfont/BMF_Api.h b/intern/bmfont/BMF_Api.h
index 608af5e536c..001a9788920 100644
--- a/intern/bmfont/BMF_Api.h
+++ b/intern/bmfont/BMF_Api.h
@@ -43,10 +43,6 @@
 #ifndef __BMF_API_H
 #define __BMF_API_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" { 
 #endif
diff --git a/intern/bmfont/BMF_Fonts.h b/intern/bmfont/BMF_Fonts.h
index 3a962bb9058..bf7c370e47e 100644
--- a/intern/bmfont/BMF_Fonts.h
+++ b/intern/bmfont/BMF_Fonts.h
@@ -39,10 +39,6 @@
 #ifndef __BMF_FONTS_H
 #define __BMF_FONTS_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "BMF_Settings.h"
 
 typedef enum
diff --git a/intern/bmfont/BMF_Settings.h b/intern/bmfont/BMF_Settings.h
index b4629511512..247f9e474fc 100644
--- a/intern/bmfont/BMF_Settings.h
+++ b/intern/bmfont/BMF_Settings.h
@@ -39,10 +39,6 @@
 #ifndef __BMF_SETTINGS_H
 #define __BMF_SETTINGS_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 /* This font is included always */
 #define BMF_INCLUDE_HELV10 1
 
diff --git a/intern/bmfont/intern/BMF_BitmapFont.h b/intern/bmfont/intern/BMF_BitmapFont.h
index 2a363166179..30cfd650353 100644
--- a/intern/bmfont/intern/BMF_BitmapFont.h
+++ b/intern/bmfont/intern/BMF_BitmapFont.h
@@ -38,10 +38,6 @@
 #ifndef __BMF_BITMAP_FONT_H
 #define __BMF_BITMAP_FONT_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "BMF_FontData.h"
 
 /**
diff --git a/intern/bmfont/intern/BMF_FontData.h b/intern/bmfont/intern/BMF_FontData.h
index 0f4f92318dd..512bdf1a53d 100644
--- a/intern/bmfont/intern/BMF_FontData.h
+++ b/intern/bmfont/intern/BMF_FontData.h
@@ -38,10 +38,6 @@
 #ifndef __BMF_FONTDATA_H__
 #define __BMF_FONTDATA_H__
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 typedef struct {
 	signed char width, height;
 	signed char xorig, yorig;
diff --git a/intern/bsp/extern/CSG_BooleanOps.h b/intern/bsp/extern/CSG_BooleanOps.h
index c7f854ff5d7..418b81a62b3 100755
--- a/intern/bsp/extern/CSG_BooleanOps.h
+++ b/intern/bsp/extern/CSG_BooleanOps.h
@@ -30,13 +30,8 @@
  */
 
 #ifndef CSG_BOOLEANOPS_H
-
 #define CSG_BOOLEANOPS_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 
 /**
  * @section Interface structures for CSG module.
diff --git a/intern/bsp/intern/BSP_CSGException.h b/intern/bsp/intern/BSP_CSGException.h
index bfac6fd346e..c2d79630be2 100755
--- a/intern/bsp/intern/BSP_CSGException.h
+++ b/intern/bsp/intern/BSP_CSGException.h
@@ -30,13 +30,8 @@
  */
 
 #ifndef NAN_INCLUDED_CSGException_h
-
 #define NAN_INCLUDED_CSGException_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 // stick in more error types as you think of them
 
 enum BSP_ExceptionType{
diff --git a/intern/bsp/intern/BSP_CSGHelper.h b/intern/bsp/intern/BSP_CSGHelper.h
index e27de3687a4..b6b88422358 100644
--- a/intern/bsp/intern/BSP_CSGHelper.h
+++ b/intern/bsp/intern/BSP_CSGHelper.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef BSP_CSGHELPER_H
-
 #define BSP_CSGHELPER_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 class BSP_CSGMesh;
 class BSP_MeshFragment;
 
diff --git a/intern/bsp/intern/BSP_CSGISplitter.h b/intern/bsp/intern/BSP_CSGISplitter.h
index 826b2c0d477..17392fd07be 100755
--- a/intern/bsp/intern/BSP_CSGISplitter.h
+++ b/intern/bsp/intern/BSP_CSGISplitter.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef BSP_CSGISplitter_h
-
 #define BSP_CSGISplitter_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 class BSP_MeshFragment;
 class BSP_CSGMesh;
 
diff --git a/intern/bsp/intern/BSP_CSGMesh.h b/intern/bsp/intern/BSP_CSGMesh.h
index 4b634f3aa50..28a27ce70d2 100755
--- a/intern/bsp/intern/BSP_CSGMesh.h
+++ b/intern/bsp/intern/BSP_CSGMesh.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef NAN_INCLUDED_BSP_CSGMesh_h
-
 #define NAN_INCLUDED_BSP_CSGMesh_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "BSP_MeshPrimitives.h"
 #include "MEM_SmartPtr.h"
 #include "MEM_RefCountPtr.h"
diff --git a/intern/bsp/intern/BSP_CSGMeshBuilder.h b/intern/bsp/intern/BSP_CSGMeshBuilder.h
index c6763f11755..8216f972c74 100755
--- a/intern/bsp/intern/BSP_CSGMeshBuilder.h
+++ b/intern/bsp/intern/BSP_CSGMeshBuilder.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef BSP_CSGMeshBuilder_h
-
 #define BSP_CSGMeshBuilder_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "../extern/CSG_BooleanOps.h"
 #include "BSP_CSGMesh.h"
 #include "MEM_NonCopyable.h"
diff --git a/intern/bsp/intern/BSP_CSGMeshSplitter.h b/intern/bsp/intern/BSP_CSGMeshSplitter.h
index 141c498b909..44aa4ad949a 100755
--- a/intern/bsp/intern/BSP_CSGMeshSplitter.h
+++ b/intern/bsp/intern/BSP_CSGMeshSplitter.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef BSP_CSGMeshSplitter_h
-
 #define BSP_CSGMeshSplitter_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 class BSP_MeshFragment;
 class MT_Plane3;
 class BSP_CSGMesh;
diff --git a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
index 5fb6d794e7a..8255b4f7d2a 100755
--- a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
+++ b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef BSP_CSGMesh_CFIterator_h
-
 #define BSP_CSGMesh_CFIterator_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "BSP_CSGMesh.h"
 #include "../extern/CSG_BooleanOps.h"
 /**
diff --git a/intern/bsp/intern/BSP_CSGNCMeshSplitter.h b/intern/bsp/intern/BSP_CSGNCMeshSplitter.h
index 1fcfbcac981..407a4c8b46f 100755
--- a/intern/bsp/intern/BSP_CSGNCMeshSplitter.h
+++ b/intern/bsp/intern/BSP_CSGNCMeshSplitter.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef BSP_CSGNCMeshSplitter_h
-
 #define BSP_CSGNCMeshSplitter_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 class BSP_MeshFragment;
 class MT_Plane3;
 class BSP_CSGMesh;
diff --git a/intern/bsp/intern/BSP_CSGUserData.h b/intern/bsp/intern/BSP_CSGUserData.h
index 1b3676992d5..8b008b83845 100755
--- a/intern/bsp/intern/BSP_CSGUserData.h
+++ b/intern/bsp/intern/BSP_CSGUserData.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef BSP_CSGUserData_h
-
 #define BSP_CSGUserData_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include <vector>
 
 /**
diff --git a/intern/bsp/intern/BSP_FragNode.h b/intern/bsp/intern/BSP_FragNode.h
index 7a674269b27..ed4b6a9f609 100755
--- a/intern/bsp/intern/BSP_FragNode.h
+++ b/intern/bsp/intern/BSP_FragNode.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef BSP_FragNode_h
-
 #define BSP_FragNode_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "BSP_FragTree.h"
 #include "BSP_MeshFragment.h"
 #include "MT_Plane3.h"
diff --git a/intern/bsp/intern/BSP_FragTree.h b/intern/bsp/intern/BSP_FragTree.h
index 02fb7a8e66e..caf7234d739 100755
--- a/intern/bsp/intern/BSP_FragTree.h
+++ b/intern/bsp/intern/BSP_FragTree.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef BSP_FragTree_h
-
 #define BSP_FragTree_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 class BSP_FragNode;
 
 #include "MEM_SmartPtr.h"
diff --git a/intern/bsp/intern/BSP_MeshFragment.h b/intern/bsp/intern/BSP_MeshFragment.h
index ac1c21a338d..8ed3b9010e4 100755
--- a/intern/bsp/intern/BSP_MeshFragment.h
+++ b/intern/bsp/intern/BSP_MeshFragment.h
@@ -30,18 +30,11 @@
  */
 
 #ifndef NAN_INCLUDED_BSP_MeshFragment_h
-
 #define NAN_INCLUDED_BSP_MeshFragment_h
 
-
 #define BSP_SPLIT_EPSILON MT_Scalar(1e-5)
 
 #include <vector>
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "BSP_MeshPrimitives.h"
 
 
diff --git a/intern/bsp/intern/BSP_MeshPrimitives.h b/intern/bsp/intern/BSP_MeshPrimitives.h
index f3adfcffdc2..adfdb57e5f5 100644
--- a/intern/bsp/intern/BSP_MeshPrimitives.h
+++ b/intern/bsp/intern/BSP_MeshPrimitives.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef NAN_INCLUDED_BSP_MeshPrimitives
-
 #define NAN_INCLUDED_BSP_MeshPrimitives
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "CTR_TaggedIndex.h"
 #include "MT_Vector3.h"
 #include "MT_Plane3.h"
diff --git a/intern/bsp/intern/BSP_Triangulate.h b/intern/bsp/intern/BSP_Triangulate.h
index 44a2b8c960a..858be88419c 100755
--- a/intern/bsp/intern/BSP_Triangulate.h
+++ b/intern/bsp/intern/BSP_Triangulate.h
@@ -49,13 +49,7 @@
 /** whatever your own Vector implementation might be.           **/
 /*****************************************************************/
 
-
 #include <vector>  // Include STL vector class.
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MT_Point3.h"
 #include "BSP_MeshPrimitives.h"
 
diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h
index 05da968c69c..042c73174a6 100755
--- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h
+++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h
@@ -30,15 +30,8 @@
  */
 
 #ifndef BSP_GhostTest_h
-
 #define BSP_GhostTest_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-
 #include "GHOST_IEventConsumer.h"
 #include "MT_Vector3.h"
 #include "BSP_TMesh.h"
diff --git a/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h b/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h
index f89462395bb..314b9691137 100755
--- a/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h
+++ b/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h
@@ -30,16 +30,8 @@
  */
 
 #ifndef BSP_MeshDrawer_h
-
 #define BSP_MeshDrawer_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-
-
 class BSP_TMesh;
 class MT_Vector3;
 
diff --git a/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h b/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h
index 4a4b12fb8be..d2e9b8cd2cc 100755
--- a/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h
+++ b/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef BSP_PlyLoader_h
-
 #define BSP_PlyLoader_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "MEM_SmartPtr.h"
 #include "BSP_TMesh.h"
 
diff --git a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
index 8b8a365ff78..4322fedbed4 100755
--- a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
+++ b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef BSP_TMesh_h
-
 #define BSP_TMesh_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "MT_Point3.h"
 #include "MT_Vector3.h"
 #include "MT_Transform.h"
diff --git a/intern/bsp/test/BSP_GhostTest/ply.h b/intern/bsp/test/BSP_GhostTest/ply.h
index 04844069971..7947d224c5f 100755
--- a/intern/bsp/test/BSP_GhostTest/ply.h
+++ b/intern/bsp/test/BSP_GhostTest/ply.h
@@ -71,10 +71,6 @@ extern "C" {
 #include <stdio.h>
 #include <stddef.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #define PLY_ASCII      1        /* ascii PLY file */
 #define PLY_BINARY_BE  2        /* binary PLY file, big endian */
 #define PLY_BINARY_LE  3        /* binary PLY file, little endian */
diff --git a/intern/container/CTR_List.h b/intern/container/CTR_List.h
index 23d82d40819..2ca2d60d0e7 100644
--- a/intern/container/CTR_List.h
+++ b/intern/container/CTR_List.h
@@ -64,11 +64,6 @@
 #ifndef CTR_LIST_H
 #define CTR_LIST_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 class CTR_Link {
 public:
     CTR_Link(
diff --git a/intern/container/CTR_Map.h b/intern/container/CTR_Map.h
index cffbe20832c..8329337479b 100644
--- a/intern/container/CTR_Map.h
+++ b/intern/container/CTR_Map.h
@@ -30,13 +30,8 @@
  */
 
 #ifndef CTR_MAP_H
-
 #define CTR_MAP_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 template <class Key, class Value>
 class CTR_Map {
 private:
diff --git a/intern/container/CTR_TaggedIndex.h b/intern/container/CTR_TaggedIndex.h
index aa94f94403f..87bc8a4315e 100644
--- a/intern/container/CTR_TaggedIndex.h
+++ b/intern/container/CTR_TaggedIndex.h
@@ -50,11 +50,6 @@
 
 #include <functional>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 enum {
 
 	empty_tag = 0x0,
diff --git a/intern/container/CTR_TaggedSetOps.h b/intern/container/CTR_TaggedSetOps.h
index 2696e644275..aefe8217389 100644
--- a/intern/container/CTR_TaggedSetOps.h
+++ b/intern/container/CTR_TaggedSetOps.h
@@ -32,11 +32,6 @@
 #ifndef NAN_INCLUDED_LOD_TaggedSetOps_h
 #define NAN_INCLUDED_LOD_TaggedSetOps_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "MEM_NonCopyable.h"
 #include <vector>
 
diff --git a/intern/container/CTR_UHeap.h b/intern/container/CTR_UHeap.h
index 1f7c80fac2a..a7fc33387ee 100644
--- a/intern/container/CTR_UHeap.h
+++ b/intern/container/CTR_UHeap.h
@@ -49,10 +49,6 @@
 
 #include <vector>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MEM_NonCopyable.h"
 
 class CTR_UHeapable {
diff --git a/intern/decimation/extern/LOD_decimation.h b/intern/decimation/extern/LOD_decimation.h
index 12e29a4a409..6ebce0206f3 100644
--- a/intern/decimation/extern/LOD_decimation.h
+++ b/intern/decimation/extern/LOD_decimation.h
@@ -40,10 +40,6 @@
 #ifndef NAN_INCLUDED_LOD_decimation_h
 #define NAN_INCLUDED_LOD_decimation_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/intern/decimation/intern/LOD_DecimationClass.h b/intern/decimation/intern/LOD_DecimationClass.h
index e29b3eb0119..1a3e8dd3620 100644
--- a/intern/decimation/intern/LOD_DecimationClass.h
+++ b/intern/decimation/intern/LOD_DecimationClass.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef NAN_INCLUDED_LOD_DecimationClass_h
-
 #define NAN_INCLUDED_LOD_DecimationClass_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "MEM_SmartPtr.h"
 #include "MEM_NonCopyable.h"
 
diff --git a/intern/decimation/intern/LOD_EdgeCollapser.h b/intern/decimation/intern/LOD_EdgeCollapser.h
index d889ae25921..482eccacec2 100644
--- a/intern/decimation/intern/LOD_EdgeCollapser.h
+++ b/intern/decimation/intern/LOD_EdgeCollapser.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef NAN_INCLDUED_EgdeCollapser_h
-
 #define NAN_INCLDUED_EgdeCollapser_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 // This is a helper class that collapses edges of a 2 - manifold mesh.
 
 #include "LOD_MeshPrimitives.h"
diff --git a/intern/decimation/intern/LOD_ExternBufferEditor.h b/intern/decimation/intern/LOD_ExternBufferEditor.h
index 9496151dda5..9f628c4455b 100644
--- a/intern/decimation/intern/LOD_ExternBufferEditor.h
+++ b/intern/decimation/intern/LOD_ExternBufferEditor.h
@@ -38,11 +38,6 @@
 #ifndef NAN_INCLUDED_LOD_ExternBufferEditor_h
 #define NAN_INCLUDED_LOD_ExternBufferEditor_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "LOD_MeshPrimitives.h"
 #include <vector>
 #include "LOD_ManMesh2.h"
diff --git a/intern/decimation/intern/LOD_ExternNormalEditor.h b/intern/decimation/intern/LOD_ExternNormalEditor.h
index bff3c9f388b..190ea5bdd8c 100644
--- a/intern/decimation/intern/LOD_ExternNormalEditor.h
+++ b/intern/decimation/intern/LOD_ExternNormalEditor.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef NAN_INCLUDED_ExternNormalEditor_h
-
 #define NAN_INCLUDED_ExternNormalEditor_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "MEM_NonCopyable.h"
 #include "LOD_ManMesh2.h"
 #include "MT_Vector3.h"
diff --git a/intern/decimation/intern/LOD_FaceNormalEditor.h b/intern/decimation/intern/LOD_FaceNormalEditor.h
index 3fab4888865..892e1f0fbc7 100644
--- a/intern/decimation/intern/LOD_FaceNormalEditor.h
+++ b/intern/decimation/intern/LOD_FaceNormalEditor.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef NAN_INCLUDED_FaceNormalEditor_h
-
 #define NAN_INCLUDED_FaceNormalEditor_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "MEM_NonCopyable.h"
 #include "LOD_ManMesh2.h"
 #include "MT_Vector3.h"
diff --git a/intern/decimation/intern/LOD_ManMesh2.h b/intern/decimation/intern/LOD_ManMesh2.h
index bcd137f261f..46ddcff5d80 100644
--- a/intern/decimation/intern/LOD_ManMesh2.h
+++ b/intern/decimation/intern/LOD_ManMesh2.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef NAN_INCLUDED_ManMesh2_h
-
 #define NAN_INCLUDED_ManMesh2_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "LOD_MeshPrimitives.h"
 #include "MEM_SmartPtr.h"
 #include <vector>
diff --git a/intern/decimation/intern/LOD_MeshBounds.h b/intern/decimation/intern/LOD_MeshBounds.h
index 74fcbc41480..f694ff2dcb3 100644
--- a/intern/decimation/intern/LOD_MeshBounds.h
+++ b/intern/decimation/intern/LOD_MeshBounds.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef NAN_INCLUDED_MeshBounds_h
-
 #define NAN_INCLUDED_MeshBounds_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "MEM_SmartPtr.h"
 #include "LOD_MeshPrimitives.h"
 #include "LOD_ManMesh2.h"
diff --git a/intern/decimation/intern/LOD_MeshException.h b/intern/decimation/intern/LOD_MeshException.h
index 252c86c5fb1..4bad167a81b 100644
--- a/intern/decimation/intern/LOD_MeshException.h
+++ b/intern/decimation/intern/LOD_MeshException.h
@@ -32,10 +32,6 @@
 #ifndef NAN_INCLUDED_MeshExceptions_h
 #define NAN_INCLUDED_MeshExceptions_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 class LOD_MeshException {
 
 public :
diff --git a/intern/decimation/intern/LOD_MeshPrimitives.h b/intern/decimation/intern/LOD_MeshPrimitives.h
index 0ffb34e1cc3..1168c9cc813 100644
--- a/intern/decimation/intern/LOD_MeshPrimitives.h
+++ b/intern/decimation/intern/LOD_MeshPrimitives.h
@@ -32,10 +32,6 @@
 #ifndef NAN_INCLUDED_MeshPrimitives_h
 #define NAN_INCLUDED_MeshPrimitives_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MT_Vector3.h"
 #include "CTR_TaggedIndex.h"
 #include "CTR_UHeap.h"
diff --git a/intern/decimation/intern/LOD_QSDecimator.h b/intern/decimation/intern/LOD_QSDecimator.h
index f1364668e41..0492e0bf09e 100644
--- a/intern/decimation/intern/LOD_QSDecimator.h
+++ b/intern/decimation/intern/LOD_QSDecimator.h
@@ -32,10 +32,6 @@
 #ifndef NAN_INCLUDED_LOD_QSDecimator_H
 #define NAN_INCLUDED_LOD_QSDecimator_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MEM_NonCopyable.h"
 #include "LOD_ManMesh2.h"
 #include "LOD_ExternNormalEditor.h"
diff --git a/intern/decimation/intern/LOD_Quadric.h b/intern/decimation/intern/LOD_Quadric.h
index 16d3911538b..f06b0af65b0 100644
--- a/intern/decimation/intern/LOD_Quadric.h
+++ b/intern/decimation/intern/LOD_Quadric.h
@@ -32,10 +32,6 @@
 #ifndef NAN_INCLUDED_LOD_Quadric_h
 #define NAN_INCLUDED_LOD_Quadric_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MT_Vector3.h"
 #include "MT_Matrix3x3.h"
 
diff --git a/intern/decimation/intern/LOD_QuadricEditor.h b/intern/decimation/intern/LOD_QuadricEditor.h
index 0e3a9d1813c..41e7d227d54 100644
--- a/intern/decimation/intern/LOD_QuadricEditor.h
+++ b/intern/decimation/intern/LOD_QuadricEditor.h
@@ -32,10 +32,6 @@
 #ifndef NAN_INCLUDED_LOD_QuadricEditor_h
 #define NAN_INCLUDED_LOD_QuadricEditor_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MEM_NonCopyable.h"
 #include "LOD_ManMesh2.h"
 #include "MT_Vector3.h"
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index 528e3ac6e70..2574b84e51c 100644
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -34,10 +34,6 @@
 
 #include "GHOST_Types.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" { 
 #endif
diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.h
index d47e5448dba..eb60b5d2e53 100644
--- a/intern/ghost/GHOST_IEvent.h
+++ b/intern/ghost/GHOST_IEvent.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_IEVENT_H_
 #define _GHOST_IEVENT_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_Types.h"
 
 class GHOST_IWindow;
diff --git a/intern/ghost/GHOST_IEventConsumer.h b/intern/ghost/GHOST_IEventConsumer.h
index f4fe85c06a9..ddb3de99953 100644
--- a/intern/ghost/GHOST_IEventConsumer.h
+++ b/intern/ghost/GHOST_IEventConsumer.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_IEVENT_CONSUMER_H_
 #define _GHOST_IEVENT_CONSUMER_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_IEvent.h"
 
 /**
diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h
index ef01eb5d8bd..56c32ee870a 100644
--- a/intern/ghost/GHOST_ISystem.h
+++ b/intern/ghost/GHOST_ISystem.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_ISYSTEM_H_
 #define _GHOST_ISYSTEM_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_Types.h"
 #include "GHOST_ITimerTask.h"
 #include "GHOST_IWindow.h"
diff --git a/intern/ghost/GHOST_ITimerTask.h b/intern/ghost/GHOST_ITimerTask.h
index ea8d73e8cc1..a9adb447ee2 100644
--- a/intern/ghost/GHOST_ITimerTask.h
+++ b/intern/ghost/GHOST_ITimerTask.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_ITIMER_TASK_H_
 #define _GHOST_ITIMER_TASK_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_Types.h"
 
 
diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h
index a3e5bd0e788..ee576230890 100644
--- a/intern/ghost/GHOST_IWindow.h
+++ b/intern/ghost/GHOST_IWindow.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_IWINDOW_H_
 #define _GHOST_IWINDOW_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "STR_String.h"
 #include "GHOST_Rect.h"
 #include "GHOST_Types.h"
diff --git a/intern/ghost/GHOST_Rect.h b/intern/ghost/GHOST_Rect.h
index 22611516000..fdf88697d94 100644
--- a/intern/ghost/GHOST_Rect.h
+++ b/intern/ghost/GHOST_Rect.h
@@ -40,10 +40,6 @@
 #ifndef _H_GHOST_Rect
 #define _H_GHOST_Rect
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_Types.h"
 
 
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h
index 7362a26d52c..b48e8f2054c 100644
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_TYPES_H_
 #define _GHOST_TYPES_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 typedef	char				GHOST_TInt8;
 typedef	unsigned char		GHOST_TUns8;
 typedef short				GHOST_TInt16;
diff --git a/intern/ghost/intern/GHOST_Buttons.h b/intern/ghost/intern/GHOST_Buttons.h
index c1c41566c26..d803ace4352 100644
--- a/intern/ghost/intern/GHOST_Buttons.h
+++ b/intern/ghost/intern/GHOST_Buttons.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_BUTTONS_H_
 #define _GHOST_BUTTONS_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_Types.h"
 
 
diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.h b/intern/ghost/intern/GHOST_CallbackEventConsumer.h
index 41dfd187fee..bdbbb7d7fea 100644
--- a/intern/ghost/intern/GHOST_CallbackEventConsumer.h
+++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_CALLBACK_EVENT_CONSUMER_H_
 #define _GHOST_CALLBACK_EVENT_CONSUMER_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_IEventConsumer.h"
 #include "GHOST_C-api.h"
 
diff --git a/intern/ghost/intern/GHOST_Debug.h b/intern/ghost/intern/GHOST_Debug.h
index cf351a24b78..b63aaedfdec 100644
--- a/intern/ghost/intern/GHOST_Debug.h
+++ b/intern/ghost/intern/GHOST_Debug.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_DEBUG_H_
 #define _GHOST_DEBUG_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
 	#ifdef _DEBUG
 		#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
diff --git a/intern/ghost/intern/GHOST_DisplayManager.h b/intern/ghost/intern/GHOST_DisplayManager.h
index 645274d4bcd..a206243df79 100644
--- a/intern/ghost/intern/GHOST_DisplayManager.h
+++ b/intern/ghost/intern/GHOST_DisplayManager.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_DISPLAY_MANAGER_H_
 #define _GHOST_DISPLAY_MANAGER_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_Types.h"
 
 #ifdef WIN32
diff --git a/intern/ghost/intern/GHOST_DisplayManagerCarbon.h b/intern/ghost/intern/GHOST_DisplayManagerCarbon.h
index b5b6dc05e94..644761f5c2a 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerCarbon.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerCarbon.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_DISPLAY_MANAGER_CARBON_H_
 #define _GHOST_DISPLAY_MANAGER_CARBON_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef __APPLE__
 #error Apple only!
 #endif // __APPLE__
diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.h b/intern/ghost/intern/GHOST_DisplayManagerWin32.h
index 7eca752cea1..93be57c72cd 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerWin32.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_DISPLAY_MANAGER_WIN32_H_
 #define _GHOST_DISPLAY_MANAGER_WIN32_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef WIN32
 #error WIN32 only!
 #endif // WIN32
diff --git a/intern/ghost/intern/GHOST_DisplayManagerX11.h b/intern/ghost/intern/GHOST_DisplayManagerX11.h
index d74e54ce7ab..c6babfc6b02 100755
--- a/intern/ghost/intern/GHOST_DisplayManagerX11.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerX11.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_DISPLAY_MANAGER_X11_H_
 #define _GHOST_DISPLAY_MANAGER_X11_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_DisplayManager.h"
 
 
diff --git a/intern/ghost/intern/GHOST_Event.h b/intern/ghost/intern/GHOST_Event.h
index 481a7dc8ddf..05c133cb332 100644
--- a/intern/ghost/intern/GHOST_Event.h
+++ b/intern/ghost/intern/GHOST_Event.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_EVENT_H_
 #define _GHOST_EVENT_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_IEvent.h"
 
 
diff --git a/intern/ghost/intern/GHOST_EventButton.h b/intern/ghost/intern/GHOST_EventButton.h
index 0514e958418..013aa92e2fb 100644
--- a/intern/ghost/intern/GHOST_EventButton.h
+++ b/intern/ghost/intern/GHOST_EventButton.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_EVENT_BUTTON_H_
 #define _GHOST_EVENT_BUTTON_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_Event.h"
 
 /**
diff --git a/intern/ghost/intern/GHOST_EventCursor.h b/intern/ghost/intern/GHOST_EventCursor.h
index 592fba4f5af..5d14e289715 100644
--- a/intern/ghost/intern/GHOST_EventCursor.h
+++ b/intern/ghost/intern/GHOST_EventCursor.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_EVENT_CURSOR_H_
 #define _GHOST_EVENT_CURSOR_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_Event.h"
 
 /**
diff --git a/intern/ghost/intern/GHOST_EventKey.h b/intern/ghost/intern/GHOST_EventKey.h
index 5db60da23fa..d31ba845426 100644
--- a/intern/ghost/intern/GHOST_EventKey.h
+++ b/intern/ghost/intern/GHOST_EventKey.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_EVENT_KEY_H_
 #define _GHOST_EVENT_KEY_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_Event.h"
 
 /**
diff --git a/intern/ghost/intern/GHOST_EventManager.h b/intern/ghost/intern/GHOST_EventManager.h
index 5b9f13d314c..7f955eb42df 100644
--- a/intern/ghost/intern/GHOST_EventManager.h
+++ b/intern/ghost/intern/GHOST_EventManager.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_EVENT_MANAGER_H_
 #define _GHOST_EVENT_MANAGER_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
 #endif // WIN32
diff --git a/intern/ghost/intern/GHOST_EventPrinter.h b/intern/ghost/intern/GHOST_EventPrinter.h
index 70208f0a5dc..a943742026d 100644
--- a/intern/ghost/intern/GHOST_EventPrinter.h
+++ b/intern/ghost/intern/GHOST_EventPrinter.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_EVENT_PRINTER_H_
 #define _GHOST_EVENT_PRINTER_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_IEventConsumer.h"
 
 #include "STR_String.h"
diff --git a/intern/ghost/intern/GHOST_ModifierKeys.h b/intern/ghost/intern/GHOST_ModifierKeys.h
index 19ffd192f45..6b1e3c2e970 100644
--- a/intern/ghost/intern/GHOST_ModifierKeys.h
+++ b/intern/ghost/intern/GHOST_ModifierKeys.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_MODIFIER_KEYS_H_
 #define _GHOST_MODIFIER_KEYS_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_Types.h"
 
 struct GHOST_ModifierKeys
diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h
index 3c763b8d230..533665b6671 100644
--- a/intern/ghost/intern/GHOST_System.h
+++ b/intern/ghost/intern/GHOST_System.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_SYSTEM_H_
 #define _GHOST_SYSTEM_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_ISystem.h"
 
 #include "GHOST_Debug.h"
diff --git a/intern/ghost/intern/GHOST_SystemCarbon.h b/intern/ghost/intern/GHOST_SystemCarbon.h
index f76fd5a98b8..b8316a2d46c 100644
--- a/intern/ghost/intern/GHOST_SystemCarbon.h
+++ b/intern/ghost/intern/GHOST_SystemCarbon.h
@@ -46,10 +46,6 @@
 
 #include <Carbon/Carbon.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_System.h"
 
 class GHOST_EventCursor;
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h
index 563f88d3f7d..96199af6346 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.h
+++ b/intern/ghost/intern/GHOST_SystemCocoa.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_SYSTEM_CARBON_H_
 #define _GHOST_SYSTEM_CARBON_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef __APPLE__
 #error Apple OSX only!
 #endif // __APPLE__
diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h
index 2e16cda2454..f38a104de3d 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_SYSTEM_WIN32_H_
 #define _GHOST_SYSTEM_WIN32_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef WIN32
 #error WIN32 only!
 #endif // WIN32
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h
index 54b0f7874d1..ae828a9d4da 100755
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.h
@@ -43,10 +43,6 @@
 #include <X11/Xlib.h>
 #include <GL/glx.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_System.h"
 #include "../GHOST_Types.h"
 
diff --git a/intern/ghost/intern/GHOST_TimerManager.h b/intern/ghost/intern/GHOST_TimerManager.h
index bfd15925b4b..fe843442661 100644
--- a/intern/ghost/intern/GHOST_TimerManager.h
+++ b/intern/ghost/intern/GHOST_TimerManager.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_TIMER_MANAGER_H_
 #define _GHOST_TIMER_MANAGER_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
 #endif // WIN32
diff --git a/intern/ghost/intern/GHOST_TimerTask.h b/intern/ghost/intern/GHOST_TimerTask.h
index a973b644bca..bbcb75f4dcd 100644
--- a/intern/ghost/intern/GHOST_TimerTask.h
+++ b/intern/ghost/intern/GHOST_TimerTask.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_TIMER_TASK_H_
 #define _GHOST_TIMER_TASK_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_ITimerTask.h"
 
 
diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h
index 9db19100409..2947f94802b 100644
--- a/intern/ghost/intern/GHOST_Window.h
+++ b/intern/ghost/intern/GHOST_Window.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_WINDOW_H_
 #define _GHOST_WINDOW_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_IWindow.h"
 
 class STR_String;
diff --git a/intern/ghost/intern/GHOST_WindowCarbon.h b/intern/ghost/intern/GHOST_WindowCarbon.h
index 2083d479649..8fb4663b3df 100644
--- a/intern/ghost/intern/GHOST_WindowCarbon.h
+++ b/intern/ghost/intern/GHOST_WindowCarbon.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_WINDOW_CARBON_H_
 #define _GHOST_WINDOW_CARBON_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef __APPLE__
 #error Apple OSX only!
 #endif // __APPLE__
diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h
index 3f01b10dd1c..f5af43e5cdc 100644
--- a/intern/ghost/intern/GHOST_WindowManager.h
+++ b/intern/ghost/intern/GHOST_WindowManager.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_WINDOW_MANAGER_H_
 #define _GHOST_WINDOW_MANAGER_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
 #endif // WIN32
diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h
index 6af8ea0df41..2663869ea47 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_WINDOW_WIN32_H_
 #define _GHOST_WINDOW_WIN32_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef WIN32
 #error WIN32 only!
 #endif // WIN32
diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h
index 026253faa8d..5a56a9a82e9 100755
--- a/intern/ghost/intern/GHOST_WindowX11.h
+++ b/intern/ghost/intern/GHOST_WindowX11.h
@@ -40,10 +40,6 @@
 #ifndef _GHOST_WINDOWX11_H_
 #define _GHOST_WINDOWX11_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_Window.h"
 #include <X11/Xlib.h>
 #include <GL/glx.h>
diff --git a/intern/ghost/test/multitest/Basic.h b/intern/ghost/test/multitest/Basic.h
index f3cd424a37a..94fb0cdfc17 100644
--- a/intern/ghost/test/multitest/Basic.h
+++ b/intern/ghost/test/multitest/Basic.h
@@ -29,11 +29,6 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 int		min_i				(int a, int b);
 
 int		max_i				(int a, int b);
diff --git a/intern/ghost/test/multitest/EventToBuf.h b/intern/ghost/test/multitest/EventToBuf.h
index 2e93d946f56..0324af1f73f 100644
--- a/intern/ghost/test/multitest/EventToBuf.h
+++ b/intern/ghost/test/multitest/EventToBuf.h
@@ -29,11 +29,6 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 char *eventtype_to_string(GHOST_TEventType type);
-
 void event_to_buf(GHOST_EventHandle evt, char buf[128]);
 
diff --git a/intern/ghost/test/multitest/GL.h b/intern/ghost/test/multitest/GL.h
index 7aa21093fae..7a96ae9e9f8 100644
--- a/intern/ghost/test/multitest/GL.h
+++ b/intern/ghost/test/multitest/GL.h
@@ -29,10 +29,6 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #if defined(WIN32) || defined(__APPLE__)
 
 	#ifdef WIN32
diff --git a/intern/ghost/test/multitest/ScrollBar.h b/intern/ghost/test/multitest/ScrollBar.h
index 809afa5dad8..b49ad041415 100644
--- a/intern/ghost/test/multitest/ScrollBar.h
+++ b/intern/ghost/test/multitest/ScrollBar.h
@@ -29,10 +29,6 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 typedef struct _ScrollBar ScrollBar;
 
 
diff --git a/intern/ghost/test/multitest/Util.h b/intern/ghost/test/multitest/Util.h
index 18a81939d2c..e3e51824515 100644
--- a/intern/ghost/test/multitest/Util.h
+++ b/intern/ghost/test/multitest/Util.h
@@ -29,10 +29,6 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 void*	memdbl		(void *mem, int *size_pr, int item_size);
 
 char*	string_dup	(char *str);
diff --git a/intern/ghost/test/multitest/WindowData.h b/intern/ghost/test/multitest/WindowData.h
index 7d2ca67212a..10a1ca710f2 100644
--- a/intern/ghost/test/multitest/WindowData.h
+++ b/intern/ghost/test/multitest/WindowData.h
@@ -29,12 +29,7 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 typedef void (*WindowDataHandler)(void *priv, GHOST_EventHandle evt);
-
 typedef struct _WindowData WindowData;
 	
 	/***/
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index 2d84be49188..6280b52059c 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -61,10 +61,6 @@
 #ifndef MEM_MALLOCN_H
 #define MEM_MALLOCN_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 /* Needed for FILE* */
 #include "stdio.h"
 
diff --git a/intern/iksolver/extern/IK_solver.h b/intern/iksolver/extern/IK_solver.h
index 5aa0cdd6992..973834f1682 100644
--- a/intern/iksolver/extern/IK_solver.h
+++ b/intern/iksolver/extern/IK_solver.h
@@ -73,11 +73,6 @@
 #ifndef NAN_INCLUDED_IK_solver_h
 #define NAN_INCLUDED_IK_solver_h
 
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/intern/iksolver/intern/TNT/cholesky.h b/intern/iksolver/intern/TNT/cholesky.h
index c14409ebad0..3a8011c374c 100644
--- a/intern/iksolver/intern/TNT/cholesky.h
+++ b/intern/iksolver/intern/TNT/cholesky.h
@@ -25,8 +25,6 @@
 *
 */
 
-
-
 #ifndef CHOLESKY_H
 #define CHOLESKY_H
 
diff --git a/intern/iksolver/intern/TNT/stopwatch.h b/intern/iksolver/intern/TNT/stopwatch.h
index 89d2b850a3f..30cc0fd1641 100644
--- a/intern/iksolver/intern/TNT/stopwatch.h
+++ b/intern/iksolver/intern/TNT/stopwatch.h
@@ -26,8 +26,6 @@
 *
 */
 
-
-
 #ifndef STPWATCH_H
 #define STPWATCH_H
 
diff --git a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h b/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h
index eac10393bf3..706ccb92dec 100644
--- a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h
+++ b/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h
@@ -32,10 +32,6 @@
 #ifndef NAN_INCLUDED_GlutDrawer
 #define NAN_INCLUDED_GlutDrawer
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MEM_NonCopyable.h"
 #include "MEM_SmartPtr.h"
 
diff --git a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h b/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h
index 01e2ae039e2..595e5e19d0e 100644
--- a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h
+++ b/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h
@@ -32,10 +32,6 @@
 #ifndef NAN_INCLUDED_GlutKeyboardManager
 #define NAN_INCLUDED_GlutKeyboardManager
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MEM_NonCopyable.h"
 #include "MEM_SmartPtr.h"
 
diff --git a/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h b/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h
index 2903a337248..9675bd3ca1c 100644
--- a/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h
+++ b/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h
@@ -30,14 +30,8 @@
  */
 
 #ifndef NAN_INCLUDED_GlutMouseManager_h
-
 #define NAN_INCLUDED_GlutMouseManager_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "MEM_NonCopyable.h"
 #include "MEM_SmartPtr.h"
 
diff --git a/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h b/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h
index 5a4915fca1f..68734e0d822 100644
--- a/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h
+++ b/intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h
@@ -32,10 +32,6 @@
 #ifndef NAN_INCLUDED_ChainDrawer_h
 #define NAN_INCLUDED_ChainDrawer_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "../common/GlutDrawer.h"
 #include "MyGlutMouseHandler.h"
 #include "MyGlutKeyHandler.h"
diff --git a/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h b/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h
index 8498c962f0c..e9a85fad320 100644
--- a/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h
+++ b/intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h
@@ -32,11 +32,6 @@
 #ifndef NAN_INCLUDED_MyGlutKeyHandler_h
 #define NAN_INCLUDED_MyGlutKeyHandler_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "../common/GlutKeyboardManager.h"
 
 class MyGlutKeyHandler : public GlutKeyboardHandler
diff --git a/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h b/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h
index 7c16432f0ac..978d9693692 100644
--- a/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h
+++ b/intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h
@@ -32,10 +32,6 @@
 #ifndef NAN_INCLUDED_MyGlutMouseHandler_h
 #define NAN_INCLUDED_MyGlutMouseHandler_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "../common/GlutMouseManager.h"
 #include <GL/glut.h>
 #include "IK_solver.h"
diff --git a/intern/img/extern/IMG_Pixmap.h b/intern/img/extern/IMG_Pixmap.h
index 8f07e6a46bb..d9ab96cd745 100644
--- a/intern/img/extern/IMG_Pixmap.h
+++ b/intern/img/extern/IMG_Pixmap.h
@@ -41,10 +41,6 @@
 #ifndef _H_IMG_Pixmap
 #define _H_IMG_Pixmap
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GEN_Types.h"
 #include "GEN_Rect.h"
 
diff --git a/intern/img/extern/IMG_PixmapRGBA32.h b/intern/img/extern/IMG_PixmapRGBA32.h
index 7d7a937321d..861b9ab3ebf 100644
--- a/intern/img/extern/IMG_PixmapRGBA32.h
+++ b/intern/img/extern/IMG_PixmapRGBA32.h
@@ -45,11 +45,6 @@
 #ifndef _H_IMG_PixmapRGBA32
 #define _H_IMG_PixmapRGBA32
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "IMG_Pixmap.h"
 #include "IMG_MemPtr.h"
 #include "IMG_Color.h"
diff --git a/intern/img/intern/IMG_Color.h b/intern/img/intern/IMG_Color.h
index 71273c22ae9..b7b97fc4aa2 100644
--- a/intern/img/intern/IMG_Color.h
+++ b/intern/img/intern/IMG_Color.h
@@ -43,13 +43,8 @@
 #ifndef _H_IMG_Color
 #define _H_IMG_Color
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 class IMG_ColorRGBA;
 
-
 class IMG_ColorRGB {
 public:
 	/**
diff --git a/intern/img/intern/IMG_MemPtr.h b/intern/img/intern/IMG_MemPtr.h
index 21a64a848a8..a89e1f48d00 100644
--- a/intern/img/intern/IMG_MemPtr.h
+++ b/intern/img/intern/IMG_MemPtr.h
@@ -40,10 +40,6 @@
 
 #include <stddef.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 /**
  * A memory pointer for memory of any type.
  * It can be used to avoid memory leaks when allocating memory in constructors.
diff --git a/intern/keymaker/key_internal.h b/intern/keymaker/key_internal.h
index 393dad8ecb2..af17afbbe6e 100644
--- a/intern/keymaker/key_internal.h
+++ b/intern/keymaker/key_internal.h
@@ -37,10 +37,6 @@
  * Blender Key loader library internal stuff
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "openssl/rand.h"
 #include "openssl/rsa.h"
 #include "openssl/ripemd.h"
diff --git a/intern/memutil/MEM_NonCopyable.h b/intern/memutil/MEM_NonCopyable.h
index 635c61704cd..aa6fe24b6fb 100644
--- a/intern/memutil/MEM_NonCopyable.h
+++ b/intern/memutil/MEM_NonCopyable.h
@@ -32,11 +32,6 @@
 #ifndef NAN_INCLUDED_NonCopyable_h
 #define NAN_INCLUDED_NonCopyable_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 /**
  * Simple class that makes sure sub classes cannot
  * generate standard copy constructors.
diff --git a/intern/memutil/MEM_RefCountPtr.h b/intern/memutil/MEM_RefCountPtr.h
index 8f90226688b..1828fcc3edd 100644
--- a/intern/memutil/MEM_RefCountPtr.h
+++ b/intern/memutil/MEM_RefCountPtr.h
@@ -32,10 +32,6 @@
 #ifndef NAN_INCLUDED_MEM_RefCountPtr_h
 #define NAN_INCLUDED_MEM_RefCountPtr_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 /**
  * $Id$
  * Copyright (C) 2001 NaN Technologies B.V.
diff --git a/intern/memutil/MEM_RefCounted.h b/intern/memutil/MEM_RefCounted.h
index b72ba6590f9..f4699030ecd 100644
--- a/intern/memutil/MEM_RefCounted.h
+++ b/intern/memutil/MEM_RefCounted.h
@@ -40,10 +40,6 @@
 #ifndef _H_MEM_REF_COUNTED
 #define _H_MEM_REF_COUNTED
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 /**
  * An object with reference counting.
  * Base class for objects with reference counting.
diff --git a/intern/memutil/MEM_RefCountedC-Api.h b/intern/memutil/MEM_RefCountedC-Api.h
index 373042ba350..0bba70388c5 100644
--- a/intern/memutil/MEM_RefCountedC-Api.h
+++ b/intern/memutil/MEM_RefCountedC-Api.h
@@ -41,11 +41,6 @@
 #ifndef _H_MEM_REF_COUNTED_C_API
 #define _H_MEM_REF_COUNTED_C_API
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 /** A pointer to a private object. */
 typedef struct MEM_TOpaqueObject* MEM_TObjectPtr;
 /** A pointer to a shared object. */
diff --git a/intern/memutil/MEM_SmartPtr.h b/intern/memutil/MEM_SmartPtr.h
index 144c4fd92c9..f8305c0afd9 100644
--- a/intern/memutil/MEM_SmartPtr.h
+++ b/intern/memutil/MEM_SmartPtr.h
@@ -32,10 +32,6 @@
 #ifndef NAN_INCLUDED_MEM_SmartPtr_h
 #define NAN_INCLUDED_MEM_SmartPtr_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 /**
  * $Id$
  * Copyright (C) 2001 NaN Technologies B.V.
diff --git a/intern/moto/include/GEN_List.h b/intern/moto/include/GEN_List.h
index fd209098342..00fdbb85ad1 100644
--- a/intern/moto/include/GEN_List.h
+++ b/intern/moto/include/GEN_List.h
@@ -60,14 +60,9 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-
 #ifndef GEN_LIST_H
 #define GEN_LIST_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 class GEN_Link {
 public:
     GEN_Link() : m_next(0), m_prev(0) {}
diff --git a/intern/moto/include/GEN_Map.h b/intern/moto/include/GEN_Map.h
index 6459d75a090..64a2c3cfc6e 100644
--- a/intern/moto/include/GEN_Map.h
+++ b/intern/moto/include/GEN_Map.h
@@ -32,11 +32,6 @@
 #ifndef GEN_MAP_H
 #define GEN_MAP_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 template <class Key, class Value>
 class GEN_Map {
 private:
diff --git a/intern/moto/include/MT_CmMatrix4x4.h b/intern/moto/include/MT_CmMatrix4x4.h
index 2bebddd444a..86858576abf 100644
--- a/intern/moto/include/MT_CmMatrix4x4.h
+++ b/intern/moto/include/MT_CmMatrix4x4.h
@@ -32,10 +32,6 @@
 #ifndef INCLUDED_MT_CmMatrix4x4
 #define INCLUDED_MT_CmMatrix4x4
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 /**
  * A 4x4 matrix. This is an OpenGl style matrix (column major) meaning
  * that the vector {m[0][0],m[0][1],m[0][2],m[0][3]} is the first column of
diff --git a/intern/moto/include/MT_Matrix3x3.h b/intern/moto/include/MT_Matrix3x3.h
index 949ecf73dd9..c9597630ed1 100755
--- a/intern/moto/include/MT_Matrix3x3.h
+++ b/intern/moto/include/MT_Matrix3x3.h
@@ -46,10 +46,6 @@
 #ifndef MT_MATRIX3X3_H
 #define MT_MATRIX3X3_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <MT_assert.h>
 
 #include "MT_Vector3.h"
diff --git a/intern/moto/include/MT_Matrix4x4.h b/intern/moto/include/MT_Matrix4x4.h
index a5428f50f0c..b4f271000dd 100755
--- a/intern/moto/include/MT_Matrix4x4.h
+++ b/intern/moto/include/MT_Matrix4x4.h
@@ -39,10 +39,6 @@
 #ifndef MT_MATRIX4X4_H
 #define MT_MATRIX4X4_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <MT_assert.h>
 
 #include "MT_Vector4.h"
diff --git a/intern/moto/include/MT_MinMax.h b/intern/moto/include/MT_MinMax.h
index f06c86feae5..06f8a8d18c8 100755
--- a/intern/moto/include/MT_MinMax.h
+++ b/intern/moto/include/MT_MinMax.h
@@ -46,10 +46,6 @@
 #ifndef MT_MINMAX_H
 #define MT_MINMAX_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 template <class T>
 inline const T& MT_min(const T& a, const T& b) {
   return b < a ? b : a;
diff --git a/intern/moto/include/MT_Optimize.h b/intern/moto/include/MT_Optimize.h
index 965bf30f7c9..c09a9431a34 100644
--- a/intern/moto/include/MT_Optimize.h
+++ b/intern/moto/include/MT_Optimize.h
@@ -32,10 +32,6 @@
 #ifndef GEN_OPTIMIZE_H
 #define GEN_OPTIMIZE_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef GEN_INLINED
 #define GEN_INLINE inline
 #else
diff --git a/intern/moto/include/MT_Plane3.h b/intern/moto/include/MT_Plane3.h
index 002ef45933b..5caf1c4c36e 100644
--- a/intern/moto/include/MT_Plane3.h
+++ b/intern/moto/include/MT_Plane3.h
@@ -32,10 +32,6 @@
 #ifndef MT_PLANE3
 #define MT_PLANE3
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MT_Tuple4.h"
 #include "MT_Point3.h"
 
diff --git a/intern/moto/include/MT_Point2.h b/intern/moto/include/MT_Point2.h
index fd98d261029..c6995f1ab0b 100644
--- a/intern/moto/include/MT_Point2.h
+++ b/intern/moto/include/MT_Point2.h
@@ -46,10 +46,6 @@
 #ifndef MT_POINT2_H
 #define MT_POINT2_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MT_Vector2.h"
 
 class MT_Point2 : public MT_Vector2 {
diff --git a/intern/moto/include/MT_Point3.h b/intern/moto/include/MT_Point3.h
index fd4c8064fa5..5e85dc596ab 100644
--- a/intern/moto/include/MT_Point3.h
+++ b/intern/moto/include/MT_Point3.h
@@ -46,10 +46,6 @@
 #ifndef MT_POINT_H
 #define MT_POINT_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MT_Vector3.h"
 
 class MT_Point3 : public MT_Vector3 {
diff --git a/intern/moto/include/MT_Quaternion.h b/intern/moto/include/MT_Quaternion.h
index 3d0add4c73e..aa2045fc56f 100644
--- a/intern/moto/include/MT_Quaternion.h
+++ b/intern/moto/include/MT_Quaternion.h
@@ -46,10 +46,6 @@
 #ifndef MT_QUATERNION_H
 #define MT_QUATERNION_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <MT_assert.h>
 
 #include "MT_Vector3.h"
diff --git a/intern/moto/include/MT_Scalar.h b/intern/moto/include/MT_Scalar.h
index 6a3429f69a6..0a72a52c20e 100755
--- a/intern/moto/include/MT_Scalar.h
+++ b/intern/moto/include/MT_Scalar.h
@@ -49,10 +49,6 @@
 #include <math.h>
 #include <float.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MT_random.h"
 #include "NM_Scalar.h"
 
diff --git a/intern/moto/include/MT_Stream.h b/intern/moto/include/MT_Stream.h
index a2729ced817..49378eceb18 100755
--- a/intern/moto/include/MT_Stream.h
+++ b/intern/moto/include/MT_Stream.h
@@ -32,10 +32,6 @@
 #ifndef GEN_STREAM_H
 #define GEN_STREAM_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef __CUSTOM_STREAM
 
 class MT_OStream
diff --git a/intern/moto/include/MT_Transform.h b/intern/moto/include/MT_Transform.h
index f56927c525d..e774b125d0e 100644
--- a/intern/moto/include/MT_Transform.h
+++ b/intern/moto/include/MT_Transform.h
@@ -53,10 +53,6 @@
 #ifndef MT_TRANSFORM_H
 #define MT_TRANSFORM_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MT_Point3.h"
 #include "MT_Matrix3x3.h"
 
diff --git a/intern/moto/include/MT_Tuple2.h b/intern/moto/include/MT_Tuple2.h
index 696421fdc77..bb2ec67dc44 100755
--- a/intern/moto/include/MT_Tuple2.h
+++ b/intern/moto/include/MT_Tuple2.h
@@ -46,10 +46,6 @@
 #ifndef MT_Tuple2_H
 #define MT_Tuple2_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MT_Stream.h"
 #include "MT_Scalar.h"
 
diff --git a/intern/moto/include/MT_Tuple3.h b/intern/moto/include/MT_Tuple3.h
index c4cb14563fa..271e323aab5 100755
--- a/intern/moto/include/MT_Tuple3.h
+++ b/intern/moto/include/MT_Tuple3.h
@@ -46,10 +46,6 @@
 #ifndef MT_TUPLE3_H
 #define MT_TUPLE3_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MT_Stream.h"
 #include "MT_Scalar.h"
 
diff --git a/intern/moto/include/MT_Tuple4.h b/intern/moto/include/MT_Tuple4.h
index ce45d64f75b..9a484dbedde 100755
--- a/intern/moto/include/MT_Tuple4.h
+++ b/intern/moto/include/MT_Tuple4.h
@@ -46,10 +46,6 @@
 #ifndef MT_TUPLE4_H
 #define MT_TUPLE4_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MT_Stream.h"
 #include "MT_Scalar.h"
 
diff --git a/intern/moto/include/MT_Vector2.h b/intern/moto/include/MT_Vector2.h
index 343c7fe66c8..35748ce2b0d 100644
--- a/intern/moto/include/MT_Vector2.h
+++ b/intern/moto/include/MT_Vector2.h
@@ -46,10 +46,6 @@
 #ifndef MT_VECTOR2_H
 #define MT_VECTOR2_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <MT_assert.h>
 #include "MT_Tuple2.h"
 
diff --git a/intern/moto/include/MT_Vector3.h b/intern/moto/include/MT_Vector3.h
index 7e95b767283..41291e915be 100644
--- a/intern/moto/include/MT_Vector3.h
+++ b/intern/moto/include/MT_Vector3.h
@@ -46,10 +46,6 @@
 #ifndef MT_VECTOR3_H
 #define MT_VECTOR3_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <MT_assert.h>
 #include "MT_Tuple3.h"
 
diff --git a/intern/moto/include/MT_Vector4.h b/intern/moto/include/MT_Vector4.h
index bf80f5b6c19..fa91abf2a84 100644
--- a/intern/moto/include/MT_Vector4.h
+++ b/intern/moto/include/MT_Vector4.h
@@ -46,10 +46,6 @@
 #ifndef MT_VECTOR4_H
 #define MT_VECTOR4_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <MT_assert.h>
 
 #include "MT_Tuple4.h"
diff --git a/intern/moto/include/MT_assert.h b/intern/moto/include/MT_assert.h
index 7d37f950f31..b9680c1e684 100644
--- a/intern/moto/include/MT_assert.h
+++ b/intern/moto/include/MT_assert.h
@@ -32,10 +32,6 @@
 #ifndef MT_ASSERT_H
 #define MT_ASSERT_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef	MT_NDEBUG
 
 #define MT_assert(predicate) ((void)0)
diff --git a/intern/moto/include/MT_random.h b/intern/moto/include/MT_random.h
index 41a01cf05e2..8a578fa7d09 100755
--- a/intern/moto/include/MT_random.h
+++ b/intern/moto/include/MT_random.h
@@ -32,10 +32,6 @@
 #ifndef MT_RANDOM_H
 #define MT_RANDOM_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <limits.h>
 
 #define MT_RAND_MAX ULONG_MAX
diff --git a/intern/moto/include/NM_Scalar.h b/intern/moto/include/NM_Scalar.h
index 33e5d477565..a15b187cab9 100644
--- a/intern/moto/include/NM_Scalar.h
+++ b/intern/moto/include/NM_Scalar.h
@@ -30,13 +30,8 @@
  */
 
 #include <math.h>
-
 #include <iostream>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 template <class T> 
 class NM_Scalar {
 public:    
diff --git a/intern/string/STR_HashedString.h b/intern/string/STR_HashedString.h
index 9ba8e98bb7b..bf18a4e4da6 100644
--- a/intern/string/STR_HashedString.h
+++ b/intern/string/STR_HashedString.h
@@ -40,10 +40,6 @@
 #ifndef __STR_HASHSTRING
 #define __STR_HASHSTRING
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "STR_String.h"
 
 
diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h
index 01fe9f68816..a7f91c3b377 100644
--- a/intern/string/STR_String.h
+++ b/intern/string/STR_String.h
@@ -40,10 +40,6 @@
 #ifndef _STR_String_H_
 #define _STR_String_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef STR_NO_ASSERTD
 #undef  assertd
 #define	assertd(exp)			((void)NULL)