diff --git a/mozilla/modules/libutil/public/makefile.win b/mozilla/modules/libutil/public/makefile.win
index a559cc3b41f..12529fdd63e 100644
--- a/mozilla/modules/libutil/public/makefile.win
+++ b/mozilla/modules/libutil/public/makefile.win
@@ -20,9 +20,7 @@
 
 MODULE=util 
 DEPTH=..\..\.. 
-EXPORTS=xp_obs.h \
-!if defined(MOZ_PERF)
-stopwatch.h
-!endif
+EXPORTS=xp_obs.h stopwatch.h
+
 
 !include $(DEPTH)\config\rules.mak
diff --git a/mozilla/modules/libutil/public/stopwatch.h b/mozilla/modules/libutil/public/stopwatch.h
index 91c3b381a76..020f77b1a30 100644
--- a/mozilla/modules/libutil/public/stopwatch.h
+++ b/mozilla/modules/libutil/public/stopwatch.h
@@ -1,5 +1,29 @@
 const double gTicks = 1.0e-7;
 
+#ifdef RAPTOR_PERF_METRICS
+#  define NS_RESET_AND_START_STOPWATCH(_sw)          \
+    _sw.Start(PR_TRUE);
+
+#  define NS_START_STOPWATCH(_sw)                    \
+    _sw.Start(PR_FALSE);
+
+#  define NS_STOP_STOPWATCH(_sw)                     \
+    _sw.Stop();
+
+#  define NS_SAVE_STOPWATCH_STATE(_sw)               \
+    _sw.SaveState();
+
+#  define NS_RESTORE_STOPWATCH_STATE(_sw)            \
+    _sw.RestoreState();
+
+#else
+#  define NS_RESET_AND_START_STOPWATCH(_sw) 
+#  define NS_START_STOPWATCH(_sw)
+#  define NS_STOP_STOPWATCH(_sw)
+#  define NS_SAVE_STOPWATCH_STATE(_sw)
+#  define NS_RESTORE_STOPWATCH_STATE(_sw)
+#endif
+
 class Stopwatch {
 
 private: