diff --git a/include/config.h b/include/config.h
index f787f60b0..022ee503d 100644
--- a/include/config.h
+++ b/include/config.h
@@ -15,7 +15,6 @@
 #include "regchannel.h"
 #include "users.h"
 #include "opertype.h"
-#include <stack>
 
 namespace Configuration
 {
diff --git a/include/modules/sql.h b/include/modules/sql.h
index 1fe87b5f1..8ac03803f 100644
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <stdexcept>
+
 namespace SQL
 {
 
diff --git a/include/services.h b/include/services.h
index 933ab6952..280d34554 100644
--- a/include/services.h
+++ b/include/services.h
@@ -11,39 +11,33 @@
 
 #pragma once
 
+#include <cstdarg>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+
+#include <algorithm>
+#include <bitset>
+#include <deque>
+#include <exception>
+#include <fstream>
+#include <iostream>
+#include <list>
+#include <map>
+#include <set>
+#include <sstream>
+#include <vector>
+
+#ifndef _WIN32
+# include <unistd.h>
+#endif
+
+#include "defs.h"
 #include "sysconf.h"
 
 #define BUFSIZE 1024
 
-#include <cstdio>
-#include <cstdlib>
-#include <cstdarg>
-#include <stdexcept>
-
-#include <cstring>
-
-#ifndef _WIN32
-#include <unistd.h>
-#endif
-
-/* Pull in the various bits of STL */
-#include <cstdint>
-#include <cstddef>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <map>
-#include <exception>
-#include <list>
-#include <vector>
-#include <deque>
-#include <bitset>
-#include <set>
-#include <algorithm>
-#include <iterator>
-
-#include "defs.h"
-
 #define _(x) x
 
 #ifndef _WIN32
diff --git a/src/config.cpp b/src/config.cpp
index b6c7ff4cf..ca36bea7d 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -17,6 +17,9 @@
 #include "channels.h"
 #include "hashcomp.h"
 
+#include <stack>
+#include <stdexcept>
+
 using Configuration::File;
 using Configuration::Conf;
 using Configuration::Internal::Block;
diff --git a/src/threadengine.cpp b/src/threadengine.cpp
index 7e1e76693..08765c4e4 100644
--- a/src/threadengine.cpp
+++ b/src/threadengine.cpp
@@ -13,6 +13,8 @@
 #include "threadengine.h"
 #include "anope.h"
 
+#include <stdexcept>
+
 static void *entry_point(void *parameter)
 {
 	Thread *thread = static_cast<Thread *>(parameter);