diff --git a/src/nostalgia/studio/CMakeLists.txt b/src/nostalgia/studio/CMakeLists.txt
index c95f948ba..d05533a5c 100644
--- a/src/nostalgia/studio/CMakeLists.txt
+++ b/src/nostalgia/studio/CMakeLists.txt
@@ -12,14 +12,6 @@ add_executable(
 
 target_link_libraries(
 	nostalgia-studio
-		c++fs
-		Qt5::Core
-		Qt5::Widgets
-		OxClArgs
-		OxFS
-		OxStd
-		NostalgiaCommon
-		NostalgiaCore
 		NostalgiaStudio
 		NostalgiaTool
 )
diff --git a/src/nostalgia/studio/lib/CMakeLists.txt b/src/nostalgia/studio/lib/CMakeLists.txt
index 0b36f0441..44f0e7051 100644
--- a/src/nostalgia/studio/lib/CMakeLists.txt
+++ b/src/nostalgia/studio/lib/CMakeLists.txt
@@ -19,14 +19,10 @@ install(TARGETS NostalgiaStudio
         LIBRARY DESTINATION ${NOSTALGIA_DIST_LIB}/nostalgia)
 
 target_link_libraries(
-	NostalgiaStudio
-		c++fs
-		Qt5::Core
+	NostalgiaStudio PUBLIC
 		Qt5::Widgets
 		OxFS
 		OxMetalClaw
-		OxTrace
-		OxStd
 )
 
 install(
@@ -50,7 +46,6 @@ add_executable(
 
 target_link_libraries(
 	NostalgiaStudioJsonTest
-		c++fs
 		NostalgiaStudio
 )
 
diff --git a/src/nostalgia/tools/lib/CMakeLists.txt b/src/nostalgia/tools/lib/CMakeLists.txt
index 448ff7f88..6b2c21452 100644
--- a/src/nostalgia/tools/lib/CMakeLists.txt
+++ b/src/nostalgia/tools/lib/CMakeLists.txt
@@ -4,18 +4,16 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
 add_library(
-	NostalgiaTool
-	SHARED
+	NostalgiaTool SHARED
 		tilesetimport.cpp
 )
 
 target_link_libraries(
-	NostalgiaTool
+	NostalgiaTool PUBLIC
 		Qt5::Widgets
 		OxClArgs
 		OxFS
 		OxStd
-		NostalgiaCommon
 		NostalgiaCore
 )