7 files changed, 13 insertions, 8 deletions
diff --git a/source/dsp1.c b/source/dsp1.c
index f8a0713..5d8204c 100644
--- a/source/dsp1.c
+++ b/source/dsp1.c
@@ -3,8 +3,8 @@
 #include "snes9x.h"
 #include "dsp1.h"
 #include "memmap.h"
-#include "dsp1emu.c"
-#include "dsp2emu.c"
+#include "dsp1emu.h"
+#include "dsp2emu.h"
 
 void (*SetDSP)(uint8_t, uint16_t) = &DSP1SetByte;
 uint8_t(*GetDSP)(uint16_t) = &DSP1GetByte;
@@ -723,7 +723,7 @@ typedef struct
 
 SDSP4 DSP4;
 
-#include "dsp4emu.c"
+#include "dsp4emu.h"
 
 bool DSP4_init = false;
 
diff --git a/source/dsp1emu.c b/source/dsp1emu.h
index e7c3f7d..e7c3f7d 100644
--- a/source/dsp1emu.c
+++ b/source/dsp1emu.h
diff --git a/source/dsp2emu.c b/source/dsp2emu.h
index 48e06c2..48e06c2 100644
--- a/source/dsp2emu.c
+++ b/source/dsp2emu.h
diff --git a/source/dsp4emu.c b/source/dsp4emu.h
index da6e80f..da6e80f 100644
--- a/source/dsp4emu.c
+++ b/source/dsp4emu.h
diff --git a/source/port.h b/source/port.h
index fcfe836..06c5f5e 100644
--- a/source/port.h
+++ b/source/port.h
@@ -3,6 +3,12 @@
 #ifndef _PORT_H_
 #define _PORT_H_
 
+#include <stdio.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include <boolean.h>
 #include <limits.h>
 #include <string.h>
 #include <sys/types.h>
@@ -62,8 +68,6 @@ void _splitpath(const char* path, char* drive, char* dir, char* fname, char* ext
 #define FAST_ALIGNED_LSB_WORD_ACCESS
 #endif
 
-#include <libretro.h>
-
 #define ABS(X)   ((X) <  0  ? -(X) : (X))
 #define MIN(A,B) ((A) < (B) ?  (A) : (B))
 #define MAX(A,B) ((A) > (B) ?  (A) : (B))
diff --git a/source/snes9x.h b/source/snes9x.h
index ad410e1..6f6caf5 100644
--- a/source/snes9x.h
+++ b/source/snes9x.h
@@ -4,10 +4,11 @@
 #define _SNES9X_H_
 
 #include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <stdint.h>
 
-#include <libretro.h>
+#include <boolean.h>
 
 #include "port.h"
 #include "65c816.h"
diff --git a/source/srtc.c b/source/srtc.c
index 0bfa7d9..3f4f257 100644
--- a/source/srtc.c
+++ b/source/srtc.c
@@ -371,7 +371,7 @@ void S9xSRTCPreSaveState()
       Memory.SRAM [s + 12 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 56);
 #else
       /* memmove converted: Different mallocs [Neb] */
-      memcpy(&Memory.SRAM [s + 5 + MAX_RTC_INDEX], &rtc.system_timestamp, 8);
+      memcpy(&Memory.SRAM [s + 5 + MAX_RTC_INDEX], &rtc.system_timestamp, sizeof(time_t));
 #endif
    }
 }
@@ -402,7 +402,7 @@ void S9xSRTCPostLoadState()
       rtc.system_timestamp |= (Memory.SRAM [s + 12 + MAX_RTC_INDEX] << 56);
 #else
       /* memmove converted: Different mallocs [Neb] */
-      memcpy(&rtc.system_timestamp, &Memory.SRAM [s + 5 + MAX_RTC_INDEX], 8);
+      memcpy(&rtc.system_timestamp, &Memory.SRAM [s + 5 + MAX_RTC_INDEX], sizeof(time_t));
 #endif
       S9xUpdateSrtcTime();
    }