diff --git a/include/ircd/cache.h b/include/ircd/cache.h
index 5aacb75c0..0542adcf0 100644
--- a/include/ircd/cache.h
+++ b/include/ircd/cache.h
@@ -1,7 +1,3 @@
-#include <map>
-#include <vector>
-#include "ircd/util.h"
-
 #pragma once
 #define HAVE_IRCD_CACHE_H
 
diff --git a/include/ircd/capability.h b/include/ircd/capability.h
index c82431b2e..758cf1d1d 100644
--- a/include/ircd/capability.h
+++ b/include/ircd/capability.h
@@ -21,8 +21,7 @@
 #ifndef __CAPABILITY_H__
 #define __CAPABILITY_H__
 
-#include <ircd/stdinc.h>
-#include <ircd/util.h>
+#include "stdinc.h"
 
 struct CapabilityEntry {
 	std::string cap;
diff --git a/include/ircd/parse.h b/include/ircd/parse.h
index 4f45b6362..fb145fdc3 100644
--- a/include/ircd/parse.h
+++ b/include/ircd/parse.h
@@ -24,10 +24,7 @@
 
 #ifndef INCLUDED_parse_h_h
 #define INCLUDED_parse_h_h
-
 #include <rb/dictionary.h>
-#include <ircd/util.h>
-#include <map>
 
 struct Message;
 struct Client;
diff --git a/include/ircd/stdinc.h b/include/ircd/stdinc.h
index 8c5ba5fe2..05f75c62b 100644
--- a/include/ircd/stdinc.h
+++ b/include/ircd/stdinc.h
@@ -22,5 +22,6 @@
  */
 
 #include <rb/rb.h>
+#include "util.h"
 #include "defaults.h"
 #include "fs.h"
diff --git a/include/ircd/util.h b/include/ircd/util.h
index eb2cd659d..d5b5691c7 100644
--- a/include/ircd/util.h
+++ b/include/ircd/util.h
@@ -28,10 +28,6 @@
 
 #ifdef __cplusplus
 
-#include <memory>
-#include <functional>
-#include <map>
-
 inline namespace ircd {
 inline namespace util {
 
diff --git a/include/rb/requires.h b/include/rb/requires.h
index 95447c844..e07f355cb 100644
--- a/include/rb/requires.h
+++ b/include/rb/requires.h
@@ -68,13 +68,13 @@ extern "C" {
 #include <RB_INC_ARRAY
 #include <RB_INC_VECTOR
 #include <RB_INC_STRING
-//#include <RB_INC_MAP
-//#include <RB_INC_SET
-//#include <RB_INC_LIST
+#include <RB_INC_MAP
+#include <RB_INC_SET
+#include <RB_INC_LIST
 //#include <RB_INC_FORWARD_LIST
 //#include <RB_INC_UNORDERED_MAP
 //#include <RB_INC_DEQUE
-//#include <RB_INC_SSTREAM
+#include <RB_INC_SSTREAM
 //#include <RB_INC_FSTREAM
 #include <RB_INC_IOSTREAM
 #include <RB_INC_CSTDIO
diff --git a/ircd/capability.cc b/ircd/capability.cc
index 2423fe927..6dbd3b59d 100644
--- a/ircd/capability.cc
+++ b/ircd/capability.cc
@@ -21,9 +21,7 @@
 #include <ircd/stdinc.h>
 #include <ircd/capability.h>
 #include <ircd/s_assert.h>
-
 #include <rb/format.h>
-#include <list>
 
 static std::list<CapabilityIndex *> capability_indexes;