Move all remaining source files into directories

Now everything is nice and clean and easy to find!

Makefile

@@ -8,7 +8,9 @@ mk_COptions = $(mk_COptionsCommon) -Os
 
 TheDefaultOutput : minivmac.exe
 
-bld/OSGLUWIN.o : src/UI/WIN32/OSGLUWIN.c src/LANG/STRCNENG.h cfg/STRCONST.h src/INTLCHAR.h src/UI/COMOSGLU.h src/CONTROLM.h cfg/CNFGGLOB.h
+bld/PROGMAIN.o : src/PROGMAIN.c
+	gcc "src/PROGMAIN.c" -o "bld/PROGMAIN.o" $(mk_COptions)
+bld/OSGLUWIN.o : src/UI/WIN32/OSGLUWIN.c src/LANG/STRCNENG.h cfg/STRCONST.h src/LANG/INTLCHAR.h src/UI/COMOSGLU.h src/UI/CONTROLM.h cfg/CNFGGLOB.h
 	gcc "src/UI/WIN32/OSGLUWIN.c" -o "bld/OSGLUWIN.o" $(mk_COptions)
 bld/GLOBGLUE.o : src/GLOBGLUE.c
 	gcc "src/GLOBGLUE.c" -o "bld/GLOBGLUE.o" $(mk_COptions)
@@ -16,30 +18,28 @@ bld/M68KITAB.o : src/HW/M68K/M68KITAB.c cfg/CNFGGLOB.h
 	gcc "src/HW/M68K/M68KITAB.c" -o "bld/M68KITAB.o" $(mk_COptions)
 bld/MINEM68K.o : src/HW/M68K/MINEM68K.c
 	gcc "src/HW/M68K/MINEM68K.c" -o "bld/MINEM68K.o" $(mk_COptions)
-bld/VIAEMDEV.o : src/VIAEMDEV.c
-	gcc "src/VIAEMDEV.c" -o "bld/VIAEMDEV.o" $(mk_COptions)
-bld/IWMEMDEV.o : src/IWMEMDEV.c
-	gcc "src/IWMEMDEV.c" -o "bld/IWMEMDEV.o" $(mk_COptions)
-bld/SCCEMDEV.o : src/SCCEMDEV.c
-	gcc "src/SCCEMDEV.c" -o "bld/SCCEMDEV.o" $(mk_COptions)
-bld/RTCEMDEV.o : src/RTCEMDEV.c
-	gcc "src/RTCEMDEV.c" -o "bld/RTCEMDEV.o" $(mk_COptions)
-bld/ROMEMDEV.o : src/ROMEMDEV.c
-	gcc "src/ROMEMDEV.c" -o "bld/ROMEMDEV.o" $(mk_COptions)
-bld/SCSIEMDV.o : src/SCSIEMDV.c
-	gcc "src/SCSIEMDV.c" -o "bld/SCSIEMDV.o" $(mk_COptions)
-bld/SONYEMDV.o : src/SONYEMDV.c
-	gcc "src/SONYEMDV.c" -o "bld/SONYEMDV.o" $(mk_COptions)
-bld/SCRNEMDV.o : src/SCRNEMDV.c
-	gcc "src/SCRNEMDV.c" -o "bld/SCRNEMDV.o" $(mk_COptions)
+bld/VIAEMDEV.o : src/HW/VIA/VIAEMDEV.c
+	gcc "src/HW/VIA/VIAEMDEV.c" -o "bld/VIAEMDEV.o" $(mk_COptions)
+bld/IWMEMDEV.o : src/HW/DISK/IWMEMDEV.c
+	gcc "src/HW/DISK/IWMEMDEV.c" -o "bld/IWMEMDEV.o" $(mk_COptions)
+bld/SCCEMDEV.o : src/HW/SCC/SCCEMDEV.c
+	gcc "src/HW/SCC/SCCEMDEV.c" -o "bld/SCCEMDEV.o" $(mk_COptions)
+bld/RTCEMDEV.o : src/HW/RTC/RTCEMDEV.c
+	gcc "src/HW/RTC/RTCEMDEV.c" -o "bld/RTCEMDEV.o" $(mk_COptions)
+bld/ROMEMDEV.o : src/PATCHES/ROMEMDEV.c
+	gcc "src/PATCHES/ROMEMDEV.c" -o "bld/ROMEMDEV.o" $(mk_COptions)
+bld/SCSIEMDV.o : src/HW/SCSI/SCSIEMDV.c
+	gcc "src/HW/SCSI/SCSIEMDV.c" -o "bld/SCSIEMDV.o" $(mk_COptions)
+bld/SONYEMDV.o : src/HW/DISK/SONYEMDV.c
+	gcc "src/HW/DISK/SONYEMDV.c" -o "bld/SONYEMDV.o" $(mk_COptions)
+bld/SCRNEMDV.o : src/HW/SCREEN/SCRNEMDV.c
+	gcc "src/HW/SCREEN/SCRNEMDV.c" -o "bld/SCRNEMDV.o" $(mk_COptions)
 bld/MOUSEMDV.o : src/HW/MOUSE/MOUSEMDV.c
 	gcc "src/HW/MOUSE/MOUSEMDV.c" -o "bld/MOUSEMDV.o" $(mk_COptions)
 bld/KBRDEMDV.o : src/HW/KBRD/KBRDEMDV.c
 	gcc "src/HW/KBRD/KBRDEMDV.c" -o "bld/KBRDEMDV.o" $(mk_COptions)
