diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
index 0cda57697..cf1b89f33 100644
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@@ -1,25 +1,29 @@
 # Copyright (c) 2017 The Bitcoin developers
 
 project(wallet)
 
+# Add Berkeley DB dependency.
+find_package(BerkeleyDB REQUIRED)
+
+# Add event dependency. This is only required for evhttp_uridecode
+# in rpcwallet.cpp so it may be worth considering using an alternative.
+find_package(Event REQUIRED)
+
 add_library(wallet
 	crypter.cpp
 	db.cpp
 	finaltx.cpp
 	rpcdump.cpp
 	rpcwallet.cpp
 	wallet.cpp
 	walletdb.cpp
 )
 
-# Add Berkeley DB dependency
-find_package(BerkeleyDB REQUIRED)
-target_include_directories(wallet PUBLIC ${BDBXX_INCLUDE_DIR})
-target_link_libraries(wallet ${BDBXX_LIBRARY})
+target_link_libraries(wallet util univalue ${BDBXX_LIBRARY} ${EVENT_LIBRARY})
 
-# Add event dependency. This is only required for evhttp_uridecode
-# in rpcwallet.cpp so it may be worth considering using an alternative.
-find_package(Event REQUIRED)
-target_include_directories(wallet PRIVATE ${EVENT_INCLUDE_DIR})
-target_link_libraries(wallet ${EVENT_LIBRARY})
-target_link_libraries(wallet util univalue)
+target_include_directories(wallet
+	PUBLIC
+		${BDBXX_INCLUDE_DIR}
+	PRIVATE
+		${EVENT_INCLUDE_DIR}
+)