diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e8ba9b..335e999 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(Astra)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
 set(CMAKE_CXX_STANDARD 17)
@@ -21,17 +20,19 @@ add_subdirectory(external)
 set(SRC
         src/main.cpp
         src/launchercore.cpp
+        include/launchercore.h
+        include/squarelauncher.h
         src/sapphirelauncher.cpp
         src/squareboot.cpp
         src/squarelauncher.cpp
         src/settingswindow.cpp
         src/blowfish.cpp
         src/assetupdater.cpp
-        src/assetupdater.h
+        include/assetupdater.h
         src/launcherwindow.cpp
-        src/launcherwindow.h
+        include/launcherwindow.h
         src/gamescopesettingswindow.cpp
-        src/gamescopesettingswindow.h)
+        include/gamescopesettingswindow.h)
 
 set(LIBRARIES
         Qt5::Core Qt5::Widgets Qt5::Network qt5keychain QuaZip)
@@ -40,9 +41,9 @@ if(ENABLE_WATCHDOG)
     set(LIBRARIES ${LIBRARIES} ${TESSERACT_LIBRARIES} ${LEPTONICA_LIBRARIES})
 
     set(SRC ${SRC}
-        src/watchdog.h
+            include/watchdog.h
         src/watchdog.cpp
-        src/gameparser.h
+            include/gameparser.h
         src/gameparser.cpp)
 endif()
 
@@ -58,7 +59,10 @@ add_executable(astra ${SRC})
 target_link_libraries(astra PUBLIC ${LIBRARIES})
 
 # disgusting, thanks qtkeychain and quazip
-target_include_directories(astra PRIVATE
+target_include_directories(astra
+        PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        PRIVATE
         ${CMAKE_BINARY_DIR}/_deps/qtkeychain-src
         ${CMAKE_BINARY_DIR}/_deps/qtkeychain-build
         ${CMAKE_BINARY_DIR}/_deps/quazip-src)
diff --git a/src/assetupdater.h b/include/assetupdater.h
similarity index 100%
rename from src/assetupdater.h
rename to include/assetupdater.h
diff --git a/src/blowfish.h b/include/blowfish.h
similarity index 100%
rename from src/blowfish.h
rename to include/blowfish.h
diff --git a/src/gameparser.h b/include/gameparser.h
similarity index 100%
rename from src/gameparser.h
rename to include/gameparser.h
diff --git a/src/gamescopesettingswindow.h b/include/gamescopesettingswindow.h
similarity index 100%
rename from src/gamescopesettingswindow.h
rename to include/gamescopesettingswindow.h
diff --git a/src/launchercore.h b/include/launchercore.h
similarity index 100%
rename from src/launchercore.h
rename to include/launchercore.h
diff --git a/src/launcherwindow.h b/include/launcherwindow.h
similarity index 100%
rename from src/launcherwindow.h
rename to include/launcherwindow.h
diff --git a/src/sapphirelauncher.h b/include/sapphirelauncher.h
similarity index 100%
rename from src/sapphirelauncher.h
rename to include/sapphirelauncher.h
diff --git a/src/settingswindow.h b/include/settingswindow.h
similarity index 100%
rename from src/settingswindow.h
rename to include/settingswindow.h
diff --git a/src/squareboot.h b/include/squareboot.h
similarity index 100%
rename from src/squareboot.h
rename to include/squareboot.h
diff --git a/src/squarelauncher.h b/include/squarelauncher.h
similarity index 100%
rename from src/squarelauncher.h
rename to include/squarelauncher.h
diff --git a/src/watchdog.h b/include/watchdog.h
similarity index 100%
rename from src/watchdog.h
rename to include/watchdog.h