-bld/SNDEMDEV.o : src/SNDEMDEV.c
-	gcc "src/SNDEMDEV.c" -o "bld/SNDEMDEV.o" $(mk_COptions)
-bld/PROGMAIN.o : src/PROGMAIN.c
-	gcc "src/PROGMAIN.c" -o "bld/PROGMAIN.o" $(mk_COptions)
+bld/SNDEMDEV.o : src/HW/SOUND/SNDEMDEV.c
+	gcc "src/HW/SOUND/SNDEMDEV.c" -o "bld/SNDEMDEV.o" $(mk_COptions)
 bld/DATE2SEC.o : src/UTIL/DATE2SEC.c
 	gcc "src/UTIL/DATE2SEC.c" -o "bld/DATE2SEC.o" $(mk_COptions)
 

src/GLOBGLUE.c

@@ -28,7 +28,7 @@
 #include "SYSDEPNS.h"
 
 #include "UI/MYOSGLUE.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 #include "EMCONFIG.h"
 #endif
 

src/HW/DISK/IWMEMDEV.c

@@ -29,13 +29,11 @@
 	includes Status and Mode Register Accesses.
 */
 
-#ifndef AllFiles
 #include "SYSDEPNS.h"
 
 #include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
-#endif
 
 #include "IWMEMDEV.h"
 

src/HW/DISK/IWMEMDEV.h

@@ -14,12 +14,11 @@
 	license for more details.
 */
 
-#ifdef IWMEVDEV_H
-#error "header already included"
-#else
+#ifndef IWMEVDEV_H
 #define IWMEVDEV_H
-#endif
 
 EXPORTPROC IWM_Reset(void);
 
 EXPORTFUNC uint32_t IWM_Access(uint32_t Data, bool WriteMem, CPTR addr);
+
+#endif

src/HW/DISK/SONYEMDV.c

@@ -31,13 +31,13 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 #include "UI/MYOSGLUE.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "HW/M68K/MINEM68K.h"
 #endif
 
