diff --git a/core/passwordStorageEngines/CMakeLists.txt b/core/passwordStorageEngines/CMakeLists.txt
index 7cab516..4da3873 100644
--- a/core/passwordStorageEngines/CMakeLists.txt
+++ b/core/passwordStorageEngines/CMakeLists.txt
@@ -1,9 +1,9 @@
 if (WITH_KWALLET)
   target_sources(squawk PRIVATE
-    wrappers/kwallet.cpp
     kwallet.cpp
     kwallet.h
     )
 
-  target_link_libraries(squawk PRIVATE KF5::Wallet)
+  add_subdirectory(wrappers)
+  target_include_directories(squawk PRIVATE $<TARGET_PROPERTY:KF5::Wallet,INTERFACE_INCLUDE_DIRECTORIES>)
 endif ()
diff --git a/core/passwordStorageEngines/wrappers/CMakeLists.txt b/core/passwordStorageEngines/wrappers/CMakeLists.txt
new file mode 100644
index 0000000..6d486c0
--- /dev/null
+++ b/core/passwordStorageEngines/wrappers/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_library(kwalletWrapper SHARED kwallet.cpp)
+target_link_libraries(kwalletWrapper PRIVATE KF5::Wallet)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 97b3b46..84fc09b 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,4 +1,4 @@
 if (WITH_KIO)
-  target_sources(squawk PRIVATE openfilemanagerwindowjob.cpp)
-  target_link_libraries(squawk PRIVATE KF5::KIOWidgets)
+  add_library(openFileManagerWindowJob SHARED openfilemanagerwindowjob.cpp)
+  target_link_libraries(openFileManagerWindowJob PRIVATE KF5::KIOWidgets)
 endif ()