diff --git a/src/stationapi/CMakeLists.txt b/src/stationapi/CMakeLists.txt
index 61670ef..6b93bbc 100644
--- a/src/stationapi/CMakeLists.txt
+++ b/src/stationapi/CMakeLists.txt
@@ -1,11 +1,5 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/externals/easyloggingpp
-    ${PROJECT_SOURCE_DIR}/externals/udplibrary
-    ${Boost_INCLUDE_DIRS}
-    ${SQLite3_INCLUDE_DIR})
 
-set(SOURCES
+add_library(stationapi
     Node.hpp
     NodeClient.cpp
     NodeClient.hpp
@@ -16,6 +10,17 @@ set(SOURCES
     StringUtils.cpp
     StringUtils.hpp)
 
-add_library(stationapi ${SOURCES})
+target_include_directories(stationapi PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${PROJECT_SOURCE_DIR}/externals/catch
+    ${PROJECT_SOURCE_DIR}/externals/easyloggingpp
+    ${PROJECT_SOURCE_DIR}/externals/udplibrary
+    ${Boost_INCLUDE_DIRS}
+    ${SQLite3_INCLUDE_DIR})
 
-GroupSourceByFilesystem("${SOURCES}")
+add_executable(stationapi_tests
+    Serialization_Tests.cpp
+    StringUtils_Tests.cpp)
+
+target_link_libraries(stationapi_tests
+    stationapi)
diff --git a/src/stationchat/CMakeLists.txt b/src/stationchat/CMakeLists.txt
index 45b03b3..1ccac1f 100644
--- a/src/stationchat/CMakeLists.txt
+++ b/src/stationchat/CMakeLists.txt
@@ -1,12 +1,5 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/src/stationapi
-    ${PROJECT_SOURCE_DIR}/externals/easyloggingpp
-    ${PROJECT_SOURCE_DIR}/externals/udplibrary
-    ${Boost_INCLUDE_DIRS}
-    ${SQLite3_INCLUDE_DIR})
 
-set(SOURCES
+add_executable(stationchat
     protocol/AddBan.hpp
     protocol/AddFriend.hpp
     protocol/AddIgnore.hpp
@@ -69,16 +62,15 @@ set(SOURCES
     StationChatApp.hpp
     StationChatConfig.hpp)
 
-add_executable(stationchat ${SOURCES})
-
-GroupSourceByFilesystem("${SOURCES}")
-
 target_link_libraries(stationchat
     stationapi
     udplibrary
     ${Boost_LIBRARIES}
     ${SQLite3_LIBRARY})
 
+target_include_directories(stationchat PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR})
+
 if(WIN32)
     target_link_libraries(stationchat ws2_32)
 endif()