-#include "SONYEMDV.h"
+#include "HW/DISK/SONYEMDV.h"
 
 /*
 	ReportAbnormalID unused 0x090B - 0x09FF

src/HW/DISK/SONYEMDV.h

@@ -1,5 +1,5 @@
 /*
-	SONYEMDV.h
+	HW/DISK/SONYEMDV.h
 
 	Copyright (C) 2004 Paul C. Pratt
 

src/HW/KBRD/ALTKEYSM.c

@@ -1,9 +1,9 @@
-#include "ALTKEYSM.h"
+#include "HW/KBRD/ALTKEYSM.h"
 #include "SYSDEPNS.h"
 #include "MYOSGLUE.h"
 #include "UI/COMOSGLU.h"
-#include "CONTROLM.h"
-#include "INTLCHAR.h"
+#include "UI/CONTROLM.h"
+#include "LANG/INTLCHAR.h"
 
 LOCALVAR bool AltKeysLockText = false;
 LOCALVAR bool AltKeysTrueCmnd = false;

src/HW/KBRD/ALTKEYSM.h

@@ -1,5 +1,5 @@
 /*
-	ALTKEYSM.h
+	HW/KBRD/ALTKEYSM.h
 
 	Copyright (C) 2007 Paul C. Pratt
 

src/HW/M68K/DISAM68K.c

@@ -21,7 +21,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 #include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"

src/HW/M68K/MINEM68K.c

@@ -34,7 +34,7 @@
 #include "SYSDEPNS.h"
 
 #include "UI/MYOSGLUE.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 

src/HW/MOUSE/MOUSEMDV.c

@@ -26,10 +26,10 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 #include "UI/MYOSGLUE.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
-#include "SCCEMDEV.h"
+#include "HW/SCC/SCCEMDEV.h"
 #include "HW/M68K/MINEM68K.h"
 #endif
 

src/HW/POWERMAN/PMUEMDEV.c

@@ -23,7 +23,7 @@
 #include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
-#include "VIAEMDEV.h"
+#include "HW/VIA/VIAEMDEV.h"
 #endif
 
 #include "HW/POWERMAN/PMUEMDEV.h"

src/HW/RTC/RTCEMDEV.c

@@ -22,20 +22,18 @@
 	This code adapted from "RTC.c" in vMac by Philip Cummins.
 */
 
-#ifndef AllFiles
 #include "SYSDEPNS.h"
 #include "UI/MYOSGLUE.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
-#endif
 
 /* define _RTC_Debug */
 #ifdef _RTC_Debug
 #include <stdio.h>
 #endif
 
-#include "RTCEMDEV.h"
+#include "HW/RTC/RTCEMDEV.h"
 
 #define HaveXPRAM (CurEmMd >= kEmMd_Plus)
 

src/HW/RTC/RTCEMDEV.h

