5 files changed, 4 insertions, 6 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 2793843c7..11a5c944d 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -11,9 +11,9 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include <stdarg.h>
 #include "configreader.h"
-#include "inspircd.h"
 #include "users.h"
 #include "modules.h"
 #include "wildcard.h"
diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index ab1e6fa9b..179113cae 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -11,14 +11,13 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "dynamic.h"
 #ifndef WIN32
 #include <dlfcn.h>
 #endif
 
-#include "inspircd.h"
-
 DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
 {
 	err = NULL;
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 03d6879ba..f8ecc3b48 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include <stdarg.h>
 #include "configreader.h"
 #include "users.h"
@@ -18,7 +19,6 @@
 #include "wildcard.h"
 #include "mode.h"
 #include "xline.h"
-#include "inspircd.h"
 #include "exitcodes.h"
 
 static char TIMESTR[26];
diff --git a/src/modules.cpp b/src/modules.cpp
index cc334d4f7..75ec204b5 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
@@ -21,7 +22,6 @@
 #include "socketengine.h"
 #include "command_parse.h"
 #include "dns.h"
-#include "inspircd.h"
 
 // version is a simple class for holding a modules version number
 Version::Version(int major, int minor, int revision, int build, int flags, int api_ver)
diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index fc7c9f7df..f8506c97b 100644
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -142,7 +142,6 @@ CoreExport void closedir(DIR * handle);
 #pragma warning(disable:4800)
 #pragma warning(disable:4251)
 #pragma warning(disable:4275)
-#pragma warning(disable:4996)
 #pragma warning(disable:4244)		// warning C4244: '=' : conversion from 'long' to 'short', possible loss of data
 #pragma warning(disable:4267)		// warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data
 #pragma warning(disable:4805)		// warning C4805: '!=' : unsafe mix of type 'char' and type 'bool' in operation