diff --git a/blackbox/src/CMakeLists.txt b/blackbox/src/CMakeLists.txt
index 60361a06acb..a7b11e4a6e9 100644
--- a/blackbox/src/CMakeLists.txt
+++ b/blackbox/src/CMakeLists.txt
@@ -16,7 +16,7 @@ TRIBITS_CONFIGURE_FILE(Pike_BlackBox_config.hpp)
 SET(HEADERS "")
 SET(SOURCES "")
 
-TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.hpp)
 APPEND_GLOB(SOURCES ${DIR}/*.cpp)
 #IF (NOT ${PACKAGE_NAME}_ENABLE_EXPERIMENTAL)
@@ -26,7 +26,7 @@ APPEND_GLOB(SOURCES ${DIR}/*.cpp)
 TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR})
 
 # Must glob the binary dir last to get all of the auto-generated headers
-TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
+SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.hpp)
 
 #
diff --git a/blackbox/test/core/CMakeLists.txt b/blackbox/test/core/CMakeLists.txt
index 94a2cec4fd7..620d5cfbe7d 100644
--- a/blackbox/test/core/CMakeLists.txt
+++ b/blackbox/test/core/CMakeLists.txt
@@ -1,6 +1,6 @@
 
-TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../models)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../models)
 
 SET(UNIT_TEST_DRIVER ${TEUCHOS_STD_UNIT_TEST_MAIN})
 
diff --git a/blackbox/test/models/CMakeLists.txt b/blackbox/test/models/CMakeLists.txt
index fa43542a472..57770190899 100644
--- a/blackbox/test/models/CMakeLists.txt
+++ b/blackbox/test/models/CMakeLists.txt
@@ -1,6 +1,6 @@
 
-TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 SET(HEADERS "")
 SET(NOINSTALLHEADERS "")
 SET(SOURCES "")
diff --git a/implicit/src/CMakeLists.txt b/implicit/src/CMakeLists.txt
index 7b43f9f5db3..aa67369acd0 100644
--- a/implicit/src/CMakeLists.txt
+++ b/implicit/src/CMakeLists.txt
@@ -11,13 +11,13 @@ INCLUDE(TrilinosCreateClientTemplateHeaders)
 SET(HEADERS "")
 SET(SOURCES "")
 
-TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.hpp)
 APPEND_GLOB(SOURCES ${DIR}/*.cpp)
 TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR})
 
 # Must glob the binary dir last to get all of the auto-generated headers
-TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
+SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.hpp)
 
 #