@@ -1,5 +1,5 @@
 /*
-	RTCEMDEV.h
+	HW/RTC/RTCEMDEV.h
 
 	Copyright (C) 2003 Philip Cummins, Paul C. Pratt
 

src/HW/SCC/SCCEMDEV.c

@@ -46,7 +46,7 @@
 #include "GLOBGLUE.h"
 #endif
 
-#include "SCCEMDEV.h"
+#include "HW/SCC/SCCEMDEV.h"
 
 /*
 	ReportAbnormalID unused 0x0721, 0x0722, 0x074D - 0x07FF

src/HW/SCC/SCCEMDEV.h

@@ -1,5 +1,5 @@
 /*
-	SCCEMDEV.h
+	HW/SCC/SCCEMDEV.h
 
 	Copyright (C) 2004 Philip Cummins, Paul C. Pratt
 

src/HW/SCREEN/SCRNEMDV.c

@@ -27,12 +27,12 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 #include "UI/MYOSGLUE.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif
 
-#include "SCRNEMDV.h"
+#include "HW/SCREEN/SCRNEMDV.h"
 
 #if ! IncludeVidMem
 #define kMain_Offset      0x5900

src/HW/SCREEN/SCRNEMDV.h

@@ -1,5 +1,5 @@
 /*
-	SCRNEMDV.h
+	HW/SCREEN/SCRNEMDV.h
 
 	Copyright (C) 2006 Philip Cummins, Richard F. Bannister,
 		Paul C. Pratt

src/HW/SCREEN/SCRNMAPR.h

@@ -1,5 +1,5 @@
 /*
-	SCRNMAPR.h
+	HW/SCREEN/SCRNMAPR.h
 
 	Copyright (C) 2012 Paul C. Pratt
 

src/HW/SCREEN/SCRNTRNS.h

@@ -1,5 +1,5 @@
 /*
-	SCRNTRNS.h
+	HW/SCREEN/SCRNTRNS.h
 
 	Copyright (C) 2012 Paul C. Pratt
 

src/HW/SCSI/SCSIEMDV.c

@@ -27,14 +27,14 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 #include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "HW/M68K/MINEM68K.h"
 #endif
 
-#include "SCSIEMDV.h"
+#include "HW/SCSI/SCSIEMDV.h"
 
 #define scsiRd   0x00
 #define scsiWr   0x01

src/HW/SCSI/SCSIEMDV.h

@@ -1,5 +1,5 @@
 /*
-	SCSIEMDV.h
+	HW/SCSI/SCSIEMDV.h
 
 	Copyright (C) 2004 Philip Cummins, Paul C. Pratt
 

src/HW/SOUND/ASCEMDEV.c

@@ -20,14 +20,14 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 #include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
-#include "VIAEMDEV.h"
+#include "HW/VIA/VIAEMDEV.h"
 #endif
 
-#include "ASCEMDEV.h"
+#include "HW/SOUND/ASCEMDEV.h"
 
 /*
 	ReportAbnormalID unused 0x0F0E, 0x0F1E - 0x0FFF

src/HW/SOUND/ASCEMDEV.h

@@ -1,5 +1,5 @@
 /*
-	ASCEMDEV.h
+	HW/SOUND/ASCEMDEV.h
 
 	Copyright (C) 2008 Paul C. Pratt
 

src/HW/SOUND/SNDEMDEV.c

@@ -31,7 +31,7 @@
 #include "HW/M68K/MINEM68K.h"
 #endif
 
-#include "SNDEMDEV.h"
+#include "HW/SOUND/SNDEMDEV.h"
 
 
 #if SoundEnabled

src/HW/SOUND/SNDEMDEV.h

@@ -1,5 +1,5 @@
 /*
-	SNDEMDEV.h
+	HW/SOUND/SNDEMDEV.h
 
 	Copyright (C) 2003 Philip Cummins, Paul C. Pratt
 

src/HW/VIA/VIA2EMDV.h

@@ -1,5 +1,5 @@
 /*
-	VIA2EMDV.h
+	HW/VIA/VIA2EMDV.h
 
 	Copyright (C) 2004 Philip Cummins, Paul C. Pratt
 

src/HW/VIA/VIAEMDEV.h

@@ -1,5 +1,5 @@
 /*
-	VIAEMDEV.h
+	HW/VIA/VIAEMDEV.h
 
 	Copyright (C) 2004 Philip Cummins, Paul C. Pratt
 

src/HW/VIDCARD/VIDEMDEV.c

@@ -27,16 +27,13 @@
 		Basilisk II source code, especially slot_rom.cpp
 */
 
-#ifndef AllFiles
 #include "SYSDEPNS.h"
 #include "UI/MYOSGLUE.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "HW/M68K/MINEM68K.h"
