4 files changed, 5 insertions, 8 deletions
diff --git a/source/apu.c b/source/apu.c
index eb6fcb6..f6b94ea 100644
--- a/source/apu.c
+++ b/source/apu.c
@@ -5,6 +5,7 @@
 #include "snes9x.h"
 #include "spc700.h"
 #include "apu.h"
+#include "apumem.h"
 #include "soundux.h"
 #include "cpuexec.h"
 
@@ -32,8 +33,6 @@ void S9xDeinitAPU()
    }
 }
 
-uint8_t APUROM [64];
-
 void S9xResetAPU()
 {
    int32_t i, j;
diff --git a/source/apu.h b/source/apu.h
index 42d266f..4a6d46f 100644
--- a/source/apu.h
+++ b/source/apu.h
@@ -46,8 +46,8 @@ typedef struct
    bool     UNUSED2 [3];
 } SAPU;
 
-SAPU APU;
-SIAPU IAPU;
+extern SAPU APU;
+extern SIAPU IAPU;
 
 static INLINE void S9xAPUUnpackStatus(void)
 {
diff --git a/source/cpuops.c b/source/cpuops.c
index 129ffef..368e905 100644
--- a/source/cpuops.c
+++ b/source/cpuops.c
@@ -18,8 +18,6 @@
 
 #include <retro_inline.h>
 
-int32_t OpAddress;
-
 /* ADC */
 static void Op69M1(void)
 {
diff --git a/source/soundux.h b/source/soundux.h
index a3b4bbc..5cb4218 100644
--- a/source/soundux.h
+++ b/source/soundux.h
@@ -48,7 +48,7 @@ typedef struct
    bool     mute_sound;
 } SoundStatus;
 
-SoundStatus so;
+extern SoundStatus so;
 
 typedef struct
 {
@@ -105,7 +105,7 @@ typedef struct
    int32_t  noise_hertz;
 } SSoundData;
 
-SSoundData SoundData;
+extern SSoundData SoundData;
 
 void S9xSetSoundVolume(int32_t channel, int16_t volume_left, int16_t volume_right);
 void S9xSetSoundFrequency(int32_t channel, int32_t hertz);