diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7162fc7..53511eb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,25 +27,16 @@ target_include_directories(InfluxDB-Internal PRIVATE ${INTERNAL_INCLUDE_DIRS})
 target_link_libraries(InfluxDB-Internal PRIVATE cpr::cpr)
 
 
-add_library(InfluxDB-Core OBJECT
-  InfluxDB.cxx
-  Point.cxx
-  InfluxDBFactory.cxx
-  InfluxDBBuilder.cxx
-  Proxy.cxx
-  )
-target_include_directories(InfluxDB-Core PUBLIC
-    ${PROJECT_SOURCE_DIR}/include
-    ${PROJECT_BINARY_DIR}/src
-)
-target_link_libraries(InfluxDB-Core PRIVATE cpr::cpr)
-
-
 add_library(InfluxDB
-    $<TARGET_OBJECTS:InfluxDB-Core>
+    InfluxDB.cxx
+    Point.cxx
+    InfluxDBFactory.cxx
+    InfluxDBBuilder.cxx
+    Proxy.cxx
     $<TARGET_OBJECTS:InfluxDB-Internal>
     $<TARGET_OBJECTS:InfluxDB-BoostSupport>
     )
+target_link_libraries(InfluxDB PRIVATE cpr::cpr)
 add_library(InfluxData::InfluxDB ALIAS InfluxDB)
 
 #
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7fe4a88..aefcd52 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -34,7 +34,7 @@ add_unittest(LineProtocolTest DEPENDS InfluxDB InfluxDB-Internal)
 add_unittest(InfluxDBTest DEPENDS InfluxDB)
 add_unittest(InfluxDBFactoryTest DEPENDS InfluxDB)
 add_unittest(ProxyTest DEPENDS InfluxDB)
-add_unittest(HttpTest DEPENDS InfluxDB-Core InfluxDB-Internal InfluxDB-BoostSupport CprMock Threads::Threads)
+add_unittest(HttpTest DEPENDS CprMock InfluxDB InfluxDB-Internal InfluxDB-BoostSupport Threads::Threads)
 add_unittest(UriParserTest)
 
 add_unittest(NoBoostSupportTest)