diff --git a/zsnes/src/cpu/zstate.c b/zsnes/src/cpu/zstate.c
index 310e922c..3a16c86f 100755
--- a/zsnes/src/cpu/zstate.c
+++ b/zsnes/src/cpu/zstate.c
@@ -31,6 +31,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <string.h>
 #define DIR_SLASH "\\"
 #endif
+#include "glbvars.h"
 
 //C++ style code in C
 #define bool unsigned char
@@ -45,26 +46,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #define stim()
 #endif
 
-extern unsigned int cycpbl, PH65816regsize;
-extern unsigned int *wramdata, *vram, PHspcsave, PHdspsave, *C4Ram, *sfxramdata;
-extern unsigned int PHnum2writesa1reg, SA1Mode, prevedi, SA1xpc, sa1dmaptr;
-extern unsigned int soundcycleft, spc700read, timer2upd, xa, PHnum2writesfxreg;
-extern unsigned int spcnumread, spchalted, opcd, HIRQCycNext, oamaddr;
-extern unsigned int SfxR0, ReadHead, *setaramdata, ramsize, *sram;
-extern unsigned int tempesi, tempedi, tempedx, tempebp;
-extern unsigned int SPCMultA, PHnum2writespc7110reg;
-extern unsigned char sndrot, spcRam[65472];
-extern unsigned char DSPMem[256], SA1Status, *SA1RAMArea, DSP1Type, DSP1COp;
-extern unsigned char prevoamptr, BRRBuffer[32], *romdata, curcyc;
-extern unsigned char vidmemch4[4096], vidmemch8[4096], vidmemch2[4096];
-
-extern bool C4Enable, SFXEnable, SA1Enable, SPC7110Enable, SETAEnable, spcon, SRAMState;
-
-extern short C4WFXVal, C41FXVal, Op00Multiplicand, Op04Angle, Op08X, Op18X;
-extern short Op28X, Op0CA, Op02FX, Op0AVS, Op06X, Op01m, Op0DX, Op03F, Op14Zr;
-extern short Op0EH;
-extern signed short Op10Coefficient;
-
 static void copy_snes_data(unsigned char **buffer, void (*copy_func)(unsigned char **, void *, size_t))
 {
   //65816 status, etc.