-#include "SONYEMDV.h"
-#endif
-
+#include "HW/DISK/SONYEMDV.h"
 #include "VIDEMDEV.h"
 
 /*

src/LANG/INTLCHAR.h

@@ -1,5 +1,5 @@
 /*
-	INTLCHAR.h
+	LANG/INTLCHAR.h
 
 	Copyright (C) 2010 Paul C. Pratt
 

src/PATCHES/ROMEMDEV.c

@@ -28,13 +28,13 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 #include "UI/MYOSGLUE.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif
 
 #include "incbin/incbin.h"
-#include "ROMEMDEV.h"
+#include "PATCHES/ROMEMDEV.h"
 
 #define UseSonyPatch \
 	((CurEmMd <= kEmMd_Classic) || (CurEmMd == kEmMd_II) \
@@ -176,7 +176,7 @@ LOCALPROC Sony_Install(void)
 	{
 		uint8_t * patchp = pto;
 
-#include "SCRNHACK.h"
+#include "PATCHES/SCRNHACK.h"
 	}
 #endif
 

src/PATCHES/ROMEMDEV.h

@@ -1,5 +1,5 @@
 /*
-	ROMEMDEV.h
+	PATCHES/ROMEMDEV.h
 
 	Copyright (C) 2003 Philip Cummins, Paul C. Pratt
 

src/PATCHES/SCRNHACK.h

@@ -1,5 +1,5 @@
 /*
-	SCRNHACK.h
+	PATCHES/SCRNHACK.h
 
 	Copyright (C) 2007 Paul C. Pratt
 

src/PROGMAIN.c

@@ -26,21 +26,21 @@
 	#include "GLOBGLUE.h"
 	#include "HW/M68K/M68KITAB.h"
 	#include "HW/M68K/MINEM68K.h"
-	#include "VIAEMDEV.h"
+	#include "HW/VIA/VIAEMDEV.h"
 	#if EmVIA2
-		#include "VIA2EMDV.h"
+		#include "HW/VIA/VIA2EMDV.h"
 	#endif
-	#include "IWMEMDEV.h"
-	#include "SCCEMDEV.h"
+	#include "HW/DISK/IWMEMDEV.h"
+	#include "HW/SCC/SCCEMDEV.h"
 	#if EmRTC
-		#include "RTCEMDEV.h"
+		#include "HW/RTC/RTCEMDEV.h"
 	#endif
-	#include "ROMEMDEV.h"
-	#include "SCSIEMDV.h"
-	#include "SONYEMDV.h"
-	#include "SCRNEMDV.h"
+	#include "PATCHES/ROMEMDEV.h"
+	#include "HW/SCSI/SCSIEMDV.h"
+	#include "HW/DISK/SONYEMDV.h"
+	#include "HW/SCREEN/SCRNEMDV.h"
 	#if EmVidCard
-		#include "VIDEMDEV.h"
+		#include "HW/VIDCARD/VIDEMDEV.h"
 	#endif
 	#if EmClassicKbrd
 		#include "HW/KBRD/KBRDEMDV.h"
@@ -50,10 +50,10 @@
 		#include "HW/ADB/ADBEMDEV.h"
 	#endif
 	#if EmASC
-		#include "ASCEMDEV.h"
+		#include "HW/SOUND/ASCEMDEV.h"
 	#else
 		#if SoundEnabled && (CurEmMd != kEmMd_PB100)
-			#include "SNDEMDEV.h"
+			#include "HW/SOUND/SNDEMDEV.h"
 		#endif
 	#endif
 	#include "HW/MOUSE/MOUSEMDV.h"

src/UI/CONTROLM.h

@@ -1,5 +1,5 @@
 /*
-	CONTROLM.h
+	UI/CONTROLM.h
 
 	Copyright (C) 2007 Paul C. Pratt
 
@@ -312,7 +312,7 @@ LOCALPROC DrawSpclMode0(char *Title, SpclModeBody Body)
 }
 
 #if EnableAltKeysMode
-#include "ALTKEYSM.h"
+#include "HW/KBRD/ALTKEYSM.h"
 #else
 #define Keyboard_UpdateKeyMap1 Keyboard_UpdateKeyMap
 #define DisconnectKeyCodes1 DisconnectKeyCodes

src/UI/MACOSX/OSGLUCCO.m

@@ -26,7 +26,7 @@
 
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 
 #include "UI/MYOSGLUE.h"
 
@@ -288,7 +288,7 @@ GLOBALOSGLUPROC MoveBytes(anyp srcPtr, anyp destPtr, int32_t byteCount)
 
 #define NeedCell2UnicodeMap 1
 
-#include "INTLCHAR.h"
+#include "LANG/INTLCHAR.h"
 
 /* --- sending debugging info to file --- */
 
@@ -348,9 +348,9 @@ LOCALPROC dbglog_close0(void)
 
 #define WantKeyboard_RemapMac 1
 
-#include "PBUFSTDC.h"
+#include "UTILS/PBUFSTDC.h"
 
-#include "CONTROLM.h"
+#include "UI/CONTROLM.h"
 
 /* --- text translation --- */
 
@@ -1249,7 +1249,7 @@ GLOBALOSGLUFUNC tMacErr HTCEimport(tPbuf *r)
 
 #if EmLocalTalk
 
-#include "BPFILTER.h"
+#include "UTIL/BPFILTER.h"
 
 #endif
 
@@ -1701,7 +1701,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 3
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 
 #if (0 != vMacScreenDepth) && (vMacScreenDepth < 4)
@@ -1713,7 +1713,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 5
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #endif
 
@@ -1726,7 +1726,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnTrns_DstDepth 5
 #define ScrnTrns_DstZLo 1
 
-#include "SCRNTRNS.h"
+#include "HW/SCREEN/SCRNTRNS.h"
 
 #endif
 

