diff --git a/CMakeLists.txt b/CMakeLists.txt
index d857670b..342e17b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,12 +245,6 @@ foreach(dir ${INCLUDED_DIRECTORIES})
 	include_directories(${PROJECT_SOURCE_DIR}/${dir})
 endforeach()
 
-if(NOT WIN32)
-	include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include/bcrypt")
-endif()
-
-include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include")
-
 # Add linking directories:
 # link_directories(${PROJECT_BINARY_DIR})
 
diff --git a/dMasterServer/CMakeLists.txt b/dMasterServer/CMakeLists.txt
index 281c9f24..f29e1eb4 100644
--- a/dMasterServer/CMakeLists.txt
+++ b/dMasterServer/CMakeLists.txt
@@ -11,7 +11,7 @@ target_include_directories(dMasterServer PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dZoneManager" # InstanceManager.h uses dZMCommon.h
 )
 target_link_libraries(dMasterServer ${COMMON_LIBRARIES})
-target_link_libraries(MasterServer ${COMMON_LIBRARIES} dMasterServer)
+target_link_libraries(MasterServer ${COMMON_LIBRARIES} bcrypt dMasterServer)
 
 if(WIN32)
 	add_dependencies(MasterServer WorldServer AuthServer ChatServer)
diff --git a/dNet/CMakeLists.txt b/dNet/CMakeLists.txt
index 8717da79..45f1cdbf 100644
--- a/dNet/CMakeLists.txt
+++ b/dNet/CMakeLists.txt
@@ -8,6 +8,7 @@ set(DNET_SOURCES "AuthPackets.cpp"
 	"ZoneInstanceManager.cpp")
 
 add_library(dNet STATIC ${DNET_SOURCES})
+target_link_libraries(dNet PRIVATE bcrypt)
 target_include_directories(dNet PRIVATE
 	${PROJECT_SOURCE_DIR}/dCommon
 	${PROJECT_SOURCE_DIR}/dCommon/dEnums
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 12667df8..0d292936 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -19,7 +19,11 @@ add_library(bcrypt ${SOURCES_LIBBCRYPT})
 # Because we are not using the libbcrypt CMakeLists.txt, we need to include these headers for the library to use.
 # fortunately they are only needed for building the libbcrypt directory and nothing else, so these are marked private.
 
-target_include_directories(bcrypt PRIVATE "libbcrypt/include/bcrypt")
+if(NOT WIN32)
+	target_include_directories(bcrypt PRIVATE "libbcrypt/include/bcrypt")
+endif()
+
+target_include_directories(bcrypt INTERFACE "libbcrypt/include")
 target_include_directories(bcrypt PRIVATE "libbcrypt/src")
 
 # Source code for sqlite