--- old/src/share/vm/memory/allocation.hpp	2012-09-17 16:12:39.969794328 -0400
+++ new/src/share/vm/memory/allocation.hpp	2012-09-17 16:12:38.808449185 -0400
@@ -27,6 +27,7 @@
 
 #include "runtime/globals.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
 #ifdef COMPILER1
 #include "c1/c1_globals.hpp"
 #endif
@@ -147,6 +148,7 @@
   ot_masks            = 0x00F0
 };
 
+#if INCLUDE_NMT
 #define IS_MEMORY_TYPE(flags, type) ((flags & mt_masks) == type)
 #define HAS_VALID_MEMORY_TYPE(flags)((flags & mt_masks) != mtNone)
 #define FLAGS_TO_MEMORY_TYPE(flags) (flags & mt_masks)
@@ -154,11 +156,20 @@
 #define IS_ARENA_OBJ(flags)         ((flags & ot_masks) == otArena)
 #define IS_NMT_RECORDER(flags)      ((flags & ot_masks) == otNMTRecorder)
 #define NMT_CAN_TRACK(flags)        (!IS_NMT_RECORDER(flags) && !(IS_MEMORY_TYPE(flags, mtDontTrack)))
+#endif // INCLUDE_NMT
 
 typedef unsigned short MEMFLAGS;
 
+#if INCLUDE_NMT
+
 extern bool NMT_track_callsite;
 
+#else
+
+const bool NMT_track_callsite = false;
+
+#endif // INCLUDE_NMT
+
 // debug build does not inline
 #if defined(_DEBUG_)
   #define CURRENT_PC       (NMT_track_callsite ? os::get_caller_pc(1) : 0)