diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bf3131..62b1799 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,11 +37,11 @@ add_definitions(-D_CHAR16T)
 # Include directories
 #-------------------------------------------------------------------------------------------
 target_include_directories(EAStdC PUBLIC include)
+target_include_directories(EAStdC PRIVATE ../EABase/include/Common)
 
 #-------------------------------------------------------------------------------------------
 # Dependencies
 #-------------------------------------------------------------------------------------------
-target_link_libraries(EAStdC EABase)
 target_link_libraries(EAStdC EAAssert)
 target_link_libraries(EAStdC EAThread)
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5300728..49a50ec 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -49,7 +49,7 @@ add_subdirectory(packages/EASTL)
 add_subdirectory(packages/EATest)
 add_subdirectory(packages/EAThread)
 
-target_link_libraries(EAStdCTest EABase)
+)
 target_link_libraries(EAStdCTest EAAssert)
 target_link_libraries(EAStdCTest EAMain)
 target_link_libraries(EAStdCTest EASTL)