diff --git a/libs/pbd/pbd/timing.h b/libs/pbd/pbd/timing.h
index 470751f972..0cac0baef9 100644
--- a/libs/pbd/pbd/timing.h
+++ b/libs/pbd/pbd/timing.h
@@ -31,6 +31,11 @@
 
 #include "pbd/libpbd_visibility.h"
 
+#ifdef COMPILER_MSVC
+#undef min
+#undef max
+#endif
+
 namespace PBD {
 
 LIBPBD_API bool get_min_max_avg_total (const std::vector<uint64_t>& values, uint64_t& min, uint64_t& max, uint64_t& avg, uint64_t& total);
diff --git a/libs/pbd/timing.cc b/libs/pbd/timing.cc
index 96b9701647..79c8e4aefe 100644
--- a/libs/pbd/timing.cc
+++ b/libs/pbd/timing.cc
@@ -22,11 +22,6 @@
 #include <sstream>
 #include <limits>
 
-#ifdef COMPILER_MSVC
-#undef min
-#undef max
-#endif
-
 namespace PBD {
 
 bool