3 files changed, 8 insertions, 14 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index 20a7e74f6e..0085e4ce61 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -2914,14 +2914,6 @@ void Player::sequencer_timer()
 
 /*******************************************************************/
 
-#define OFFS(type,item) ((int)(&((type*)0)->item))
-#define SIZE(type,item) sizeof(((type*)0)->item)
-#define MKLINE(type,item,saveas) {OFFS(type,item),saveas,SIZE(type,item)}
-#define MKARRAY(type,item,saveas,num) {OFFS(type,item),128|saveas,SIZE(type,item)}, {num,0,0}
-#define MKEND() {0xFFFF,0xFF,0xFF}
-
-#define MKREF(type,item,refid) {OFFS(type,item),refid,0xFF}
-
 enum {
 	TYPE_PART = 1,
 	TYPE_PLAYER = 2,
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index 0db7174bc9..614f6b825f 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -210,12 +210,6 @@ bool Scumm::getSavegameName(int slot, char *desc)
 	return true;
 }
 
-#define OFFS(type,item) ((int)(&((type*)0)->item))
-#define SIZE(type,item) sizeof(((type*)0)->item)
-#define MKLINE(type,item,saveas) {OFFS(type,item),saveas,SIZE(type,item)}
-#define MKARRAY(type,item,saveas,num) {OFFS(type,item),128|saveas,SIZE(type,item)}, {num,0,0}
-#define MKEND() {0xFFFF,0xFF,0xFF}
-
 void Scumm::saveOrLoad(Serializer *s)
 {
 	const SaveLoadEntry objectEntries[] = {
diff --git a/scumm/saveload.h b/scumm/saveload.h
index 68e003ba7a..46fc145da6 100644
--- a/scumm/saveload.h
+++ b/scumm/saveload.h
@@ -22,6 +22,14 @@
 #ifndef SAVELOAD_H
 #define SAVELOAD_H
 
+#define OFFS(type,item) ((int)(&((type*)0)->type::item))
+#define SIZE(type,item) sizeof(((type*)0)->type::item)
+#define MKLINE(type,item,saveas) {OFFS(type,item),saveas,SIZE(type,item)}
+#define MKARRAY(type,item,saveas,num) {OFFS(type,item),128|saveas,SIZE(type,item)}, {num,0,0}
+#define MKEND() {0xFFFF,0xFF,0xFF}
+
+#define MKREF(type,item,refid) {OFFS(type,item),refid,0xFF}
+
 enum {
 	sleByte = 1,
 	sleUint8 = 1,