diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 04b6e56c..902bafcf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -138,7 +138,6 @@ target_link_libraries(CemuBin PRIVATE
 	CemuGui
 	CemuInput
 	CemuUtil
-	OpenGL::GL
 	SDL2::SDL2
 )
 
diff --git a/src/Cafe/CMakeLists.txt b/src/Cafe/CMakeLists.txt
index 8da817bc..7033014b 100644
--- a/src/Cafe/CMakeLists.txt
+++ b/src/Cafe/CMakeLists.txt
@@ -559,28 +559,17 @@ else()
 endif()
 
 target_link_libraries(CemuCafe PRIVATE
-	CemuAudio
 	CemuCommon
-	CemuComponents
-	CemuConfig
-	CemuGui
-	CemuInput
-	CemuResource
-	CemuUtil
-	imguiImpl
-	Boost::headers
-	Boost::nowide
-	CURL::libcurl
-	fmt::fmt
-	${glslang_target}
-	ih264d
-	OpenSSL::Crypto
-	OpenSSL::SSL
-	PNG::PNG
-	pugixml::pugixml
-	ZArchive::zarchive
-	ZLIB::ZLIB
-	zstd::zstd
+  CemuGui
+  ZArchive::zarchive
+  imguiImpl
+  pugixml::pugixml
+  ZLIB::ZLIB
+  CURL::libcurl
+  ih264d
+  ${glslang_target}
+  PUBLIC
+  OpenSSL::SSL
 )
 
 if (ENABLE_WAYLAND)
