diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index dc20763953..c9fd769822 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -19,6 +19,4 @@ endif (UNIX)
 
 include_application_version()
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()
diff --git a/cmake/macros/LinkHifiLibraries.cmake b/cmake/macros/LinkHifiLibraries.cmake
index ef7467e170..d0a12f3bea 100644
--- a/cmake/macros/LinkHifiLibraries.cmake
+++ b/cmake/macros/LinkHifiLibraries.cmake
@@ -33,4 +33,7 @@ macro(LINK_HIFI_LIBRARIES)
       list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES ${LINKED_TARGET_DEPENDENCY_INCLUDES})
     endif()
   endforeach()
+
+  setup_memory_debugger()
+
 endmacro(LINK_HIFI_LIBRARIES)
\ No newline at end of file
diff --git a/cmake/macros/SetupHifiLibrary.cmake b/cmake/macros/SetupHifiLibrary.cmake
index e38e224084..aba8d500a5 100644
--- a/cmake/macros/SetupHifiLibrary.cmake
+++ b/cmake/macros/SetupHifiLibrary.cmake
@@ -15,6 +15,8 @@ macro(SETUP_HIFI_LIBRARY)
   file(GLOB_RECURSE LIB_SRCS "src/*.h" "src/*.cpp" "src/*.c")
   list(APPEND ${TARGET_NAME}_SRCS ${LIB_SRCS})
 
+  setup_memory_debugger()
+
   # create a library and set the property so it can be referenced later
   if (${${TARGET_NAME}_SHARED})
     add_library(${TARGET_NAME} SHARED ${LIB_SRCS} ${AUTOMTC_SRC} ${AUTOSCRIBE_SHADER_LIB_SRC} ${QT_RESOURCES_FILE})
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index d2f30b6c25..e4fa1d874d 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME domain-server)
 
-setup_memory_debugger()
-
 if (UPPER_CMAKE_BUILD_TYPE MATCHES DEBUG AND NOT WIN32)
   set(_SHOULD_SYMLINK_RESOURCES TRUE)
 else ()
diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt
index c4880a80b6..2c1e87c8b4 100644
--- a/gvr-interface/CMakeLists.txt
+++ b/gvr-interface/CMakeLists.txt
@@ -88,6 +88,4 @@ if (ANDROID)
   
 endif (ANDROID)
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()
diff --git a/ice-server/CMakeLists.txt b/ice-server/CMakeLists.txt
index d62192bcec..b056d79efd 100644
--- a/ice-server/CMakeLists.txt
+++ b/ice-server/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME ice-server)
 
-setup_memory_debugger()
-
 # setup the project and link required Qt modules
 setup_hifi_project(Network)
 
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 0c531dfacb..d7ee9228f4 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -205,6 +205,4 @@ else (APPLE)
   endif()
 endif (APPLE)
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()
diff --git a/libraries/animation/CMakeLists.txt b/libraries/animation/CMakeLists.txt
index fc7fa23dcc..115a2e360c 100644
--- a/libraries/animation/CMakeLists.txt
+++ b/libraries/animation/CMakeLists.txt
@@ -3,6 +3,4 @@ set(TARGET_NAME animation)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network Script)
 
-setup_memory_debugger()
-
 link_hifi_libraries(shared gpu model fbx)
diff --git a/libraries/audio-client/CMakeLists.txt b/libraries/audio-client/CMakeLists.txt
index c313aecbc0..76f4cb4a0f 100644
--- a/libraries/audio-client/CMakeLists.txt
+++ b/libraries/audio-client/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME audio-client)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network Multimedia)
 
diff --git a/libraries/audio/CMakeLists.txt b/libraries/audio/CMakeLists.txt
index a0d40b1a10..c03f588d94 100644
--- a/libraries/audio/CMakeLists.txt
+++ b/libraries/audio/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME audio)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network)
 
diff --git a/libraries/auto-updater/CMakeLists.txt b/libraries/auto-updater/CMakeLists.txt
index 6960d8368d..c3d6e74a6f 100644
--- a/libraries/auto-updater/CMakeLists.txt
+++ b/libraries/auto-updater/CMakeLists.txt
@@ -1,6 +1,4 @@
 set(TARGET_NAME auto-updater)
 
-setup_memory_debugger()
-
 setup_hifi_library(Network)
 link_hifi_libraries(shared networking)
diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt
index b05c667c71..acc939b25c 100644
--- a/libraries/avatars/CMakeLists.txt
+++ b/libraries/avatars/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME avatars)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network Script)
 
diff --git a/libraries/display-plugins/CMakeLists.txt b/libraries/display-plugins/CMakeLists.txt
index 79b41fa957..384fa57b62 100644
--- a/libraries/display-plugins/CMakeLists.txt
+++ b/libraries/display-plugins/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME display-plugins)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(OpenGL)
 
diff --git a/libraries/embedded-webserver/CMakeLists.txt b/libraries/embedded-webserver/CMakeLists.txt
index 2d8915998b..45d9827d42 100644
--- a/libraries/embedded-webserver/CMakeLists.txt
+++ b/libraries/embedded-webserver/CMakeLists.txt
@@ -1,6 +1,4 @@
 set(TARGET_NAME embedded-webserver)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network)
diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt
index 3387715348..c4dddb8971 100644
--- a/libraries/entities-renderer/CMakeLists.txt
+++ b/libraries/entities-renderer/CMakeLists.txt
@@ -26,6 +26,4 @@ find_package(PolyVox REQUIRED)
 target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${POLYVOX_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${POLYVOX_LIBRARIES})
 
-setup_memory_debugger()
-
 link_hifi_libraries(shared gpu script-engine render render-utils)
diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index 368257661e..f7936ff125 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME entities)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network Script)
 
diff --git a/libraries/environment/CMakeLists.txt b/libraries/environment/CMakeLists.txt
index fbdc614d26..e3fc143c14 100644
--- a/libraries/environment/CMakeLists.txt
+++ b/libraries/environment/CMakeLists.txt
@@ -7,6 +7,4 @@ add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
-setup_memory_debugger()
-
 link_hifi_libraries(shared networking)
diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt
index c06bb0efc1..9d9f57ad20 100644
--- a/libraries/fbx/CMakeLists.txt
+++ b/libraries/fbx/CMakeLists.txt
@@ -7,6 +7,4 @@ add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
-setup_memory_debugger()
-
 link_hifi_libraries(shared gpu model networking octree)
diff --git a/libraries/gpu/CMakeLists.txt b/libraries/gpu/CMakeLists.txt
index 84320297eb..7a88580f7f 100644
--- a/libraries/gpu/CMakeLists.txt
+++ b/libraries/gpu/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME gpu)
 
-setup_memory_debugger()
-
 AUTOSCRIBE_SHADER_LIB(gpu)
 
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
diff --git a/libraries/input-plugins/CMakeLists.txt b/libraries/input-plugins/CMakeLists.txt
index 5d6dae7ad1..1ac8047edc 100644
--- a/libraries/input-plugins/CMakeLists.txt
+++ b/libraries/input-plugins/CMakeLists.txt
@@ -33,8 +33,6 @@ endif()
 #target_include_directories(${TARGET_NAME} PRIVATE ${SIXENSE_INCLUDE_DIRS})
 #target_link_libraries(${TARGET_NAME} ${SIXENSE_LIBRARIES})
 
-setup_memory_debugger()
-
 # perform standard include and linking for found externals
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
   
diff --git a/libraries/model/CMakeLists.txt b/libraries/model/CMakeLists.txt
index 2099f83fec..701c132e61 100755
--- a/libraries/model/CMakeLists.txt
+++ b/libraries/model/CMakeLists.txt
@@ -2,8 +2,6 @@ set(TARGET_NAME model)
 
 AUTOSCRIBE_SHADER_LIB(gpu model)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
diff --git a/libraries/networking/CMakeLists.txt b/libraries/networking/CMakeLists.txt
index d0e0b850c7..400fc5446a 100644
--- a/libraries/networking/CMakeLists.txt
+++ b/libraries/networking/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME networking)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network)
 
diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt
index 8b9ff6bda2..cc36aead15 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME octree)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
diff --git a/libraries/physics/CMakeLists.txt b/libraries/physics/CMakeLists.txt
index 802665b948..b1f9fbb79c 100644
--- a/libraries/physics/CMakeLists.txt
+++ b/libraries/physics/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME physics)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
diff --git a/libraries/plugins/CMakeLists.txt b/libraries/plugins/CMakeLists.txt
index 98fd5fdc93..42b8cb1625 100644
--- a/libraries/plugins/CMakeLists.txt
+++ b/libraries/plugins/CMakeLists.txt
@@ -8,6 +8,4 @@ link_hifi_libraries(shared)
 add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 
