diff --git a/Bingoo/library/CMakeLists.txt b/Bingoo/library/CMakeLists.txt
index 4d2c7de..6563e8e 100644
--- a/Bingoo/library/CMakeLists.txt
+++ b/Bingoo/library/CMakeLists.txt
@@ -226,11 +226,13 @@ endif()
 
 target_include_directories(${CURRENT_TARGET_NAME}
     PUBLIC ${MY_PUBLIC_INCLUDES}
+	${PROJECT_SOURCE_DIR}/../Core/Inc
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_link_libraries(${CURRENT_TARGET_NAME}
         PRIVATE m
+        stm32cubemx
     )
 
 string(TOLOWER "${CMAKE_SYSTEM_NAME}" SYSTEM_NAME_LOWER)
diff --git a/Bingoo/main/CMakeLists.txt b/Bingoo/main/CMakeLists.txt
index c8415b5..d031efd 100644
--- a/Bingoo/main/CMakeLists.txt
+++ b/Bingoo/main/CMakeLists.txt
@@ -31,19 +31,11 @@ endif()
 target_include_directories(${TARGET_NAME}
     PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/include
-        ${PROJECT_SOURCE_DIR}/include/peripheral
-        ${PROJECT_SOURCE_DIR}/include/protocol
-        ${PROJECT_SOURCE_DIR}/include/manger
 )
 
-if(TARGET list)
-    target_link_libraries(${TARGET_NAME} PRIVATE list)
-endif()
-
 if(DEFINED GLOBAL_ENABLED_MODULES AND NOT GLOBAL_ENABLED_MODULES STREQUAL "")
     message(STATUS "[Main] Linking modules: ${GLOBAL_ENABLED_MODULES}")
-    target_link_libraries(${TARGET_NAME} PRIVATE ${GLOBAL_ENABLED_MODULES})
+    target_link_libraries(${TARGET_NAME} PUBLIC ${GLOBAL_ENABLED_MODULES})
 else()
     message(STATUS "[Main] No additional modules linked.")
 endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index feb0409..6cc7a97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,7 @@ target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE
 
 # Add project symbols (macros)
 target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE
+	hlpuart1Exit
     # Add user defined symbols
 )