diff --git a/Makefile b/Makefile
index 28467cf..3c3733d 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,10 @@ bld/OSGLUWIN.o : src/UI/WIN32/OSGLUWIN.c src/LANG/STRCNENG.h cfg/STRCONST.h src/
 	gcc "src/UI/WIN32/OSGLUWIN.c" -o "bld/OSGLUWIN.o" $(mk_COptions)
 bld/GLOBGLUE.o : src/GLOBGLUE.c cfg/CNFGGLOB.h
 	gcc "src/GLOBGLUE.c" -o "bld/GLOBGLUE.o" $(mk_COptions)
-bld/M68KITAB.o : src/M68KITAB.c cfg/CNFGGLOB.h
-	gcc "src/M68KITAB.c" -o "bld/M68KITAB.o" $(mk_COptions)
-bld/MINEM68K.o : src/MINEM68K.c cfg/CNFGGLOB.h
-	gcc "src/MINEM68K.c" -o "bld/MINEM68K.o" $(mk_COptions)
+bld/M68KITAB.o : src/M68K/M68KITAB.c cfg/CNFGGLOB.h
+	gcc "src/M68K/M68KITAB.c" -o "bld/M68KITAB.o" $(mk_COptions)
+bld/MINEM68K.o : src/M68K/MINEM68K.c cfg/CNFGGLOB.h
+	gcc "src/M68K/MINEM68K.c" -o "bld/MINEM68K.o" $(mk_COptions)
 bld/VIAEMDEV.o : src/VIAEMDEV.c cfg/CNFGGLOB.h
 	gcc "src/VIAEMDEV.c" -o "bld/VIAEMDEV.o" $(mk_COptions)
 bld/IWMEMDEV.o : src/IWMEMDEV.c cfg/CNFGGLOB.h
diff --git a/cfg/CNFGGLOB.h b/cfg/CNFGGLOB.h
index a8aa436..bc925bc 100644
--- a/cfg/CNFGGLOB.h
+++ b/cfg/CNFGGLOB.h
@@ -16,7 +16,6 @@
 #include <stdint.h>
 
 #define MayInline inline __attribute__((always_inline))
-#define MayNotInline __attribute__((noinline))
 #define SmallGlobals 0
 #define cIncludeUnused 0
 #define UnusedParam(p) (void) p
diff --git a/src/FPMATHEM.h b/src/FPMATHEM.h
index a2adc4e..d3fe5bb 100644
--- a/src/FPMATHEM.h
+++ b/src/FPMATHEM.h
@@ -80,6 +80,8 @@
 	* ==========================================================================*.
 */
 
+#include "SYSDEPNS.h"
+
 
 /*
 	ReportAbnormalID unused 0x0204 - 0x02FF
diff --git a/src/DISAM68K.c b/src/M68K/DISAM68K.c
similarity index 99%
rename from src/DISAM68K.c
rename to src/M68K/DISAM68K.c
index f934012..463ee54 100644
--- a/src/DISAM68K.c
+++ b/src/M68K/DISAM68K.c
@@ -26,10 +26,10 @@
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 
-#include "M68KITAB.h"
+#include "M68K/M68KITAB.h"
 #endif
 
-#include "DISAM68K.h"
+#include "M68K/DISAM68K.h"
 
 LOCALVAR uint32_t Disasm_pc;
 
diff --git a/src/DISAM68K.h b/src/M68K/DISAM68K.h
similarity index 100%
rename from src/DISAM68K.h
rename to src/M68K/DISAM68K.h
diff --git a/src/M68KITAB.c b/src/M68K/M68KITAB.c
similarity index 99%
rename from src/M68KITAB.c
rename to src/M68K/M68KITAB.c
index bfa114b..2f78338 100644
--- a/src/M68KITAB.c
+++ b/src/M68K/M68KITAB.c
@@ -26,7 +26,7 @@
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 
-#include "M68KITAB.h"
+#include "M68K/M68KITAB.h"
 
 struct WorkR {
 	/* expected size : 8 bytes */
diff --git a/src/M68KITAB.h b/src/M68K/M68KITAB.h
similarity index 100%
rename from src/M68KITAB.h
rename to src/M68K/M68KITAB.h
diff --git a/src/MINEM68K.c b/src/M68K/MINEM68K.c
similarity index 99%
rename from src/MINEM68K.c
rename to src/M68K/MINEM68K.c
index c739395..021fb13 100644
--- a/src/MINEM68K.c
+++ b/src/M68K/MINEM68K.c
@@ -38,14 +38,14 @@
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 
-#include "M68KITAB.h"
+#include "M68K/M68KITAB.h"
 
 #if WantDisasm
