diff --git a/adapters/gaasp/src/CMakeLists.txt b/adapters/gaasp/src/CMakeLists.txt
index c8678d983b7..5baf8668f0a 100644
--- a/adapters/gaasp/src/CMakeLists.txt
+++ b/adapters/gaasp/src/CMakeLists.txt
@@ -13,16 +13,16 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
 APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_config.h )
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.hpp)
 APPEND_GLOB(SOURCES ${DIR}/*.cpp)
 
 ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_GAASP_INTERNAL_TPL)
 IF(${PACKAGE_NAME}_ENABLE_GAASP_INTERNAL_TPL)
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpl_src)
+  TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpl_src)
 ENDIF()
 
 #
diff --git a/adapters/gaasp/tpl_src/CMakeLists.txt b/adapters/gaasp/tpl_src/CMakeLists.txt
index ca9e1e0d420..5ba3537af6e 100644
--- a/adapters/gaasp/tpl_src/CMakeLists.txt
+++ b/adapters/gaasp/tpl_src/CMakeLists.txt
@@ -13,9 +13,9 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
 SET(HEADERS "")
 SET(SOURCES "")
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 FILE(GLOB HEADERS *.h)
 
diff --git a/test/Charon/CMakeLists.txt b/test/Charon/CMakeLists.txt
index aac74d44f08..d5959bc117e 100644
--- a/test/Charon/CMakeLists.txt
+++ b/test/Charon/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 
-INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../UnitTest)
+TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../UnitTest)
 ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
 
 FILE(GLOB SOURCES *.cpp)
diff --git a/test/ThetaStepper/CMakeLists.txt b/test/ThetaStepper/CMakeLists.txt
index d69a9acc6bc..e3902bdc261 100644
--- a/test/ThetaStepper/CMakeLists.txt
+++ b/test/ThetaStepper/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 
-INCLUDE_DIRECTORIES(../UnitTest)
+TRIBITS_INCLUDE_DIRECTORIES(../UnitTest)
 ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
 
 FILE(GLOB SOURCES *.cpp)