diff --git a/f8/dynmodule.cc b/f8/dynmodule.cc
index 9703242..a3e6281 100644
--- a/f8/dynmodule.cc
+++ b/f8/dynmodule.cc
@@ -1,4 +1,4 @@
-#include "framework/cpp/dynmodule.h"
+#include "f8/dynmodule.h"
 
 namespace f8
 {
diff --git a/f8/httpclientpool.cc b/f8/httpclientpool.cc
index 47a7762..59b3a7a 100644
--- a/f8/httpclientpool.cc
+++ b/f8/httpclientpool.cc
@@ -17,9 +17,9 @@
 #include <a8/curl.h>
 #include <a8/mutable_xobject.h>
 
-#include "framework/cpp/httpclientpool.h"
-#include "framework/cpp/msgqueue.h"
-#include "framework/cpp/utils.h"
+#include "f8/httpclientpool.h"
+#include "f8/msgqueue.h"
+#include "f8/utils.h"
 
 #define F8_MUTLI_THREAD_HTTP 1
 
diff --git a/f8/msgqueue.cc b/f8/msgqueue.cc
index c6ec471..df92825 100644
--- a/f8/msgqueue.cc
+++ b/f8/msgqueue.cc
@@ -2,7 +2,7 @@
 
 #include <a8/timer.h>
 
-#include "framework/cpp/msgqueue.h"
+#include "f8/msgqueue.h"
 #include "app.h"
 
 namespace f8
diff --git a/f8/netmsghandler.cc b/f8/netmsghandler.cc
index 1a53dbb..58b1dd4 100644
--- a/f8/netmsghandler.cc
+++ b/f8/netmsghandler.cc
@@ -4,9 +4,9 @@
 #include <google/protobuf/message.h>
 #include <google/protobuf/descriptor.h>
 
-#include "framework/cpp/utils.h"
-#include "framework/cpp/protoutils.h"
-#include "framework/cpp/netmsghandler.h"
+#include "f8/utils.h"
+#include "f8/protoutils.h"
+#include "f8/netmsghandler.h"
 
 namespace f8
 {
diff --git a/f8/protoutils.cc b/f8/protoutils.cc
index 76991fa..09cb7cd 100644
--- a/f8/protoutils.cc
+++ b/f8/protoutils.cc
@@ -1,6 +1,6 @@
 #include "precompile.h"
 
-#include "framework/cpp/protoutils.h"
+#include "f8/protoutils.h"
 
 #include <a8/tcpclient.h>
 #include <a8/asynctcpclient.h>
diff --git a/f8/tiledmap.cc b/f8/tiledmap.cc
index 32a134f..fd4ac3a 100644
--- a/f8/tiledmap.cc
+++ b/f8/tiledmap.cc
@@ -1,7 +1,7 @@
 #include <a8/a8.h>
 #include <cmath>
 #include <a8/stringlist.h>
-#include "framework/cpp/tiledmap.h"
+#include "f8/tiledmap.h"
 
 namespace f8
 {
diff --git a/f8/types.cc b/f8/types.cc
index e22f8b8..818b848 100644
--- a/f8/types.cc
+++ b/f8/types.cc
@@ -1,6 +1,6 @@
 #include "precompile.h"
 
-#include "framework/cpp/types.h"
+#include "f8/types.h"
 #include <a8/mutable_xobject.h>
 
 namespace f8
diff --git a/f8/utils.cc b/f8/utils.cc
index e2702af..9b66f20 100644
--- a/f8/utils.cc
+++ b/f8/utils.cc
@@ -10,11 +10,9 @@
 
 #include <google/protobuf/message.h>
 #include <google/protobuf/stubs/common.h>
-#if GOOGLE_PROTOBUF_VERSION > 2005000
 #include <google/protobuf/util/json_util.h>
-#endif
 
-#include "framework/cpp/utils.h"
+#include "f8/utils.h"
 
 namespace f8
 {
@@ -538,15 +536,11 @@ namespace f8
     std::string PbToJson(google::protobuf::Message* pbmsg)
     {
         std::string json;
-#if GOOGLE_PROTOBUF_VERSION > 2005000
         google::protobuf::util::JsonPrintOptions options;
         options.add_whitespace = true;
         options.always_print_primitive_fields = true;
         options.preserve_proto_field_names = true;
         MessageToJsonString(*pbmsg, &json, options).ok();
-#else
-        json = "{}";
-#endif
         return json;
     }