diff --git a/Engine/source/navigation/navMeshTool.cpp b/Engine/source/navigation/navMeshTool.cpp
index 5fa05b663..758bc3626 100644
--- a/Engine/source/navigation/navMeshTool.cpp
+++ b/Engine/source/navigation/navMeshTool.cpp
@@ -1,7 +1,7 @@
 
 #include "platform/platform.h"
 #include "navigation/navMeshTool.h"
-
+#ifdef TORQUE_TOOLS
 #include "util/undo.h"
 #include "math/mMath.h"
 #include "math/mathUtils.h"
@@ -37,3 +37,4 @@ NavMeshTool::NavMeshTool()
 NavMeshTool::~NavMeshTool()
 {
 }
+#endif
diff --git a/Engine/source/navigation/navMeshTool.h b/Engine/source/navigation/navMeshTool.h
index d6ad66aa2..ef6e9ad3c 100644
--- a/Engine/source/navigation/navMeshTool.h
+++ b/Engine/source/navigation/navMeshTool.h
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _NAVMESH_TOOL_H_
 #define _NAVMESH_TOOL_H_
-
+#ifdef TORQUE_TOOLS
 #ifndef _SIMBASE_H_
 #include "console/simBase.h"
 #endif
@@ -54,5 +54,5 @@ public:
    virtual void onUndoAction() {}
 
 };
-
+#endif
 #endif // !_NAVMESH_TOOL_H_
diff --git a/Tools/CMake/modules/navigation.cmake b/Tools/CMake/modules/navigation.cmake
index 59a6b7325..a7a58e746 100644
--- a/Tools/CMake/modules/navigation.cmake
+++ b/Tools/CMake/modules/navigation.cmake
@@ -4,12 +4,15 @@ option(TORQUE_NAVIGATION "Enable Navigation module" ON)
 if(TORQUE_NAVIGATION)
   message("Enabling Navigation Module")
   
-  file(GLOB_RECURSE TORQUE_NAV_SOURCES "${CMAKE_SOURCE_DIR}/Engine/source/navigation/*.cpp" "${CMAKE_SOURCE_DIR}/Engine/source/navigation/*.h" "${CMAKE_SOURCE_DIR}/Engine/source/navigation/navMeshTools/*.cpp" "${CMAKE_SOURCE_DIR}/Engine/source/navigation/navMeshTools/*.h")
-  set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_NAV_SOURCES})
+  file(GLOB TORQUE_NAV_SOURCES "${CMAKE_SOURCE_DIR}/Engine/source/navigation/*.cpp" "${CMAKE_SOURCE_DIR}/Engine/source/navigation/*.h")
+  if(TORQUE_TOOLS)
+    file(GLOB_RECURSE TORQUE_NAV_TOOLS "${CMAKE_SOURCE_DIR}/Engine/source/navigation/navMeshTools/*.cpp" "${CMAKE_SOURCE_DIR}/Engine/source/navigation/navMeshTools/*.h")
+  endif()
+  set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_NAV_SOURCES} ${TORQUE_NAV_TOOLS})
   set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} recast)
   set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} recast TORQUE_NAVIGATION_ENABLED)
 
   # Since recast lives elsewhere we need to ensure it is known to Torque when providing a link to it
   add_subdirectory("${TORQUE_LIB_ROOT_DIRECTORY}/recast" ${TORQUE_LIB_TARG_DIRECTORY}/recast EXCLUDE_FROM_ALL)
-  source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/navigation/" PREFIX "Modules/NAVIGATION" FILES ${TORQUE_NAV_SOURCES})
+  source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/navigation/" PREFIX "Modules/NAVIGATION" FILES ${TORQUE_NAV_SOURCES} ${TORQUE_NAV_TOOLS})
 endif(TORQUE_NAVIGATION)