-setup_memory_debugger()
-
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index ceb1a192ab..0ea71e54e3 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/libraries/render-utils/CMakeLists.txt
@@ -40,6 +40,4 @@ add_dependency_external_projects(oglplus)
 find_package(OGLPLUS REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${OGLPLUS_INCLUDE_DIRS})
 
-setup_memory_debugger()
-
 link_hifi_libraries(animation fbx shared gpu model render environment)
diff --git a/libraries/render/CMakeLists.txt b/libraries/render/CMakeLists.txt
index 1f73d93519..f2bcb7c47c 100644
--- a/libraries/render/CMakeLists.txt
+++ b/libraries/render/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME render)
 
-setup_memory_debugger()
-
 AUTOSCRIBE_SHADER_LIB(gpu model)
 
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt
index 670a13f081..139b99e426 100644
--- a/libraries/script-engine/CMakeLists.txt
+++ b/libraries/script-engine/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME script-engine)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Gui Network Script WebSockets Widgets)
 
diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt
index a80f4194ef..00a80619bc 100644
--- a/libraries/shared/CMakeLists.txt
+++ b/libraries/shared/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME shared)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 # TODO: there isn't really a good reason to have Script linked here - let's get what is requiring it out (RegisteredMetaTypes.cpp)
 setup_hifi_library(Gui Network Script Widgets)
diff --git a/libraries/ui/CMakeLists.txt b/libraries/ui/CMakeLists.txt
index 68caa940c1..b07651f7d4 100644
--- a/libraries/ui/CMakeLists.txt
+++ b/libraries/ui/CMakeLists.txt
@@ -8,6 +8,4 @@ link_hifi_libraries(render-utils shared)
 add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 
-setup_memory_debugger()
-
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c2dc30c4bb..1593b649a0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -35,5 +35,3 @@ set_target_properties("all-tests" PROPERTIES FOLDER "hidden/test-targets")
 set_target_properties("all-tests" PROPERTIES
     EXCLUDE_FROM_DEFAULT_BUILD TRUE
     EXCLUDE_FROM_ALL TRUE)
-
-setup_memory_debugger()
diff --git a/tests/animation/CMakeLists.txt b/tests/animation/CMakeLists.txt
index bc1e93a94f..2e9dbc9424 100644
--- a/tests/animation/CMakeLists.txt
+++ b/tests/animation/CMakeLists.txt
@@ -6,6 +6,4 @@ macro (setup_testcase_dependencies)
   copy_dlls_beside_windows_executable()
 endmacro ()
 
-setup_memory_debugger()
-
 setup_hifi_testcase()
diff --git a/tests/audio/CMakeLists.txt b/tests/audio/CMakeLists.txt
index c56ef049bd..f7dd1d23b9 100644
--- a/tests/audio/CMakeLists.txt
+++ b/tests/audio/CMakeLists.txt
@@ -6,6 +6,4 @@ macro (SETUP_TESTCASE_DEPENDENCIES)
   copy_dlls_beside_windows_executable()
 endmacro ()
 
-setup_memory_debugger()
-
 setup_hifi_testcase()
diff --git a/tests/entities/CMakeLists.txt b/tests/entities/CMakeLists.txt
index f83efe7f64..b2c7969386 100644
--- a/tests/entities/CMakeLists.txt
+++ b/tests/entities/CMakeLists.txt
@@ -9,6 +9,4 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 # link in the shared libraries
 link_hifi_libraries(entities avatars shared octree gpu model fbx networking animation environment)
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()
diff --git a/tests/jitter/CMakeLists.txt b/tests/jitter/CMakeLists.txt
index ba46582b02..98be42530c 100644
--- a/tests/jitter/CMakeLists.txt
+++ b/tests/jitter/CMakeLists.txt
@@ -7,6 +7,4 @@ macro (setup_testcase_dependencies)
   copy_dlls_beside_windows_executable()
 endmacro()
 
-setup_memory_debugger()
-
 setup_hifi_testcase()
diff --git a/tests/networking/CMakeLists.txt b/tests/networking/CMakeLists.txt
index fcf32d89c8..efa744e4c9 100644
--- a/tests/networking/CMakeLists.txt
+++ b/tests/networking/CMakeLists.txt
@@ -7,6 +7,4 @@ macro (setup_testcase_dependencies)
   copy_dlls_beside_windows_executable()
 endmacro ()
 
