diff --git a/a8/asynctcpclient.cc b/a8/asynctcpclient.cc
index ed1c2c9..0ca99e9 100644
--- a/a8/asynctcpclient.cc
+++ b/a8/asynctcpclient.cc
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <assert.h>
 
 #include <mutex>
 #include <condition_variable>
diff --git a/a8/collision.cc b/a8/collision.cc
index 80cd40c..b0b80de 100644
--- a/a8/collision.cc
+++ b/a8/collision.cc
@@ -1,3 +1,5 @@
+#include <assert.h>
+
 #include <a8/a8.h>
 
 #include <algorithm>
diff --git a/a8/csvreader.cc b/a8/csvreader.cc
index 20692b3..61404bb 100644
--- a/a8/csvreader.cc
+++ b/a8/csvreader.cc
@@ -1,3 +1,5 @@
+#include <assert.h>
+
 #include <a8/a8.h>
 #include <a8/stringlist.h>
 #include <a8/csvreader.h>
diff --git a/a8/ioloop.h b/a8/ioloop.h
index fcfad17..710bf10 100644
--- a/a8/ioloop.h
+++ b/a8/ioloop.h
@@ -3,6 +3,7 @@
 #include <atomic>
 #include <a8/a8.h>
 #include <a8/types.h>
+#include <a8/singleton.h>
 
 namespace a8
 {
diff --git a/a8/jsonlog.h b/a8/jsonlog.h
index b006744..2fc79f7 100644
--- a/a8/jsonlog.h
+++ b/a8/jsonlog.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <a8/singleton.h>
+
 namespace a8
 {
 
diff --git a/a8/mysql.cc b/a8/mysql.cc
index d605e3d..51e8660 100644
--- a/a8/mysql.cc
+++ b/a8/mysql.cc
@@ -1,3 +1,5 @@
+#include <assert.h>
+
 #include <a8/a8.h>
 #include <a8/mysql.h>
 
diff --git a/a8/perfmonitor.h b/a8/perfmonitor.h
index 1a69c78..9d2db44 100644
--- a/a8/perfmonitor.h
+++ b/a8/perfmonitor.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <a8/singleton.h>
+
 namespace a8
 {
 
diff --git a/a8/strutils.cc b/a8/strutils.cc
index 06c90b6..b0ac599 100644
--- a/a8/strutils.cc
+++ b/a8/strutils.cc
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <assert.h>
 
 #include <a8/a8.h>
 #include <a8/strutils.h>
diff --git a/a8/tcpclient.cc b/a8/tcpclient.cc
index 67c8468..dca35b7 100644
--- a/a8/tcpclient.cc
+++ b/a8/tcpclient.cc
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <assert.h>
 
 #include <mutex>
 #include <condition_variable>
diff --git a/a8/tcplistener.cc b/a8/tcplistener.cc
index 50e4d2a..e32b7b1 100644
--- a/a8/tcplistener.cc
+++ b/a8/tcplistener.cc
@@ -1,5 +1,6 @@
 #include <memory.h>
 #include <unistd.h>
+#include <assert.h>
 
 #include <arpa/inet.h>
 #include <fcntl.h>
diff --git a/a8/timer.h b/a8/timer.h
index 5d14ce1..b62b2c1 100644
--- a/a8/timer.h
+++ b/a8/timer.h
@@ -3,6 +3,8 @@
  */
 #pragma once
 
+#include <a8/singleton.h>
+
 struct timer_list;
 struct tvec_base;
 
diff --git a/a8/udplog.h b/a8/udplog.h
index 2b111e0..2c71f43 100644
--- a/a8/udplog.h
+++ b/a8/udplog.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <a8/singleton.h>
+
 namespace a8
 {
 
diff --git a/a8/xobject.cc b/a8/xobject.cc
index ed540ea..d7acac4 100644
--- a/a8/xobject.cc
+++ b/a8/xobject.cc
@@ -1,3 +1,5 @@
+#include <assert.h>
+
 #include <a8/a8.h>
 #include <a8/xobject.h>