diff --git a/.gitmodules b/.gitmodules
index fa607a9..bedad8c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "cmake-modules/libsodium"]
-	path = cmake-modules/libsodium
+	path = lib/libsodium
 	url = https://github.com/robinlinden/libsodium-cmake.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da9ee15..8e77ca7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,6 @@ endif ()
 set(SODIUM_DISABLE_TESTS ON)
 set(SODIUM_MINIMAL ON)
 set(SODIUM_STATIC ON)
-add_subdirectory(cmake-modules/libsodium)
 
 # compile laikalib, tools, cnc & bot
 add_subdirectory(lib)
diff --git a/bot/CMakeLists.txt b/bot/CMakeLists.txt
index 9d1f39f..84b72cf 100644
--- a/bot/CMakeLists.txt
+++ b/bot/CMakeLists.txt
@@ -9,7 +9,8 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 # compile LaikaBot
 file(GLOB_RECURSE BOTSOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/**.c)
-add_executable(LaikaBot ${BOTSOURCE})
+file(GLOB_RECURSE BOTHEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/**.h)
+add_executable(LaikaBot ${BOTSOURCE} ${BOTHEADERS})
 target_link_libraries(LaikaBot PUBLIC LaikaLib)
 
 # add the 'DEBUG' preprocessor definition if we're compiling as Debug
diff --git a/cnc/CMakeLists.txt b/cnc/CMakeLists.txt
index 6118fc9..12b11e8 100644
--- a/cnc/CMakeLists.txt
+++ b/cnc/CMakeLists.txt
@@ -9,7 +9,8 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 # compile LaikaCNC
 file(GLOB_RECURSE CNCSOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/**.c)
-add_executable(LaikaCNC ${CNCSOURCE})
+file(GLOB_RECURSE CNCHEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/**.h)
+add_executable(LaikaCNC ${CNCSOURCE} ${CNCHEADERS})
 target_link_libraries(LaikaCNC PUBLIC LaikaLib)
 
 # add the 'DEBUG' preprocessor definition if we're compiling as Debug
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e0bb0aa..a5bc6e8 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -24,16 +24,20 @@ configure_file(${LIB_INCLUDEDIR}/lconfig.h.in ${LIB_INCLUDEDIR}/lconfig.h)
 # Put CMake targets (ALL_BUILD/ZERO_CHECK) into a folder
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+# include libsodium
+add_subdirectory(libsodium)
+
 # compile LaikaLib library
 file(GLOB_RECURSE LIBSOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/**.c ${CMAKE_CURRENT_SOURCE_DIR}/vendor/**.c)
-add_library(LaikaLib STATIC ${LIBSOURCE})
+file(GLOB_RECURSE LIBHEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/**.h)
+add_library(LaikaLib STATIC ${LIBSOURCE} ${LIBHEADERS})
 target_link_libraries(LaikaLib PRIVATE sodium)
 
 # add the version definitions and the 'DEBUG' preprocessor definition if we're compiling as Debug
 target_compile_definitions(LaikaLib PUBLIC "$<$<CONFIG:Debug>:DEBUG>")
 
 # add include directory
-target_include_directories(LaikaLib PUBLIC ${LIB_INCLUDEDIR} ${sodium_INCLUDE_DIR})
+target_include_directories(LaikaLib PUBLIC ${LIB_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/libsodium/libsodium/src/libsodium/include)
 
 # set library name
 set_target_properties(LaikaLib PROPERTIES OUTPUT_NAME laika-${LAIKA_VERSION_MAJOR}.${LAIKA_VERSION_MINOR})
diff --git a/cmake-modules/libsodium b/lib/libsodium
similarity index 100%
rename from cmake-modules/libsodium
rename to lib/libsodium
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index d68bf1a..e3b2300 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -9,7 +9,8 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 # compile LaikaShell
 file(GLOB_RECURSE SHELLSOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/**.c)
-add_executable(LaikaShell ${SHELLSOURCE})
+file(GLOB_RECURSE SHELLHEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/**.h)
+add_executable(LaikaShell ${SHELLSOURCE} ${SHELLHEADERS})
 target_link_libraries(LaikaShell PUBLIC LaikaLib)
 
 # add the 'DEBUG' preprocessor definition if we're compiling as Debug