diff --git a/code/Importer.cpp b/code/Importer.cpp
index 978f7c7d4..45b91feea 100644
--- a/code/Importer.cpp
+++ b/code/Importer.cpp
@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <assimp/version.h>
+#include <assimp/config.h>
 
 // ------------------------------------------------------------------------------------------------
 /* Uncomment this line to prevent Assimp from catching unknown exceptions.
diff --git a/include/assimp/cexport.h b/include/assimp/cexport.h
index 84eee4475..f77d23c05 100644
--- a/include/assimp/cexport.h
+++ b/include/assimp/cexport.h
@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
 // Public ASSIMP data structures
-#include <assimp/types.h>
 #include <assimp/config.h>
+#include <assimp/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/assimp/cimport.h b/include/assimp/cimport.h
index ad06e669a..231230ca8 100644
--- a/include/assimp/cimport.h
+++ b/include/assimp/cimport.h
@@ -46,7 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_ASSIMP_H_INC
 #define AI_ASSIMP_H_INC
 
-#include "types.h"
+#include <assimp/config.h>
+#include <assimp/types.h>
 #include "importerdesc.h"
 
 #ifdef __cplusplus
diff --git a/include/assimp/defs.h b/include/assimp/defs.h
index d62dd3097..f68d69cc1 100644
--- a/include/assimp/defs.h
+++ b/include/assimp/defs.h
@@ -48,6 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_DEFINES_H_INC
 #define AI_DEFINES_H_INC
 
+#include <assimp/config.h>
+
     //////////////////////////////////////////////////////////////////////////
     /* Define ASSIMP_BUILD_NO_XX_IMPORTER to disable a specific
      * file format loader. The loader is be excluded from the