src/UI/MACOSX/OSGLUOSX.c

@@ -29,7 +29,7 @@
 
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 
 #include "UI/MYOSGLUE.h"
 
@@ -655,7 +655,7 @@ LOCALPROC PStrFromChar(ps3p r, char x)
 
 #define NeedCell2UnicodeMap 1
 
-#include "INTLCHAR.h"
+#include "LANG/INTLCHAR.h"
 
 LOCALPROC UniCharStrFromSubstCStr(int *L, UniChar *x, char *s)
 {
@@ -970,7 +970,7 @@ LOCALFUNC bool CheckDateTime(void)
 
 /* --- parameter buffers --- */
 
-#include "PBUFSTDC.h"
+#include "UTILS/PBUFSTDC.h"
 
 /* --- drives --- */
 
@@ -1169,7 +1169,7 @@ GLOBALOSGLUFUNC tMacErr HTCEimport(tPbuf *r)
 
 #if EmLocalTalk
 
-#include "BPFILTER.h"
+#include "UTIL/BPFILTER.h"
 
 #endif
 
@@ -1178,7 +1178,7 @@ GLOBALOSGLUFUNC tMacErr HTCEimport(tPbuf *r)
 
 #define WantKeyboard_RemapMac 1
 
-#include "CONTROLM.h"
+#include "UI/CONTROLM.h"
 
 
 /* --- video out --- */
@@ -1271,7 +1271,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 3
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 
 #if (0 != vMacScreenDepth) && (vMacScreenDepth < 4)
@@ -1283,7 +1283,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 5
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #endif
 
@@ -1296,7 +1296,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnTrns_DstDepth 5
 #define ScrnTrns_DstZLo 1
 
-#include "SCRNTRNS.h"
+#include "HW/SCREEN/SCRNTRNS.h"
 
 #endif
 

src/UI/NDS/OSGLUNDS.c

@@ -20,7 +20,7 @@
 
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 
 #include "UI/MYOSGLUE.h"
 
@@ -59,7 +59,7 @@ LOCALVAR int Display_bg2_Main = 0;
 
 #define NeedCell2PlainAsciiMap 1
 
-#include "INTLCHAR.h"
+#include "LANG/INTLCHAR.h"
 
 /* --- sending debugging info to file --- */
 
@@ -122,7 +122,7 @@ LOCALPROC WriteExtraErr(char *s)
 #define WantColorTransValid 0
 
 #include "UI/COMOSGLU.h"
-#include "CONTROLM.h"
+#include "UI/CONTROLM.h"
 
 LOCALPROC NativeStrFromCStr(char *r, char *s)
 {

src/UI/OLDMAC/OSGLUMAC.c

@@ -34,7 +34,7 @@
 
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 
 #include "UI/MYOSGLUE.h"
 
@@ -740,13 +740,13 @@ LOCALPROC dbglog_close0(void)
 
 #define WantColorTransValid 1
 
-#include "INTLCHAR.h"
+#include "LANG/INTLCHAR.h"
 
 #include "UI/COMOSGLU.h"
 
 #define WantKeyboard_RemapMac 1
 
-#include "CONTROLM.h"
+#include "UI/CONTROLM.h"
 
 /* --- some simple utilities --- */
 
@@ -1037,7 +1037,7 @@ LOCALVAR uint8_t * ScalingTabl = nullpr;
 #define ScrnMapr_Map ScalingTabl
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #endif
 

src/UI/UNIX/OSGLUXWN.c

@@ -37,7 +37,7 @@
 
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 
 #include "UI/MYOSGLUE.h"
 
@@ -54,7 +54,7 @@ GLOBALOSGLUPROC MoveBytes(anyp srcPtr, anyp destPtr, int32_t byteCount)
 
 #define NeedCell2PlainAsciiMap 1
 
-#include "INTLCHAR.h"
+#include "LANG/INTLCHAR.h"
 
 
 LOCALVAR char *d_arg = NULL;
@@ -310,9 +310,9 @@ LOCALFUNC bool NetSupportedContains(Atom x)
 
 #include "UI/COMOSGLU.h"
 
-#include "PBUFSTDC.h"
+#include "UTILS/PBUFSTDC.h"
 
-#include "CONTROLM.h"
+#include "UI/CONTROLM.h"
 
 /* --- text translation --- */
 
@@ -1319,7 +1319,7 @@ LOCALPROC SetUpBW2ColorTabl(void)
 #define ScrnMapr_Map ScalingTabl
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #endif
 
@@ -1333,7 +1333,7 @@ LOCALPROC SetUpBW2ColorTabl(void)
 #define ScrnMapr_DstDepth 5
 #define ScrnMapr_Map ScalingTabl
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #endif
 
@@ -1348,7 +1348,7 @@ LOCALPROC SetUpBW2ColorTabl(void)
 #define ScrnMapr_Map ScalingTabl
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #endif
 
@@ -1361,7 +1361,7 @@ LOCALPROC SetUpBW2ColorTabl(void)
 #define ScrnTrns_SrcDepth vMacScreenDepth
 #define ScrnTrns_DstDepth 5
 
-#include "SCRNTRNS.h"
+#include "HW/SCREEN/SCRNTRNS.h"
 
 #endif
 
@@ -1374,7 +1374,7 @@ LOCALPROC SetUpBW2ColorTabl(void)
 #define ScrnTrns_DstDepth 5
 #define ScrnTrns_Scale WindowScale
 
-#include "SCRNTRNS.h"
+#include "HW/SCREEN/SCRNTRNS.h"
 
 #endif
 
@@ -1389,7 +1389,7 @@ LOCALPROC SetUpBW2ColorTabl(void)
 #define ScrnMapr_Map ScalingTabl
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #endif
 
@@ -1403,7 +1403,7 @@ LOCALPROC SetUpBW2ColorTabl(void)
 #define ScrnMapr_DstDepth 5
 #define ScrnMapr_Map ScalingTabl
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #endif
 

src/UI/WIN32/OSGLUWIN.c

@@ -35,7 +35,7 @@
 
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 
 #include "UI/MYOSGLUE.h"
 
@@ -98,7 +98,7 @@ LOCALFUNC bool HaveMySHGetSpecialFolderPath(void)
 #define NeedCell2WinAsciiMap 1
 #endif
 
-#include "INTLCHAR.h"
+#include "LANG/INTLCHAR.h"
 
 
 LOCALPROC NativeStrFromCStr(LPTSTR r, char *s, bool AddEllipsis)
@@ -373,7 +373,7 @@ GLOBALOSGLUPROC PbufTransfer(uint8_t * Buffer,
 
 /* --- control mode and internationalization --- */
 
-#include "CONTROLM.h"
+#include "UI/CONTROLM.h"
 
 /* --- main window info --- */
 

src/UI/XPLAT/OSGLUGTK.c

@@ -23,7 +23,7 @@
 
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 
 #include "UI/MYOSGLUE.h"
 
@@ -42,9 +42,9 @@ GLOBALOSGLUPROC MoveBytes(anyp srcPtr, anyp destPtr, int32_t byteCount)
 
 #define NeedCell2PlainAsciiMap 1
 
-#include "INTLCHAR.h"
+#include "LANG/INTLCHAR.h"
 
-#include "CONTROLM.h"
+#include "UI/CONTROLM.h"
 
 /* --- sending debugging info to file --- */
 

src/UI/XPLAT/OSGLUSD2.c

@@ -23,7 +23,7 @@
 
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 
 #include "UI/MYOSGLUE.h"
 
@@ -40,7 +40,7 @@ GLOBALOSGLUPROC MoveBytes(anyp srcPtr, anyp destPtr, int32_t byteCount)
 
 #define NeedCell2PlainAsciiMap 1
 
-#include "INTLCHAR.h"
+#include "LANG/INTLCHAR.h"
 
 #ifndef CanGetAppPath
 #define CanGetAppPath 1
@@ -170,9 +170,9 @@ LOCALPROC dbglog_close0(void)
 
 #include "UI/COMOSGLU.h"
 
-#include "PBUFSTDC.h"
+#include "UTILS/PBUFSTDC.h"
 
-#include "CONTROLM.h"
+#include "UI/CONTROLM.h"
 
 /* --- text translation --- */
 
@@ -591,7 +591,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 3
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateBWDepth4Copy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -600,7 +600,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 4
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateBWDepth5Copy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -609,7 +609,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 5
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #if EnableMagnify && ! UseSDLscaling
 
@@ -621,7 +621,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_Map CLUT_final
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateBWDepth4ScaledCopy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -631,7 +631,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_Map CLUT_final
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateBWDepth5ScaledCopy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -641,7 +641,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_Map CLUT_final
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #endif /* EnableMagnify && ! UseSDLscaling */
 
@@ -655,7 +655,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 3
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateColorDepth4Copy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -664,7 +664,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 4
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateColorDepth5Copy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -673,7 +673,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 5
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #if EnableMagnify && ! UseSDLscaling
 
@@ -685,7 +685,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_Map CLUT_final
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateColorDepth4ScaledCopy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -695,7 +695,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_Map CLUT_final
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateColorDepth5ScaledCopy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -705,7 +705,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_Map CLUT_final
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #endif /* EnableMagnify && ! UseSDLscaling */
 

src/UI/XPLAT/OSGLUSDL.c

@@ -23,7 +23,7 @@
 
 #include "CNFGRAPI.h"
 #include "SYSDEPNS.h"
-#include "ENDIANAC.h"
+#include "UTIL/ENDIANAC.h"
 
 #include "UI/MYOSGLUE.h"
 
@@ -40,7 +40,7 @@ GLOBALOSGLUPROC MoveBytes(anyp srcPtr, anyp destPtr, int32_t byteCount)
 
 #define NeedCell2PlainAsciiMap 1
 
-#include "INTLCHAR.h"
+#include "LANG/INTLCHAR.h"
 
 /* --- sending debugging info to file --- */
 
@@ -91,9 +91,9 @@ LOCALPROC dbglog_close0(void)
 
 #include "UI/COMOSGLU.h"
 
-#include "PBUFSTDC.h"
+#include "UTILS/PBUFSTDC.h"
 
-#include "CONTROLM.h"
+#include "UI/CONTROLM.h"
 
 /* --- text translation --- */
 
@@ -388,7 +388,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 3
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateBWDepth4Copy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -397,7 +397,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 4
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateBWDepth5Copy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -406,7 +406,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 5
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateBWDepth3ScaledCopy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -416,7 +416,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_Map CLUT_final
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateBWDepth4ScaledCopy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -426,7 +426,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_Map CLUT_final
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateBWDepth5ScaledCopy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -436,7 +436,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_Map CLUT_final
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 
 #if (0 != vMacScreenDepth) && (vMacScreenDepth < 4)
@@ -448,7 +448,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 3
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateColorDepth4Copy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -457,7 +457,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 4
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateColorDepth5Copy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -466,7 +466,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_DstDepth 5
 #define ScrnMapr_Map CLUT_final
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateColorDepth3ScaledCopy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -476,7 +476,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_Map CLUT_final
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateColorDepth4ScaledCopy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -486,7 +486,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_Map CLUT_final
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #define ScrnMapr_DoMap UpdateColorDepth5ScaledCopy
 #define ScrnMapr_Src GetCurDrawBuff()
@@ -496,7 +496,7 @@ LOCALVAR uint8_t * CLUT_final;
 #define ScrnMapr_Map CLUT_final
 #define ScrnMapr_Scale WindowScale
 
-#include "SCRNMAPR.h"
+#include "HW/SCREEN/SCRNMAPR.h"
 
 #endif
 

src/UTIL/BPFILTER.h

@@ -1,5 +1,5 @@
 /*
-	BPFILTER.h
+	UTIL/BPFILTER.h
 
 	Copyright (C) 2012 Michael Fort, Paul C. Pratt
 

src/UTIL/ENDIANAC.h

@@ -1,5 +1,5 @@
 /*
-	ENDIANAC.h
+	UTIL/ENDIANAC.h
 
 	Copyright (C) 2006 Bernd Schmidt, Paul C. Pratt
 

src/UTIL/PBUFSTDC.h

@@ -1,5 +1,5 @@
 /*
-	PBUFSTDC.h
+	UTILS/PBUFSTDC.h
 
 	Copyright (C) 2018 Paul C. Pratt