diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7ba46b6..9abf76a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -67,10 +67,13 @@ list(APPEND LIB_OSDP_PRIVATE_INCLUDE_DIRS
 )
 
 if (OpenSSL_FOUND)
-	list(APPEND LIB_OSDP_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY}) # Needed for python library building
+	list(APPEND LIB_OSDP_LIBRARIES ${OPENSSL_INCLUDE_DIR})
+	list(APPEND LIB_OSDP_PRIVATE_INCLUDE_DIRS ${OPENSSL_CRYPTO_INCLUDE_DIRS})
 	list(APPEND LIB_OSDP_DEFINITIONS "-DCONFIG_OSDP_USE_OPENSSL")
 	list(APPEND LIB_OSDP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crypto/openssl.c)
 elseif (MbedTLS_FOUND)
+	list(APPEND LIB_OSDP_LIBRARIES ${MBEDCRYPTO_LIBRARY})
+	list(APPEND LIB_OSDP_PRIVATE_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIRS})
 	list(APPEND LIB_OSDP_DEFINITIONS "-DCONFIG_OSDP_USE_MBEDTLS")
 	list(APPEND LIB_OSDP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crypto/mbedtls.c)
 else()
@@ -82,7 +85,6 @@ endif()
 # LibOSDP as they see fit. For instance pyosdp is built by setuptools.
 set(LIB_OSDP_SOURCES ${LIB_OSDP_SOURCES} PARENT_SCOPE)
 set(LIB_OSDP_LIBRARIES ${LIB_OSDP_LIBRARIES} PARENT_SCOPE)
-set(LIB_OSDP_INCLUDE_DIRS ${LIB_OSDP_INCLUDE_DIRS} PARENT_SCOPE)
 set(LIB_OSDP_PRIVATE_INCLUDE_DIRS ${LIB_OSDP_PRIVATE_INCLUDE_DIRS} PARENT_SCOPE)
 set(LIB_OSDP_DEFINITIONS ${LIB_OSDP_DEFINITIONS} PARENT_SCOPE)
 
@@ -129,11 +131,7 @@ set(LIB_OSDP_UTILS_SRC ${LIB_OSDP_UTILS_SRC} PARENT_SCOPE)
 
 # add source files of utils instead of linking it. See comment above.
 add_library(${LIB_OSDP_SHARED} SHARED ${LIB_OSDP_SOURCES} ${LIB_OSDP_UTILS_SRC})
-if (OpenSSL_FOUND)
-	target_link_libraries(${LIB_OSDP_SHARED} PUBLIC OpenSSL::Crypto)
-elseif (MbedTLS_FOUND)
-	target_link_libraries(${LIB_OSDP_SHARED} PUBLIC MbedTLS::mbedcrypto)
-endif()
+target_link_libraries(${LIB_OSDP_SHARED} PUBLIC ${LIB_OSDP_LIBRARIES})
 
 set_target_properties(${LIB_OSDP_SHARED} PROPERTIES
 	VERSION ${PROJECT_VERSION}