diff --git a/taglib/asf/asfattribute.cpp b/taglib/asf/asfattribute.cpp
index 7a512a18..7915c83e 100644
--- a/taglib/asf/asfattribute.cpp
+++ b/taglib/asf/asfattribute.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <taglib.h>
diff --git a/taglib/asf/asfpicture.cpp b/taglib/asf/asfpicture.cpp
index a2b3d0ac..0c873b7a 100644
--- a/taglib/asf/asfpicture.cpp
+++ b/taglib/asf/asfpicture.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <taglib.h>
diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp
index 85081c46..78164e32 100644
--- a/taglib/fileref.cpp
+++ b/taglib/fileref.cpp
@@ -28,7 +28,7 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/taglib/mp4/mp4coverart.cpp b/taglib/mp4/mp4coverart.cpp
index 6d7383f0..f5a9b462 100644
--- a/taglib/mp4/mp4coverart.cpp
+++ b/taglib/mp4/mp4coverart.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <taglib.h>
diff --git a/taglib/mp4/mp4item.cpp b/taglib/mp4/mp4item.cpp
index 1e03ae4e..6c1f3c40 100644
--- a/taglib/mp4/mp4item.cpp
+++ b/taglib/mp4/mp4item.cpp
@@ -24,8 +24,9 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
+
 #include <stdio.h>
 
 #include <taglib.h>
diff --git a/taglib/mpeg/mpegheader.cpp b/taglib/mpeg/mpegheader.cpp
index ce58cfd1..e53c824f 100644
--- a/taglib/mpeg/mpegheader.cpp
+++ b/taglib/mpeg/mpegheader.cpp
@@ -23,6 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <bitset>
 
 #include <tbytevector.h>
diff --git a/taglib/toolkit/tbytevectorlist.cpp b/taglib/toolkit/tbytevectorlist.cpp
index 505c3bf8..f4bd512b 100644
--- a/taglib/toolkit/tbytevectorlist.cpp
+++ b/taglib/toolkit/tbytevectorlist.cpp
@@ -23,6 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "tbytevectorlist.h"
 
 using namespace TagLib;
diff --git a/taglib/toolkit/tlist.tcc b/taglib/toolkit/tlist.tcc
index 736351db..fb4d01c0 100644
--- a/taglib/toolkit/tlist.tcc
+++ b/taglib/toolkit/tlist.tcc
@@ -23,6 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <algorithm>
 
 namespace TagLib {
diff --git a/taglib/toolkit/tmap.tcc b/taglib/toolkit/tmap.tcc
index 607c1bee..3066144e 100644
--- a/taglib/toolkit/tmap.tcc
+++ b/taglib/toolkit/tmap.tcc
@@ -23,6 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 namespace TagLib {
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/taglib/toolkit/tstringlist.cpp b/taglib/toolkit/tstringlist.cpp
index 49650f49..4c90fe9b 100644
--- a/taglib/toolkit/tstringlist.cpp
+++ b/taglib/toolkit/tstringlist.cpp
@@ -23,6 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "tstringlist.h"
 
 using namespace TagLib;