diff --git a/zsnes/src/initc.c b/zsnes/src/initc.c
index b8c2fb5a..5ea017be 100755
--- a/zsnes/src/initc.c
+++ b/zsnes/src/initc.c
@@ -1047,7 +1047,7 @@ extern char GNextPath[1024];
 extern char SGPath[1024];
 void SplitSupport()
 {
-  unsigned char *ROM = (unsigned char *)romdata;
+  char *ROM = (char *)romdata;
   SplittedROM = false;
 
   //Same Game add on
@@ -1703,7 +1703,7 @@ unsigned int SPC7110IndexSize;
 extern unsigned int SPC7110Entries;
 void SPC7PackIndexLoad()
 {
-  unsigned char *ROM = (unsigned char *)romdata;
+  char *ROM = (char *)romdata;
   FILE *fp = 0;
   SPC7110IndexSize = 0;
 
@@ -1827,7 +1827,8 @@ unsigned int CalcCRC32 (unsigned char *start, unsigned int size)
 }
 
 extern unsigned int MsgCount, MessageOn, CRC32;
-extern unsigned char IPSPatched, *Msgptr;
+extern unsigned char IPSPatched;
+extern char *Msgptr;
 
 unsigned int showinfogui()
 {
@@ -1973,7 +1974,7 @@ void CheckROMType()
   MirrorROM();
 
   lorommapmode2 = 0;
-  if (!strncmp(ROM+0x207FC0, "DERBY STALLION 96", 17) || !strncmp(ROM+Lo, "SOUND NOVEL-TCOOL", 17))
+  if (!strncmp((char *)ROM+0x207FC0, "DERBY STALLION 96", 17) || !strncmp((char *)ROM+Lo, "SOUND NOVEL-TCOOL", 17))
   {
     lorommapmode2 = 1;
   }
@@ -2211,7 +2212,7 @@ void powercycle(bool sramload)
   NextLineCache = 0;
   curexecstate = 1;
 
-  if (sramload)	{ loadSRAM(fnames+1); }
+  if (sramload)	{ loadSRAM((char *)fnames+1); }
   SetupROM();
   asm_call(initsnes);
 
diff --git a/zsnes/src/zstate.c b/zsnes/src/zstate.c
index 9cdf6969..f9a23ca5 100755
--- a/zsnes/src/zstate.c
+++ b/zsnes/src/zstate.c
@@ -471,8 +471,8 @@ unsigned char firstsaveinc = 0;
 
 extern unsigned int statefileloc, CurrentHandle, SfxRomBuffer, SfxCROM;
 extern unsigned int SfxLastRamAdr, SfxRAMMem, MsgCount, MessageOn;
-extern unsigned char AutoIncSaveSlot, fnamest[512], cbitmode, NoPictureSave;
-extern unsigned char *Msgptr;
+extern unsigned char AutoIncSaveSlot, cbitmode, NoPictureSave;
+extern char *Msgptr, fnamest[512];
 extern unsigned short PrevPicture[64*56];
 
 static FILE *fhandle;
@@ -591,11 +591,11 @@ if (!num)                                                             \
 
 void statesaver()
 {
-  static unsigned char txtsavemsg[] = "STATE - SAVED.";
-  static unsigned char txtrrsvmsg[] = "RR STATE - SAVED.";
+  static char txtsavemsg[] = "STATE - SAVED.";
+  static char txtrrsvmsg[] = "RR STATE - SAVED.";
 
-  static unsigned char *txtsavenum = 0;
-  static unsigned char *txtrrsvnum = 0;
+  static char *txtsavenum = 0;
+  static char *txtrrsvnum = 0;
 
   //Get the state number
   INSERT_POSITION_NUMBER(txtsavemsg, txtsavenum);
@@ -610,7 +610,7 @@ void statesaver()
   if (MovieProcessing == 2)
   {
     bool mzt_save(char *, bool, bool);
-    if (mzt_save(fnamest+1, (cbitmode && !NoPictureSave) ? true : false, false))
+    if (mzt_save((char *)fnamest+1, (cbitmode && !NoPictureSave) ? true : false, false))
     {
       Msgptr = txtrrsvmsg;
       MessageOn = MsgCount;
@@ -843,19 +843,19 @@ void zst_sram_load_compressed(FILE *fp)
   }
 }
 
-void stateloader (unsigned char *statename, unsigned char keycheck, unsigned char xfercheck)
+void stateloader (char *statename, unsigned char keycheck, unsigned char xfercheck)
 {
   extern unsigned char PauseLoad;
 
-  static unsigned char txtloadmsg[] = "STATE - LOADED.";
-  static unsigned char txtconvmsg[] = "STATE - TOO OLD.";
-  static unsigned char txtnfndmsg[] = "UNABLE TO LOAD STATE -.";
-  static unsigned char txtrrldmsg[] = "RR STATE - LOADED.";
+  static char txtloadmsg[] = "STATE - LOADED.";
+  static char txtconvmsg[] = "STATE - TOO OLD.";
+  static char txtnfndmsg[] = "UNABLE TO LOAD STATE -.";
+  static char txtrrldmsg[] = "RR STATE - LOADED.";
 
-  static unsigned char *txtloadnum = 0;
-  static unsigned char *txtconvnum = 0;
-  static unsigned char *txtnfndnum = 0;
-  static unsigned char *txtrrldnum = 0;
+  static char *txtloadnum = 0;
+  static char *txtconvnum = 0;
+  static char *txtnfndnum = 0;
+  static char *txtrrldnum = 0;
 
   //Get the state number
   INSERT_POSITION_NUMBER(txtloadmsg, txtloadnum);