diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index 7f19070ee..d393ad1d6 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -12,8 +12,8 @@
  * ----------------------------------------------------------------------------- */
 
 #include "swigmod.h"
-#include <limits.h>		// for INT_MAX
 #include "cparse.h"
+#include <limits.h>		// for INT_MAX
 #include <ctype.h>
 
 /* Hash type used for upcalls from C/C++ */
diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx
index c30bf06f0..c70896af8 100644
--- a/Source/Modules/guile.cxx
+++ b/Source/Modules/guile.cxx
@@ -12,7 +12,6 @@
  * ----------------------------------------------------------------------------- */
 
 #include "swigmod.h"
-
 #include <ctype.h>
 
 // Note string broken in half for compilers that can't handle long strings
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index ae1e0fc2c..558231cf8 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -12,8 +12,8 @@
  * ----------------------------------------------------------------------------- */
 
 #include "swigmod.h"
-#include <limits.h>		// for INT_MAX
 #include "cparse.h"
+#include <limits.h>		// for INT_MAX
 #include <ctype.h>
 #include "javadoc.h"
 
diff --git a/Source/Modules/mzscheme.cxx b/Source/Modules/mzscheme.cxx
index 8080b93c0..64b699336 100644
--- a/Source/Modules/mzscheme.cxx
+++ b/Source/Modules/mzscheme.cxx
@@ -12,7 +12,6 @@
  * ----------------------------------------------------------------------------- */
 
 #include "swigmod.h"
-
 #include <ctype.h>
 
 static const char *usage = "\
diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx
index 6e45309e8..97bb8cc17 100644
--- a/Source/Modules/ocaml.cxx
+++ b/Source/Modules/ocaml.cxx
@@ -12,7 +12,6 @@
  * ----------------------------------------------------------------------------- */
 
 #include "swigmod.h"
-
 #include <ctype.h>
 
 static const char *usage = "\
diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx
index 8d937e9b2..d61f6e428 100644
--- a/Source/Modules/php.cxx
+++ b/Source/Modules/php.cxx
@@ -13,7 +13,6 @@
  */
 
 #include "swigmod.h"
-
 #include <ctype.h>
 #include <errno.h>
 
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 7161c8e7d..9aac91601 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -12,13 +12,12 @@
  * ----------------------------------------------------------------------------- */
 
 #include "swigmod.h"
-#include <limits.h>
 #include "cparse.h"
+#include <limits.h>
 #include <ctype.h>
 #include <errno.h>
-#include "pydoc.h"
-
 #include <stdint.h>
+#include "pydoc.h"
 
 #define PYSHADOW_MEMBER  0x2
 #define WARN_PYTHON_MULTIPLE_INH 405
diff --git a/Source/Modules/scilab.cxx b/Source/Modules/scilab.cxx
index 1731b218c..8c5536486 100644
--- a/Source/Modules/scilab.cxx
+++ b/Source/Modules/scilab.cxx
@@ -11,9 +11,9 @@
  * Scilab language module for SWIG.
  * --------------------------------------------------------------------------*/
 
+#include "swigmod.h"
 #include <cstddef>
 #include <cstdlib>
-#include "swigmod.h"
 
 static const int SCILAB_IDENTIFIER_NAME_CHAR_MAX = 24;
 
diff --git a/Source/Modules/utils.cxx b/Source/Modules/utils.cxx
index 2964ed3a6..0c1f87d19 100644
--- a/Source/Modules/utils.cxx
+++ b/Source/Modules/utils.cxx
@@ -11,7 +11,7 @@
  * Various utility functions.
  * ----------------------------------------------------------------------------- */
 
-#include <swigmod.h>
+#include "swigmod.h"
 
 int is_public(Node *n) {
   String *access = Getattr(n, "access");