diff --git a/src/engine/platform/fmshared_OPM.h b/src/engine/platform/fmshared_OPM.h
index c21d1c18..585a42d9 100644
--- a/src/engine/platform/fmshared_OPM.h
+++ b/src/engine/platform/fmshared_OPM.h
@@ -22,6 +22,21 @@
 
 #include "fmsharedbase.h"
 
+#define rWrite(a,v) if (!skipRegisterWrites) {pendingWrites[a]=v;}
+#define immWrite(a,v) if (!skipRegisterWrites) {writes.push_back(QueuedWrite(a,v)); if (dumpWrites) {addWrite(a,v);} }
+#define urgentWrite(a,v) if (!skipRegisterWrites) { \
+  if (writes.empty()) { \
+    writes.push_back(QueuedWrite(a,v)); \
+  } else if (writes.size()>16 || writes.front().addrOrVal) { \
+    writes.push_back(QueuedWrite(a,v)); \
+  } else { \
+    writes.push_front(QueuedWrite(a,v)); \
+  } \
+  if (dumpWrites) { \
+    addWrite(a,v); \
+  } \
+}
+
 #define NOTE_LINEAR(x) (((x)<<6)+baseFreqOff+log2(parent->song.tuning/440.0)*12.0*64.0)
 
 class DivPlatformOPMBase: public DivPlatformFMBase {
diff --git a/src/engine/platform/fmshared_OPN.h b/src/engine/platform/fmshared_OPN.h
index ae40748b..b3cd7c3a 100644
--- a/src/engine/platform/fmshared_OPN.h
+++ b/src/engine/platform/fmshared_OPN.h
@@ -22,6 +22,21 @@
 
 #include "fmsharedbase.h"
 
+#define rWrite(a,v) if (!skipRegisterWrites) {pendingWrites[a]=v;}
+#define immWrite(a,v) if (!skipRegisterWrites) {writes.push_back(QueuedWrite(a,v)); if (dumpWrites) {addWrite(a,v);} }
+#define urgentWrite(a,v) if (!skipRegisterWrites) { \
+  if (writes.empty()) { \
+    writes.push_back(QueuedWrite(a,v)); \
+  } else if (writes.size()>16 || writes.front().addrOrVal) { \
+    writes.push_back(QueuedWrite(a,v)); \
+  } else { \
+    writes.push_front(QueuedWrite(a,v)); \
+  } \
+  if (dumpWrites) { \
+    addWrite(a,v); \
+  } \
+}
+
 #define CHIP_FREQBASE fmFreqBase
 #define CHIP_DIVIDER fmDivBase
 
diff --git a/src/engine/platform/fmsharedbase.h b/src/engine/platform/fmsharedbase.h
index 2555d267..f1312614 100644
--- a/src/engine/platform/fmsharedbase.h
+++ b/src/engine/platform/fmsharedbase.h
@@ -65,19 +65,4 @@ class DivPlatformFMBase: public DivDispatch {
     delay(0) {}
 };
 
-#define rWrite(a,v) if (!skipRegisterWrites) {pendingWrites[a]=v;}
-#define immWrite(a,v) if (!skipRegisterWrites) {writes.push_back(QueuedWrite(a,v)); if (dumpWrites) {addWrite(a,v);} }
-#define urgentWrite(a,v) if (!skipRegisterWrites) { \
-  if (writes.empty()) { \
-    writes.push_back(QueuedWrite(a,v)); \
-  } else if (writes.size()>16 || writes.front().addrOrVal) { \
-    writes.push_back(QueuedWrite(a,v)); \
-  } else { \
-    writes.push_front(QueuedWrite(a,v)); \
-  } \
-  if (dumpWrites) { \
-    addWrite(a,v); \
-  } \
-}
-
 #endif