diff --git a/CMakeLists.txt b/CMakeLists.txt
index 982b23d..bbf4d8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,11 +40,11 @@ add_definitions(-DEAMAIN_NETWORK_CHANNEL_PORT=8080)
 #-------------------------------------------------------------------------------------------
 target_include_directories(EAMain PUBLIC include)
 target_include_directories(EAMain PUBLIC source)
+target_include_directories(EAMain PRIVATE ../EABase/include/Common)
 
 #-------------------------------------------------------------------------------------------
 # Package Dependencies 
 #-------------------------------------------------------------------------------------------
-target_link_libraries(EAMain EABase)
 target_link_libraries(EAMain EAAssert)
 target_link_libraries(EAMain EAStdC)
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8b2293a..278ca31 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -43,7 +43,7 @@ add_subdirectory(packages/EAStdC)
 add_subdirectory(packages/EATest)
 add_subdirectory(packages/EAThread)
 
-target_link_libraries(EAMainTest EABase)
+)
 target_link_libraries(EAMainTest EAAssert)
 target_link_libraries(EAMainTest EAMain)
 target_link_libraries(EAMainTest EASTL)