-setup_memory_debugger()
-
 setup_hifi_testcase()
diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt
index 77511c682a..e2a756105a 100644
--- a/tests/octree/CMakeLists.txt
+++ b/tests/octree/CMakeLists.txt
@@ -7,6 +7,4 @@ macro (setup_testcase_dependencies)
   copy_dlls_beside_windows_executable()
 endmacro ()
 
-setup_memory_debugger()
-
 setup_hifi_testcase(Script Network)
diff --git a/tests/physics/CMakeLists.txt b/tests/physics/CMakeLists.txt
index 1a6f49430b..36cf21c681 100644
--- a/tests/physics/CMakeLists.txt
+++ b/tests/physics/CMakeLists.txt
@@ -21,6 +21,4 @@ macro (SETUP_TESTCASE_DEPENDENCIES)
   copy_dlls_beside_windows_executable()
 endmacro ()
 
-setup_memory_debugger()
-
 setup_hifi_testcase(Script)
diff --git a/tests/render-utils/CMakeLists.txt b/tests/render-utils/CMakeLists.txt
index 1b47f85099..62ed401d2e 100644
--- a/tests/render-utils/CMakeLists.txt
+++ b/tests/render-utils/CMakeLists.txt
@@ -10,6 +10,4 @@ link_hifi_libraries(render-utils gpu shared)
 
 message(${PROJECT_BINARY_DIR})
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()
diff --git a/tests/shaders/CMakeLists.txt b/tests/shaders/CMakeLists.txt
index 3ee9f4ae9f..9b2a079e88 100644
--- a/tests/shaders/CMakeLists.txt
+++ b/tests/shaders/CMakeLists.txt
@@ -19,6 +19,4 @@ include_directories("${PROJECT_BINARY_DIR}/../../libraries/model/")
 
 message(${PROJECT_BINARY_DIR})
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()
diff --git a/tests/shared/CMakeLists.txt b/tests/shared/CMakeLists.txt
index c3d6cfd810..7bddb4b2ed 100644
--- a/tests/shared/CMakeLists.txt
+++ b/tests/shared/CMakeLists.txt
@@ -8,6 +8,4 @@ macro (setup_testcase_dependencies)
   copy_dlls_beside_windows_executable()
 endmacro ()
 
-setup_memory_debugger()
-
 setup_hifi_testcase()
diff --git a/tests/ui/CMakeLists.txt b/tests/ui/CMakeLists.txt
index c0f20a280f..6a2d8c394a 100644
--- a/tests/ui/CMakeLists.txt
+++ b/tests/ui/CMakeLists.txt
@@ -13,6 +13,4 @@ endif()
 # link in the shared libraries
 link_hifi_libraries(ui render-utils gpu shared)
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 4d8618b37c..a8564d7f1c 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,5 +1,3 @@
-setup_memory_debugger()
-
 # add the tool directories
 add_subdirectory(mtc)
 set_target_properties(mtc PROPERTIES FOLDER "Tools")
diff --git a/tools/mtc/CMakeLists.txt b/tools/mtc/CMakeLists.txt
index fe5f1920bc..16c812673d 100644
--- a/tools/mtc/CMakeLists.txt
+++ b/tools/mtc/CMakeLists.txt
@@ -1,6 +1,4 @@
 set(TARGET_NAME mtc)
 setup_hifi_project()
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()
diff --git a/tools/scribe/CMakeLists.txt b/tools/scribe/CMakeLists.txt
index 0abf70f727..e62a3467e0 100755
--- a/tools/scribe/CMakeLists.txt
+++ b/tools/scribe/CMakeLists.txt
@@ -1,5 +1,3 @@
 set(TARGET_NAME scribe)
 
-setup_memory_debugger()
-
 setup_hifi_project()
diff --git a/tools/vhacd-util/CMakeLists.txt b/tools/vhacd-util/CMakeLists.txt
index b79a6a1893..c94b2ad083 100644
--- a/tools/vhacd-util/CMakeLists.txt
+++ b/tools/vhacd-util/CMakeLists.txt
@@ -8,8 +8,6 @@ find_package(VHACD REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${VHACD_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${VHACD_LIBRARIES})
 
-setup_memory_debugger()
-
 if (UNIX AND NOT APPLE)
   include(FindOpenMP)
   if(OPENMP_FOUND)