diff --git a/src/engine/platform/fmshared_OPM.h b/src/engine/platform/fmshared_OPM.h
index 585a42d9..c21d1c18 100644
--- a/src/engine/platform/fmshared_OPM.h
+++ b/src/engine/platform/fmshared_OPM.h
@@ -22,21 +22,6 @@
 
 #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 b3cd7c3a..ae40748b 100644
--- a/src/engine/platform/fmshared_OPN.h
+++ b/src/engine/platform/fmshared_OPN.h
@@ -22,21 +22,6 @@
 
 #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 f1312614..64099739 100644
--- a/src/engine/platform/fmsharedbase.h
+++ b/src/engine/platform/fmsharedbase.h
@@ -59,6 +59,34 @@ class DivPlatformFMBase: public DivDispatch {
     short oldWrites[512];
     short pendingWrites[512];
 
+    inline void rWrite(unsigned short a, short v) {
+      if (!skipRegisterWrites) {
+        pendingWrites[a]=v;
+      }
+    }
+    inline void immWrite(unsigned short a, unsigned char v) {
+      if (!skipRegisterWrites) {
+        writes.push_back(QueuedWrite(a,v));
+        if (dumpWrites) {
+          addWrite(a,v);
+        }
+      }
+    }
+    inline void urgentWrite(unsigned short a, unsigned char 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);
+        }
+      }
+    }
+
     DivPlatformFMBase():
     DivDispatch(),
     lastBusy(0),