diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index d88aa39c..77427e2d 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -320,16 +320,16 @@ endif(BUILD_TESTS)
 configure_file(atca_config.h.in atca_config.h @ONLY)
 set(LIB_INC ${LIB_INC} ${CMAKE_CURRENT_BINARY_DIR}/atca_config.h)
 
-include_directories(cryptoauth PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
-                                      ${CMAKE_CURRENT_SOURCE_DIR}
-                                      ${CMAKE_BINARY_DIR}/downloaded
-                                      ../app/tng
-                                      ../third_party
-                                      ../third_party/hidapi/hidapi
-                                      ${USB_INCLUDE_DIR})
+target_include_directories(cryptoauth PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
+                                             ${CMAKE_CURRENT_SOURCE_DIR}
+                                             ${CMAKE_BINARY_DIR}/downloaded
+                                             ../app/tng
+                                             ../third_party
+                                             ../third_party/hidapi/hidapi
+                                             ${USB_INCLUDE_DIR})
 
 if(APPLE)
-include_directories(cryptoauth PUBLIC ../third_party/hidapi/mac) 
+target_include_directories(cryptoauth PUBLIC ../third_party/hidapi/mac) 
 endif()
 
 if(ATCA_MBEDTLS)
@@ -341,7 +341,7 @@ target_link_libraries(cryptoauth wolfssl)
 endif()
 
 if(ATCA_OPENSSL)
-include_directories(cryptoauth PUBLIC ${OPENSSL_INCLUDE_DIR})
+target_include_directories(cryptoauth PUBLIC ${OPENSSL_INCLUDE_DIR})
 target_link_libraries(cryptoauth ${OPENSSL_CRYPTO_LIBRARY})
 endif()
 
diff --git a/lib/cmake/mbedtls.cmake b/lib/cmake/mbedtls.cmake
index c8697254..51e256f8 100644
--- a/lib/cmake/mbedtls.cmake
+++ b/lib/cmake/mbedtls.cmake
@@ -15,7 +15,7 @@ target_compile_definitions(mbedtls PUBLIC -DMBEDTLS_X509_ALLOW_UNSUPPORTED_CRITI
 if(NOT MSVC)
 target_compile_options(mbedtls PRIVATE -fPIC)
 endif()
-include_directories(mbedtls PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+target_include_directories(mbedtls PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
                                     ${CMAKE_BINARY_DIR}/downloaded/mbedtls/include)
 endif()
 
diff --git a/lib/cmake/wolfssl.cmake b/lib/cmake/wolfssl.cmake
index d3b0fa41..db5fd3ad 100644
--- a/lib/cmake/wolfssl.cmake
+++ b/lib/cmake/wolfssl.cmake
@@ -52,9 +52,9 @@ if(NOT MSVC)
 target_compile_options(wolfssl PRIVATE -fPIC)
 endif()
 
-include_directories(wolfssl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-                                    ${CMAKE_BINARY_DIR}/downloaded/wolfssl
-                                    ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(wolfssl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+                                           ${CMAKE_BINARY_DIR}/downloaded/wolfssl
+                                           ${CMAKE_CURRENT_BINARY_DIR})
 
 
 file(GLOB WOLFSSL_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "wolfssl/*.c")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 28ec07fe..0509cf56 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -52,22 +52,23 @@ endif()
 
 add_executable(cryptoauth_test ${CRYPTOAUTH_TEST_SRC} ${UNITY_SRC})
 
-include_directories(cryptoauth_test ${CMAKE_CURRENT_SOURCE_DIR}
-                                    ${CMAKE_BINARY_DIR}/downloaded
-                                    ${CMAKE_BINARY_DIR}/downloaded/wolfssl
-                                    ${CMAKE_BINARY_DIR}/downloaded/mbedtls/include
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/../
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/api_atcab
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/api_calib
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/api_crypto
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/api_talib
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/hal
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/integration
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/../lib
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/../third_party
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/mbedtls/include
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/wolfssl
-                                    ${CMAKE_CURRENT_BINARY_DIR}/../lib)
+target_include_directories(cryptoauth_test PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/downloaded
+    ${CMAKE_BINARY_DIR}/downloaded/wolfssl
+    ${CMAKE_BINARY_DIR}/downloaded/mbedtls/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_SOURCE_DIR}/api_atcab
+    ${CMAKE_CURRENT_SOURCE_DIR}/api_calib
+    ${CMAKE_CURRENT_SOURCE_DIR}/api_crypto
+    ${CMAKE_CURRENT_SOURCE_DIR}/api_talib
+    ${CMAKE_CURRENT_SOURCE_DIR}/hal
+    ${CMAKE_CURRENT_SOURCE_DIR}/integration
+    ${CMAKE_CURRENT_SOURCE_DIR}/../lib
+    ${CMAKE_CURRENT_SOURCE_DIR}/../third_party
+    ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/mbedtls/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/wolfssl
+    ${CMAKE_CURRENT_BINARY_DIR}/../lib)
 
 target_link_libraries(cryptoauth_test cryptoauth)