diff --git a/include/Compat.h b/include/Compat.h
index b993074..26bdbe5 100644
--- a/include/Compat.h
+++ b/include/Compat.h
@@ -16,6 +16,9 @@ char _getch();
 #include <termios.h>
 #include <unistd.h>
 char _getch();
+// macros 'major' and 'minor' need to be undefined on FreeBSD to avoid naming collision with system headers
+#undef major
+#undef minor
 #endif // freebsd
 
 // ======================= APPLE ========================
diff --git a/src/Common.cpp b/src/Common.cpp
index c40819e..c16f953 100644
--- a/src/Common.cpp
+++ b/src/Common.cpp
@@ -291,12 +291,6 @@ TEST_CASE("RegisterThread") {
     CHECK(threadNameMap.at(std::this_thread::get_id()) == "MyThread");
 }
 
-// macros below need to be undefined on FreeBSD as to avoid naming collision with system headers
-#ifdef BEAMMP_FREEBSD
-    #undef major
-    #undef minor
-#endif
-
 Version::Version(uint8_t major, uint8_t minor, uint8_t patch)
     : major(major)
     , minor(minor)