libraries/db/CMakeLists.txt

@@ -1,6 +1,6 @@
 file(GLOB HEADERS "include/graphene/db/*.hpp")
 add_library( graphene_db undo_database.cpp index.cpp object_database.cpp ${HEADERS} )
-target_link_libraries( graphene_db fc )
+target_link_libraries( graphene_db graphene_protocol fc )
 target_include_directories( graphene_db PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
 
 install( TARGETS

libraries/db/include/graphene/db/object.hpp

@@ -22,10 +22,10 @@
  * THE SOFTWARE.
  */
 #pragma once
-#include <graphene/db/object_id.hpp>
-#include <boost/multiprecision/integer.hpp>
+#include <graphene/protocol/object_id.hpp>
 #include <fc/io/raw.hpp>
 #include <fc/crypto/city.hpp>
+#include <boost/multiprecision/integer.hpp>
 
 #define MAX_NESTING (200)
 

libraries/protocol/CMakeLists.txt

@@ -41,7 +41,7 @@ list(APPEND SOURCES account.cpp
 
 
 add_library( graphene_protocol ${SOURCES} ${HEADERS} )
-target_link_libraries( graphene_protocol graphene_db fc )
+target_link_libraries( graphene_protocol fc )
 target_include_directories( graphene_protocol PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
 
 install( TARGETS

libraries/protocol/include/graphene/protocol/types.hpp

@@ -46,7 +46,7 @@
 #include <deque>
 #include <cstdint>
 #include <graphene/protocol/address.hpp>
-#include <graphene/db/object_id.hpp>
+#include <graphene/protocol/object_id.hpp>
 #include <graphene/protocol/config.hpp>
 
 #include <boost/rational.hpp>