diff --git a/third_party/f8/f8/app.cc b/third_party/f8/f8/app.cc
index ef97e96..a36d18d 100644
--- a/third_party/f8/f8/app.cc
+++ b/third_party/f8/f8/app.cc
@@ -10,8 +10,8 @@
 #include <a8/sysutils.h>
 #include <a8/xobject.h>
 
-#include <f8/f8.h>
 #include <f8/udplog.h>
+#include <f8/types.h>
 #include <f8/app.h>
 #include <f8/msgqueue.h>
 #include <f8/timer.h>
diff --git a/third_party/f8/f8/btmgr.cc b/third_party/f8/f8/btmgr.cc
index 9ddfe8d..a99c692 100644
--- a/third_party/f8/f8/btmgr.cc
+++ b/third_party/f8/f8/btmgr.cc
@@ -1,5 +1,3 @@
-#include <f8/f8.h>
-
 #if 0
 #include "btmgr.h"
 
diff --git a/third_party/f8/f8/dbpool.cc b/third_party/f8/f8/dbpool.cc
index 8e8a305..faf52b5 100644
--- a/third_party/f8/f8/dbpool.cc
+++ b/third_party/f8/f8/dbpool.cc
@@ -1,6 +1,6 @@
 #include <assert.h>
 
-#include <f8/f8.h>
+#include <f8/types.h>
 
 #include <thread>
 #include <mutex>
diff --git a/third_party/f8/f8/f8.h b/third_party/f8/f8/f8.h
deleted file mode 100644
index 0ae5997..0000000
--- a/third_party/f8/f8/f8.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include <f8/types.h>
diff --git a/third_party/f8/f8/httpclientpool.cc b/third_party/f8/f8/httpclientpool.cc
index 0d5c339..d271679 100644
--- a/third_party/f8/f8/httpclientpool.cc
+++ b/third_party/f8/f8/httpclientpool.cc
@@ -1,6 +1,6 @@
 #include <assert.h>
 
-#include <f8/f8.h>
+#include <f8/types.h>
 
 #include <thread>
 #include <mutex>
diff --git a/third_party/f8/f8/jsonhttprequest.cc b/third_party/f8/f8/jsonhttprequest.cc
index 289e411..bafa10f 100644
--- a/third_party/f8/f8/jsonhttprequest.cc
+++ b/third_party/f8/f8/jsonhttprequest.cc
@@ -3,7 +3,7 @@
 #include <a8/strutils.h>
 #include <a8/mutable_xobject.h>
 
-#include <f8/f8.h>
+#include <f8/types.h>
 #include <f8/jsonhttprequest.h>
 
 namespace f8
diff --git a/third_party/f8/f8/jsonlog.cc b/third_party/f8/f8/jsonlog.cc
index 8ace7b3..c2a5a3d 100644
--- a/third_party/f8/f8/jsonlog.cc
+++ b/third_party/f8/f8/jsonlog.cc
@@ -5,7 +5,7 @@
 
 #include <a8/sysutils.h>
 
-#include <f8/f8.h>
+#include <f8/types.h>
 #include <f8/jsonlog.h>
 
 namespace f8
diff --git a/third_party/f8/f8/msgqueue.cc b/third_party/f8/f8/msgqueue.cc
index e2f05a6..4f29c51 100644
--- a/third_party/f8/f8/msgqueue.cc
+++ b/third_party/f8/f8/msgqueue.cc
@@ -4,7 +4,7 @@
 #include <map>
 
 
-#include <f8/f8.h>
+#include <f8/types.h>
 
 #include <f8/timer.h>
 
diff --git a/third_party/f8/f8/netmsghandler.cc b/third_party/f8/f8/netmsghandler.cc
index 4636b1a..97b6f77 100644
--- a/third_party/f8/f8/netmsghandler.cc
+++ b/third_party/f8/f8/netmsghandler.cc
@@ -1,7 +1,7 @@
 #include <google/protobuf/message.h>
 #include <google/protobuf/descriptor.h>
 
-#include <f8/f8.h>
+#include <f8/types.h>
 #include <f8/udplog.h>
 #include <f8/utils.h>
 #include <f8/protoutils.h>
diff --git a/third_party/f8/f8/protoutils.cc b/third_party/f8/f8/protoutils.cc
index 51e1c1d..c0106e8 100644
--- a/third_party/f8/f8/protoutils.cc
+++ b/third_party/f8/f8/protoutils.cc
@@ -1,4 +1,4 @@
-#include <f8/f8.h>
+#include <f8/types.h>
 
 #include "f8/protoutils.h"
 
diff --git a/third_party/f8/f8/timer.cc b/third_party/f8/f8/timer.cc
index 8a48506..ed4a6e6 100644
--- a/third_party/f8/f8/timer.cc
+++ b/third_party/f8/f8/timer.cc
@@ -1,6 +1,6 @@
 #include <a8/sysutils.h>
 
-#include <f8/f8.h>
+#include <f8/types.h>
 #include <f8/timer.h>
 
 
diff --git a/third_party/f8/f8/types.cc b/third_party/f8/f8/types.cc
index bddb989..270c0ab 100644
--- a/third_party/f8/f8/types.cc
+++ b/third_party/f8/f8/types.cc
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include <f8/f8.h>
+#include <f8/types.h>
 #include <a8/mutable_xobject.h>
 
 namespace f8
diff --git a/third_party/f8/f8/udplog.cc b/third_party/f8/f8/udplog.cc
index fc0dad5..c203bfb 100644
--- a/third_party/f8/f8/udplog.cc
+++ b/third_party/f8/f8/udplog.cc
@@ -4,8 +4,8 @@
 
 #include <a8/strutils.h>
 #include <a8/sysutils.h>
-#include <f8/f8.h>
 
+#include <f8/types.h>
 #include <f8/udplog.h>
 
 namespace f8
diff --git a/third_party/f8/f8/utils.cc b/third_party/f8/f8/utils.cc
index 1213f12..e9b6dd2 100644
--- a/third_party/f8/f8/utils.cc
+++ b/third_party/f8/f8/utils.cc
@@ -4,7 +4,7 @@
 #include <a8/strutils.h>
 #include <a8/mutable_xobject.h>
 
-#include <f8/f8.h>
+#include <f8/types.h>
 #include <f8/udplog.h>
 
 #include <google/protobuf/message.h>