diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 24f44bdc5..434101a36 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -325,9 +325,8 @@ target_link_libraries(keepassx_core
         ${YUBIKEY_LIBRARIES}
         ${ZXCVBN_LIBRARIES}
         ${ARGON2_LIBRARIES}
-        ${GCRYPT_LIBRARIES}
-        ${GPGERROR_LIBRARIES}
-        ${ZLIB_LIBRARIES})
+        ${ZLIB_LIBRARIES}
+	)
 
 if(WITH_XC_SSHAGENT)
   target_link_libraries(keepassx_core sshagent)
@@ -369,6 +368,7 @@ if(MINGW)
 endif()
 
 add_executable(${PROGNAME} WIN32 ${keepassx_SOURCES_MAINEXE} ${WIN32_ProductVersionFiles})
+target_link_libraries(keepassx_core ${GCRYPT_LIBRARIES} ${GPGERROR_LIBRARIES})
 target_link_libraries(${PROGNAME} keepassx_core)
 
 set_target_properties(${PROGNAME} PROPERTIES ENABLE_EXPORTS ON)
diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
index 5959bf328..2bce90f88 100644
--- a/src/cli/CMakeLists.txt
+++ b/src/cli/CMakeLists.txt
@@ -52,13 +52,13 @@ endif()
 
 add_executable(keepassxc-cli keepassxc-cli.cpp)
 target_link_libraries(keepassxc-cli
+        ${GPGERROR_LIBRARIES}
         cli
         keepassx_core
         Qt5::Core
         ${GCRYPT_LIBRARIES}
         ${sodium_LIBRARY_RELEASE}
         ${ARGON2_LIBRARIES}
-        ${GPGERROR_LIBRARIES}
         ${ZLIB_LIBRARIES}
         ${ZXCVBN_LIBRARIES})