-#include "DISAM68K.h"
+#include "M68K/DISAM68K.h"
 #endif
 #endif
 
-#include "MINEM68K.h"
+#include "M68K/MINEM68K.h"
 
 /*
 	ReportAbnormalID unused 0x0123 - 0x01FF
diff --git a/src/MINEM68K.h b/src/M68K/MINEM68K.h
similarity index 100%
rename from src/MINEM68K.h
rename to src/M68K/MINEM68K.h
diff --git a/src/MOUSEMDV.c b/src/MOUSEMDV.c
index 5abedef..1ff0351 100644
--- a/src/MOUSEMDV.c
+++ b/src/MOUSEMDV.c
@@ -30,7 +30,7 @@
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "SCCEMDEV.h"
-#include "MINEM68K.h"
+#include "M68K/MINEM68K.h"
 #endif
 
 #include "MOUSEMDV.h"
diff --git a/src/PROGMAIN.c b/src/PROGMAIN.c
index 9083f8c..26a14d0 100644
--- a/src/PROGMAIN.c
+++ b/src/PROGMAIN.c
@@ -24,8 +24,8 @@
 #include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
-#include "M68KITAB.h"
-#include "MINEM68K.h"
+#include "M68K/M68KITAB.h"
+#include "M68K/MINEM68K.h"
 #include "VIAEMDEV.h"
 #if EmVIA2
 #include "VIA2EMDV.h"
diff --git a/src/SCSIEMDV.c b/src/SCSIEMDV.c
index 35e6e71..334199f 100644
--- a/src/SCSIEMDV.c
+++ b/src/SCSIEMDV.c
@@ -31,7 +31,7 @@
 #include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
-#include "MINEM68K.h"
+#include "M68K/MINEM68K.h"
 #endif
 
 #include "SCSIEMDV.h"
diff --git a/src/SNDEMDEV.c b/src/SNDEMDEV.c
index e39c2f5..004f158 100644
--- a/src/SNDEMDEV.c
+++ b/src/SNDEMDEV.c
@@ -28,7 +28,7 @@
 #include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
-#include "MINEM68K.h"
+#include "M68K/MINEM68K.h"
 #endif
 
 #include "SNDEMDEV.h"
diff --git a/src/SONYEMDV.c b/src/SONYEMDV.c
index 1b64ec8..c6874c9 100644
--- a/src/SONYEMDV.c
+++ b/src/SONYEMDV.c
@@ -34,7 +34,7 @@
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
-#include "MINEM68K.h"
+#include "M68K/MINEM68K.h"
 #endif
 
 #include "SONYEMDV.h"
diff --git a/src/SYSDEPNS.h b/src/SYSDEPNS.h
index 2815a08..afa58ed 100644
--- a/src/SYSDEPNS.h
+++ b/src/SYSDEPNS.h
@@ -55,10 +55,6 @@ typedef int32_t simr;
 #define MayInline
 #endif
 
-#ifndef MayNotInline
-#define MayNotInline
-#endif
-
 #ifndef my_reg_call
 #define my_reg_call
 #endif
@@ -76,13 +72,13 @@ typedef int32_t simr;
 #define EXPORTVAR(t, v) extern t v;
 #endif
 
-#define LOCALFUNC static MayNotInline
+#define LOCALFUNC static
 #define FORWARDFUNC LOCALFUNC
 #ifdef AllFiles
 #define GLOBALFUNC LOCALFUNC
 #define EXPORTFUNC LOCALFUNC
 #else
-#define GLOBALFUNC MayNotInline
+#define GLOBALFUNC
 #define EXPORTFUNC extern
 #endif
 #define IMPORTFUNC EXPORTFUNC
diff --git a/src/VIDEMDEV.c b/src/VIDEMDEV.c
index d1b8687..6be55eb 100644
--- a/src/VIDEMDEV.c
+++ b/src/VIDEMDEV.c
@@ -33,7 +33,7 @@
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
-#include "MINEM68K.h"
+#include "M68K/MINEM68K.h"
 #include "SONYEMDV.h"
 #endif