15 files changed, 16 insertions, 14 deletions
diff --git a/src/base.cpp b/src/base.cpp
index 1dc4705b8..a6edcb22c 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -14,8 +14,8 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd_config.h"
 #include "base.h"
-#include "inspircd_config.h" 
 #include <time.h>
 #include <map>
 #include <string>
diff --git a/src/channels.cpp b/src/channels.cpp
index 7d58bffd3..0ae802ec1 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -16,10 +16,10 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
diff --git a/src/commands.cpp b/src/commands.cpp
index bf95d24c9..ae4b97c3e 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -16,10 +16,10 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
diff --git a/src/connection.cpp b/src/connection.cpp
index e4d6485c0..95363626e 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -16,7 +16,8 @@
 
 using namespace std;
 
-#include <connection.h>
+#include "inspircd.h"
+#include "connection.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <poll.h>
@@ -27,7 +28,6 @@ using namespace std;
 #include <string>
 #include <deque>
 #include <sstream>
-#include "inspircd.h"
 #include "modules.h"
 #include "inspstring.h"
 #include "helperfuncs.h"
diff --git a/src/dnsqueue.cpp b/src/dnsqueue.cpp
index 116f09010..f3397b59e 100644
--- a/src/dnsqueue.cpp
+++ b/src/dnsqueue.cpp
@@ -18,10 +18,10 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 9366c3842..1def9b582 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -16,8 +16,8 @@
 
 using namespace std;
 
-#include "globals.h"
 #include "inspircd_config.h"
+#include "globals.h"
 #include "dynamic.h"
 
 #ifndef STATIC_LINK
diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 13e28ea15..62aef7ffe 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -16,8 +16,8 @@
 
 using namespace std;
 
-#include <string>
 #include "inspircd.h"
+#include <string>
 #include "hashcomp.h"
 #include "helperfuncs.h"
 #ifdef GCC3
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 8f899e153..7d4321caa 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -16,10 +16,10 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 8b2c12ab6..43142f893 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -18,10 +18,10 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index 62d145361..754a25284 100644
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -16,6 +16,7 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/types.h>
diff --git a/src/inspircd_util.cpp b/src/inspircd_util.cpp
index e4c8d561d..d75ca0a11 100644
--- a/src/inspircd_util.cpp
+++ b/src/inspircd_util.cpp
@@ -16,6 +16,7 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h" 
 #include "inspircd_io.h" 
 #include "inspircd_util.h" 
diff --git a/src/message.cpp b/src/message.cpp
index d188f57f7..6e76449fc 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -16,10 +16,10 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
diff --git a/src/mode.cpp b/src/mode.cpp
index 794e2fefd..f18531a27 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -16,10 +16,10 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <sys/errno.h>
 #include <time.h>
diff --git a/src/modules.cpp b/src/modules.cpp
index b53dd4f7f..14b2abb3e 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -16,10 +16,10 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <sys/errno.h>
 
diff --git a/src/xline.cpp b/src/xline.cpp
index febe6f425..c37e629be 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -16,10 +16,10 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>