diff --git a/zsnes/src/cpu/execute.asm b/zsnes/src/cpu/execute.asm
index c0763b0d..1184a554 100644
--- a/zsnes/src/cpu/execute.asm
+++ b/zsnes/src/cpu/execute.asm
@@ -21,7 +21,7 @@
 %include "macros.mac"
 
 EXTSYM StringLength,Get_Time,objhipr,KeyRewind,statesaver
-EXTSYM xa,timer2upd,prevoamptr,ReadHead
+EXTSYM xa,timer2upd,prevoamptr
 EXTSYM prevedi,SA1xpc,SA1RAMArea,sa1dmaptr
 EXTSYM DSP1COp,C4WFXVal,C41FXVal,Op00Multiplicand,Op10Coefficient,Op04Angle
 EXTSYM Op08X,Op18X,Op28X,Op0CA,Op02FX,Op0AVS,Op06X,Op0DX,Op03F,Op14Zr
diff --git a/zsnes/src/gblvars.h b/zsnes/src/gblvars.h
index 6b93c47a..1f9f8445 100644
--- a/zsnes/src/gblvars.h
+++ b/zsnes/src/gblvars.h
@@ -30,7 +30,7 @@ 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 SfxR0, *setaramdata, ramsize, *sram;
 extern unsigned int tempesi, tempedi, tempedx, tempebp;
 extern unsigned int SPCMultA, PHnum2writespc7110reg, PHdspsave2;
 extern unsigned char sndrot, spcRam[65472];
diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index 633d7a42..0776d3d3 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -1048,14 +1048,8 @@ NEWSYM ReadInputDevice
 
 SECTION .data
 NEWSYM txtmovieended, db 'MOVIE FINISHED.',0
-NEWSYM CFWriteStart, dd 64+30
 
 SECTION .bss
-NEWSYM MovieBuffSize, resd 1
-NEWSYM MovieBuffFrame, resd 1
-NEWSYM CReadHead, resd 1
-NEWSYM ReadHead, resd 1
-NEWSYM CFWriteHead, resd 1
 NEWSYM StoreBuffer, resb 128*32
 
 ;*******************************************************
@@ -2887,7 +2881,7 @@ NEWSYM CheckROMType
     mov dword[memtabler16+30h*4+ecx],DSP4Read16b
     mov dword[memtablew16+30h*4+ecx],DSP4Write16b
     add ecx,4
-    cmp ecx,16*4
+    cmp ecx,1*4
     jne .dsp4loop
     jmp .notDSP1Hi
 .initdsp2
diff --git a/zsnes/src/zmovie.c b/zsnes/src/zmovie.c
index 6e9a8109..c501f9e3 100644
--- a/zsnes/src/zmovie.c
+++ b/zsnes/src/zmovie.c
@@ -837,6 +837,17 @@ void zmv_replay_finished()
 
 /////////////////////////////////////////////////////////
 
+/*
+ZSNES movie related vars:
+
+MovieProcessing
+0 = nothing movie related in progress
+1 = movie playback in progress
+2 = movie recording in progress
+
+
+*/
+
 
 extern unsigned int MsgCount, MessageOn;
 extern unsigned char MovieTemp, txtmovieended[15], MovieProcessing, *Msgptr;
@@ -891,7 +902,7 @@ void Replay()
   }
 }
 
-extern unsigned int MovieBuffFrame, MovieBuffSize;
+unsigned int MovieBuffFrame, MovieBuffSize;
 unsigned char MovieBuffer[21*60];
 
 void IncFrameWriteBuffer()
@@ -922,7 +933,7 @@ unsigned int bytemerger (unsigned char heaviest, unsigned char heavy, unsigned c
   return ((heaviest << 24) | (heavy << 16) | (light << 8) | (lightest));
 }
 
-extern unsigned int CReadHead, ReadHead, CFWriteStart, CFWriteHead;
+unsigned int CReadHead, ReadHead, CFWriteStart = 64+30, CFWriteHead;
 extern unsigned char BackState, CNetType, StoreBuffer[128*32];
 
 void Record()
diff --git a/zsnes/src/zstate.c b/zsnes/src/zstate.c
index da9e0f2e..6d3b504a 100755
--- a/zsnes/src/zstate.c
+++ b/zsnes/src/zstate.c
@@ -72,7 +72,6 @@ static void copy_extra_data(unsigned char **buffer, void (*copy_func)(unsigned c
   copy_func(buffer, &HIRQCycNext, 5);
   copy_func(buffer, &oamaddr, 14*4);
   copy_func(buffer, &prevoamptr, 1);
-  copy_func(buffer, &ReadHead, 1*4);
 }
 
 static size_t load_save_size;