diff --git a/src/Cemu/CMakeLists.txt b/src/Cemu/CMakeLists.txt
index cdf71c62..83ab0af6 100644
--- a/src/Cemu/CMakeLists.txt
+++ b/src/Cemu/CMakeLists.txt
@@ -43,17 +43,8 @@ set_property(TARGET CemuComponents PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$
 target_include_directories(CemuComponents PUBLIC "../")
 
 target_link_libraries(CemuComponents PRIVATE
-	CemuCafe
 	CemuCommon
-	CemuConfig
-	CemuGui
-	CemuUtil
-	Boost::headers
-	CURL::libcurl
-	OpenSSL::Crypto
-	OpenSSL::SSL
-	pugixml::pugixml
-	ZLIB::ZLIB
+  CemuGui
 )
 
 # PUBLIC because fmt/format.h is included in ExpressionParser/ExpressionParser.h
diff --git a/src/Common/CMakeLists.txt b/src/Common/CMakeLists.txt
index dec0bc42..971dfd80 100644
--- a/src/Common/CMakeLists.txt
+++ b/src/Common/CMakeLists.txt
@@ -59,9 +59,6 @@ target_precompile_headers(CemuCommon PUBLIC precompiled.h)
 target_include_directories(CemuCommon PUBLIC "../")
 
 target_link_libraries(CemuCommon PRIVATE
-	CemuCafe
-	CemuConfig
-	CemuComponents
 	Boost::nowide
 	Boost::filesystem
 	glm::glm
diff --git a/src/audio/CMakeLists.txt b/src/audio/CMakeLists.txt
index a1d1a1d9..8d01499e 100644
--- a/src/audio/CMakeLists.txt
+++ b/src/audio/CMakeLists.txt
@@ -31,11 +31,8 @@ endif()
 target_include_directories(CemuAudio PUBLIC "../")
 
 target_link_libraries(CemuAudio PRIVATE
-	CemuCafe
-	CemuGui
 	CemuCommon
-	CemuConfig
-	CemuUtil
+	CemuGui
 )
 
 if(ENABLE_CUBEB)
diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
index abcacc60..183f124a 100644
--- a/src/config/CMakeLists.txt
+++ b/src/config/CMakeLists.txt
@@ -16,11 +16,7 @@ set_property(TARGET CemuConfig PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<C
 target_include_directories(CemuConfig PUBLIC "../")
 
 target_link_libraries(CemuConfig PRIVATE
-	CemuCafe
 	CemuCommon
     CemuGui
-	CemuUtil
-	Boost::headers
-	Boost::program_options
-	pugixml::pugixml
+    Boost::program_options
 )
diff --git a/src/gui/wxgui/CMakeLists.txt b/src/gui/wxgui/CMakeLists.txt
index 1aa3e0a5..9e24a59e 100644
--- a/src/gui/wxgui/CMakeLists.txt
+++ b/src/gui/wxgui/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(CemuWxGui 
+add_library(CemuWxGui STATIC
   canvas/IRenderCanvas.h
   canvas/OpenGLCanvas.cpp
   canvas/OpenGLCanvas.h
@@ -126,20 +126,16 @@ target_include_directories(CemuWxGui PUBLIC "../")
 target_include_directories(CemuWxGui PUBLIC ${RAPIDJSON_INCLUDE_DIRS})
 
 target_link_libraries(CemuWxGui PRIVATE
-	CemuAudio
-	CemuCafe
-	CemuCommon
-	CemuComponents
-	CemuConfig
-	CemuInput
-	CemuResource
-	CemuUtil
-	Boost::headers
-	CURL::libcurl
-	libzip::zip
-	OpenSSL::Crypto
-	pugixml::pugixml
-	ZArchive::zarchive
+  CemuCommon
+  CemuResource
+  libzip::zip
+  ZArchive::zarchive
+  CemuComponents
+  SDL2::SDL2
+  pugixml::pugixml
+  CemuCafe
+  PUBLIC
+  CURL::libcurl
 )
 
 if(ENABLE_WXWIDGETS AND UNIX AND NOT APPLE)
@@ -161,7 +157,7 @@ if(UNIX AND NOT APPLE)
 endif()
 if (ENABLE_WXWIDGETS)
 	# PUBLIC because wx/app.h is included in CemuApp.h
-	target_link_libraries(CemuWxGui PUBLIC wx::base wx::core wx::gl wx::propgrid wx::xrc)
+	target_link_libraries(CemuWxGui PUBLIC wxWidgets::wxWidgets)
 endif()
 
 if(WIN32)
@@ -170,4 +166,4 @@ endif()
 
 if(ALLOW_PORTABLE)
 	target_compile_definitions(CemuWxGui PRIVATE CEMU_ALLOW_PORTABLE)
-endif ()
\ No newline at end of file
+endif ()
diff --git a/src/imgui/CMakeLists.txt b/src/imgui/CMakeLists.txt
index db7686bd..9ddc7e19 100644
--- a/src/imgui/CMakeLists.txt
+++ b/src/imgui/CMakeLists.txt
@@ -22,10 +22,6 @@ target_sources(imguiImpl PRIVATE
 target_include_directories(imguiImpl PUBLIC "../../dependencies/imgui/")
 
 target_link_libraries(imguiImpl PRIVATE
-	CemuCafe
 	CemuCommon
 	CemuGui
-	CemuInput
-	CemuResource
-	CemuUtil
 )
diff --git a/src/input/CMakeLists.txt b/src/input/CMakeLists.txt
index 3158ce99..cdf9cbba 100644
--- a/src/input/CMakeLists.txt
+++ b/src/input/CMakeLists.txt
@@ -88,16 +88,8 @@ endif ()
 target_include_directories(CemuInput PUBLIC "../")
 
 target_link_libraries(CemuInput PRIVATE
-	CemuCafe
 	CemuCommon
-	CemuConfig
 	CemuGui
-	CemuUtil
-	Boost::headers
-	Boost::program_options
-	glm::glm
-	pugixml::pugixml
-	SDL2::SDL2
 )
 
 if (ENABLE_HIDAPI)
@@ -106,4 +98,4 @@ endif()
 
 if (ENABLE_BLUEZ)
 	target_link_libraries(CemuInput PRIVATE bluez::bluez)
-endif ()
\ No newline at end of file
+endif ()
diff --git a/src/resource/CMakeLists.txt b/src/resource/CMakeLists.txt
index 78d7c6db..c8833d01 100644
--- a/src/resource/CMakeLists.txt
+++ b/src/resource/CMakeLists.txt
@@ -22,4 +22,4 @@ target_sources(CemuResource PRIVATE CafeDefaultFont.cpp)
 
 target_include_directories(CemuResource PUBLIC "../")
 
-target_link_libraries(CemuResource PRIVATE CemuCommon CemuComponents)
+target_link_libraries(CemuResource PRIVATE CemuCommon)
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 7a39fe72..c0c45eba 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -92,9 +92,5 @@ set_property(TARGET CemuUtil PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CON
 target_include_directories(CemuUtil PUBLIC "../")
 
 target_link_libraries(CemuUtil PRIVATE
-	CemuCommon
-	CemuConfig
-	Boost::headers
-	Boost::nowide
-	OpenSSL::Crypto
+  CemuCommon
 )