diff --git a/CMakeLists.txt b/CMakeLists.txt
index c95ccc4..0ff7494 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,11 +35,11 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 # Include directories
 #-------------------------------------------------------------------------------------------
 target_include_directories(EATest PUBLIC include)
+target_include_directories(EATest PRIVATE ../EABase/include/Common)
 
 #-------------------------------------------------------------------------------------------
 # Dependencies
 #-------------------------------------------------------------------------------------------
-target_link_libraries(EATest EABase)
 target_link_libraries(EATest EAStdC)
 target_link_libraries(EATest EASTL)
 target_link_libraries(EATest EAMain)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0e73d26..cd7d96d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -50,7 +50,7 @@ add_subdirectory(packages/EAStdC)
 add_subdirectory(packages/EAThread)
 
 target_link_libraries(EATestTest EAAssert)
-target_link_libraries(EATestTest EABase)
+)
 target_link_libraries(EATestTest EAMain)
 target_link_libraries(EATestTest EASTL)
 target_link_libraries(EATestTest EAStdC)