diff --git a/a8/a8.h b/a8/a8.h
index c974ba9..5aaa0cc 100644
--- a/a8/a8.h
+++ b/a8/a8.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <assert.h>
-
 #include <any>
 #include <string>
 #include <vector>
@@ -23,22 +21,6 @@
 
 #include <a8/strutils.h>
 #include <a8/sysutils.h>
-#include <a8/singleton.h>
-
-namespace std
-{
-    class thread;
-    class mutex;
-    class condition_variable;
-};
-
-namespace google
-{
-    namespace protobuf
-    {
-        class Message;
-    }
-}
 
 #define NEW_NET
 #define A8_SAFE_DELETE(p) { if(p){delete(p);  (p)=nullptr;} }
diff --git a/a8/sysutils.cc b/a8/sysutils.cc
index e266e8a..e2a2d88 100644
--- a/a8/sysutils.cc
+++ b/a8/sysutils.cc
@@ -1,3 +1,5 @@
+#include <assert.h>
+
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/stat.h>
@@ -335,4 +337,9 @@ namespace a8
         }
     }
 
+    void Abort()
+    {
+        abort();
+    }
+
 }
diff --git a/a8/sysutils.h b/a8/sysutils.h
index cc2d317..d48aa7e 100644
--- a/a8/sysutils.h
+++ b/a8/sysutils.h
@@ -95,4 +95,6 @@ namespace a8
     float RandAngle();
 
     void ClearSendQueue(a8::SendQueueNode* node);
+
+    void Abort();
 }
diff --git a/a8/types.h b/a8/types.h
index 4b03168..6678723 100644
--- a/a8/types.h
+++ b/a8/types.h
@@ -1,5 +1,20 @@
 #pragma once
 
+namespace std
+{
+    class thread;
+    class mutex;
+    class condition_variable;
+};
+
+namespace google
+{
+    namespace protobuf
+    {
+        class Message;
+    }
+}
+
 namespace a8
 {
     typedef long long tick_t;