diff --git a/zsnes/src/chips/dsp1proc.asm b/zsnes/src/chips/dsp1proc.asm
index 02403b9c..586f571c 100644
--- a/zsnes/src/chips/dsp1proc.asm
+++ b/zsnes/src/chips/dsp1proc.asm
@@ -32,24 +32,24 @@ EXTSYM DSPOp02,Op02AAS,Op02AZS,Op02CX,Op02CY,Op02FX,Op02FY
 EXTSYM Op02FZ,Op02LES,Op02LFE,Op02VOF,Op02VVA
 EXTSYM DSPOp06,Op06X,Op06Y,Op06Z,Op06H,Op06V,Op06S
 EXTSYM DSPOp0E,Op0EH,Op0EV,Op0EX,Op0EY
-EXTSYM Op01m, Op01Zr, Op01Xr, Op01Yr, DSPOp01
-EXTSYM Op11m, Op11Zr, Op11Xr, Op11Yr, DSPOp11
-EXTSYM Op21m, Op21Zr, Op21Xr, Op21Yr, DSPOp21
-EXTSYM Op0DX, Op0DY, Op0DZ, Op0DF, Op0DL, Op0DU, DSPOp0D
-EXTSYM Op1DX, Op1DY, Op1DZ, Op1DF, Op1DL, Op1DU, DSPOp1D
-EXTSYM Op2DX, Op2DY, Op2DZ, Op2DF, Op2DL, Op2DU, DSPOp2D
-EXTSYM Op03X, Op03Y, Op03Z, Op03F, Op03L, Op03U, DSPOp03
-EXTSYM Op13X, Op13Y, Op13Z, Op13F, Op13L, Op13U, DSPOp13
-EXTSYM Op23X, Op23Y, Op23Z, Op23F, Op23L, Op23U, DSPOp23
-EXTSYM Op14Zr, Op14Xr, Op14Yr, Op14U, Op14F, Op14L
-EXTSYM Op14Zrr,Op14Xrr,Op14Yrr, DSPOp14
+EXTSYM Op01m,Op01Zr,Op01Xr,Op01Yr,DSPOp01
+EXTSYM Op11m,Op11Zr,Op11Xr,Op11Yr,DSPOp11
+EXTSYM Op21m,Op21Zr,Op21Xr,Op21Yr,DSPOp21
+EXTSYM Op0DX,Op0DY,Op0DZ,Op0DF,Op0DL,Op0DU,DSPOp0D
+EXTSYM Op1DX,Op1DY,Op1DZ,Op1DF,Op1DL,Op1DU,DSPOp1D
+EXTSYM Op2DX,Op2DY,Op2DZ,Op2DF,Op2DL,Op2DU,DSPOp2D
+EXTSYM Op03X,Op03Y,Op03Z,Op03F,Op03L,Op03U,DSPOp03
+EXTSYM Op13X,Op13Y,Op13Z,Op13F,Op13L,Op13U,DSPOp13
+EXTSYM Op23X,Op23Y,Op23Z,Op23F,Op23L,Op23U,DSPOp23
+EXTSYM Op14Zr,Op14Xr,Op14Yr,Op14U,Op14F,Op14L
+EXTSYM Op14Zrr,Op14Xrr,Op14Yrr,DSPOp14
 EXTSYM Op0BX,Op0BY,Op0BZ,Op0BS,DSPOp0B
 EXTSYM Op1BX,Op1BY,Op1BZ,Op1BS,DSPOp1B
 EXTSYM Op2BX,Op2BY,Op2BZ,Op2BS,DSPOp2B
 EXTSYM Op08X,Op08Y,Op08Z,Op08Ll,Op08Lh,DSPOp08
 EXTSYM Op18X,Op18Y,Op18Z,Op18R,Op18D,DSPOp18
 EXTSYM Op1CX,Op1CY,Op1CZ,Op1CXBR,Op1CYBR,Op1CZBR,Op1CXAR,Op1CYAR,Op1CZAR,DSPOp1C
-
+EXTSYM Op10Exponent,Op10ExponentR,Op10Coefficient,Op10CoefficientR
 
 SECTION .bss
 NEWSYM dsp1ptr, resd 1
@@ -340,9 +340,6 @@ DSP1_00:  ; 16-bit multiply
     pop eax
     ret
 
-EXTSYM Op10Exponent, Op10ExponentR
-EXTSYM Op10Coefficient, Op10CoefficientR
-
 DSP1_10:  ; Inverse
     push eax
     mov ax,[DSP1VARS]
diff --git a/zsnes/src/chips/sa1regs.asm b/zsnes/src/chips/sa1regs.asm
index a17a60e7..f02271b3 100644
--- a/zsnes/src/chips/sa1regs.asm
+++ b/zsnes/src/chips/sa1regs.asm
@@ -48,7 +48,7 @@ EXTSYM Get_Time,Get_TimeDate,spc7110romptr,SPC7110Entries,SPC7110IndexSize
 EXTSYM SPC7110nfname,SPC7110filep,SPC7_Convert_Upper,SPC7_Convert_Lower
 EXTSYM Open_File,Close_File,Read_File,File_Seek,irqv2,irqv,nmiv2,nmiv,snesmmap
 EXTSYM snesmap2,curypos,CurrentExecSA1,memaccessbankr8sdd1,memtabler8,AddrNoIncr
-EXTSYM NumofBanks
+EXTSYM NumofBanks,BWUsed2
 
 %include "cpu/regs.mac"
 %include "cpu/regsw.mac"
@@ -1825,7 +1825,6 @@ NEWSYM sa12224w ; BWRAM
 .nosnes
     ret
 NEWSYM sa12225w ; BWRAM
-EXTSYM BWUsed2
     mov [BWUsed2],al
     test al,80h
     jnz .upper
diff --git a/zsnes/src/chips/st10proc.asm b/zsnes/src/chips/st10proc.asm
index cd7d1a43..8742b2ff 100644
--- a/zsnes/src/chips/st10proc.asm
+++ b/zsnes/src/chips/st10proc.asm
@@ -20,11 +20,11 @@
 
 %include "macros.mac"
 
+EXTSYM setaramdata,ST010DoCommand
+
 SECTION .data
 NEWSYM SetaCmdEnable,    dd 0     ; Seta ST010/ST011 command enable register. Maybe also status.
 SECTION .text
-EXTSYM setaramdata
-EXTSYM ST010DoCommand
 
 ;; TODO - should return ROM for > 8000h
 NEWSYM setaaccessbankr8
diff --git a/zsnes/src/cpu/dma.asm b/zsnes/src/cpu/dma.asm
index 8031aede..ec2f9f46 100644
--- a/zsnes/src/cpu/dma.asm
+++ b/zsnes/src/cpu/dma.asm
@@ -22,7 +22,7 @@
 
 EXTSYM memtabler8,regptw,snesmap2,snesmmap,memtablew8,regptr,memtabler16
 EXTSYM dmadata,hdmatype,nexthdma,resolutn,curhdma,curypos,disablehdma,hdmadata
-EXTSYM hdmadelay,hdmarestart,nohdmaframe
+EXTSYM hdmadelay,hdmarestart,nohdmaframe,SPCRAM
 
 ;*******************************************************
 ; Transfer DMA                     Inits & Transfers DMA
@@ -1154,7 +1154,6 @@ section .data
 .fname2 db 9,'vram2.dat',0
 section .text
 
-EXTSYM SPCRAM
 section .data
 NEWSYM ewj2hack, dd 0
 section .text
diff --git a/zsnes/src/cpu/s65816d.inc b/zsnes/src/cpu/s65816d.inc
index 0c0a5d70..fbe31e9b 100644
--- a/zsnes/src/cpu/s65816d.inc
+++ b/zsnes/src/cpu/s65816d.inc
@@ -20,12 +20,11 @@
 
 
 
-EXTSYM Sflagnz,Sflago,Sflagc,dmadata,IRAM
+EXTSYM Sflagnz,Sflago,Sflagc,dmadata,IRAM,debuggeron
 
 ;*******************************************************
 ; Flag Setting Macros
 ;*******************************************************
-EXTSYM debuggeron
 
 %macro endloop 0
 ;    call sa1debug
diff --git a/zsnes/src/dos/dosintrf.asm b/zsnes/src/dos/dosintrf.asm
index 3c529aac..435d8d30 100644
--- a/zsnes/src/dos/dosintrf.asm
+++ b/zsnes/src/dos/dosintrf.asm
@@ -94,6 +94,15 @@ NEWSYM SystemInit
     push es
     call getcmdline
 
+    mov dword[esi],'zsne'
+    mov dword[esi+4],'s.cf'
+    mov byte[esi+8],'g'
+    mov byte[esi+9],0
+    mov dword[esi+256],'zgui'
+    mov dword[esi+256+4],'cfg.'
+    mov dword[esi+256+8],'dat '
+    mov byte[esi+256+11],0
+
     ; Get and set the initial directory
     mov ebx,InitDir
     mov edx,InitDrive
diff --git a/zsnes/src/linux/copyvwin.asm b/zsnes/src/linux/copyvwin.asm
index 9bb1e04f..3e09bc80 100644
--- a/zsnes/src/linux/copyvwin.asm
+++ b/zsnes/src/linux/copyvwin.asm
@@ -24,7 +24,7 @@
 
 EXTSYM vidbuffer,GUIOn,MMXSupport,resolutn,En2xSaI,antienab,scanlines
 EXTSYM hirestiledat,res512switch,curblank,spritetablea,lineleft,_2xSaILineW
-EXTSYM _2xSaISuperEagleLineW, _2xSaISuper2xSaILineW,newengen,cfield,HalfTrans
+EXTSYM _2xSaISuperEagleLineW,_2xSaISuper2xSaILineW,newengen,cfield,HalfTrans
 EXTSYM GUIOn2,FilteredGUI,SpecialLine,vidbufferofsb,HalfTransB,HalfTransC
 
 ALIGN32
diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm
index b150f978..4602e99f 100644
--- a/zsnes/src/ui.asm
+++ b/zsnes/src/ui.asm
@@ -203,36 +203,15 @@ NEWSYM getcmdline
 .next
     inc eax
     jmp .next2
-.nomore
-    mov [FilenameStart],esi
-    mov dword[esi],'zsne'
-    mov dword[esi+4],'s.cf'
-    mov byte[esi+8],'g'
-    mov byte[esi+9],0
-    mov dword[esi+256],'zgui'
-    mov dword[esi+256+4],'cfg.'
-    mov dword[esi+256+8],'dat '
-    mov byte[esi+256+11],0
-    mov dword[esi+512],'data'
-    mov dword[esi+512+4],'.cmb'
-    mov byte[esi+512+8],0
-    ret
 .nfound
     mov edx,.stringnf
     call PrintStr
     mov esi,CMDLineStr
+.nomore
     mov [FilenameStart],esi
-    mov dword[esi],'zsne'
-    mov dword[esi+4],'s.cf'
-    mov byte[esi+8],'g'
-    mov byte[esi+9],0
-    mov dword[esi+256],'zgui'
-    mov dword[esi+256+4],'cfg.'
-    mov dword[esi+256+8],'dat '
-    mov byte[esi+256+11],0
     mov dword[esi+512],'data'
-    mov dword[esi+4+512],'.cmb'
-    mov byte[esi+8+512],0
+    mov dword[esi+512+4],'.cmb'
+    mov byte[esi+512+8],0
     ret
 
 SECTION .data
diff --git a/zsnes/src/video/mode716.mac b/zsnes/src/video/mode716.mac
index 3359d39f..39fe0bc1 100644
--- a/zsnes/src/video/mode716.mac
+++ b/zsnes/src/video/mode716.mac
@@ -20,7 +20,7 @@
 
 
 EXTSYM BGMS1,FillSubScr,CMainWinScr,CSubWinScr,scadtng
-EXTSYM ngwinen, winbg1enval, BuildWindow, ngwintable, ngcwinptr, domosaicng16b
+EXTSYM ngwinen,winbg1enval,BuildWindow,ngwintable,ngcwinptr,domosaicng16b
 EXTSYM pesimpng,ScrDispl
 
 
diff --git a/zsnes/src/video/newgfx2.asm b/zsnes/src/video/newgfx2.asm
index f4c04b76..621a09ef 100644
--- a/zsnes/src/video/newgfx2.asm
+++ b/zsnes/src/video/newgfx2.asm
@@ -21,8 +21,8 @@
 %include "macros.mac"
 
 EXTSYM ngwintable,ngwinen,ngcwinptr,ngcpixleft,ngcwinmode
-EXTSYM tleftn, ng16bprval, vrama, bg1drwng, ng16bbgval, bg1totng
-EXTSYM bgtxadd, taddnfy16x16, taddfy16x16, switch16x16, curmosaicsz, domosaicng
+EXTSYM tleftn,ng16bprval,vrama,bg1drwng,ng16bbgval,bg1totng
+EXTSYM bgtxadd,taddnfy16x16,taddfy16x16,switch16x16,curmosaicsz,domosaicng
 EXTSYM vidmemch4,vidmemch2,vidmemch8,mode0add,vcache4b,vcache2b,vcache8b
 EXTSYM cachesingle2bng,cachesingle8bng,ngpalcon4b,ngpalcon8b
 EXTSYM ngpalcon2b,tleftnb,tltype2b,tltype4b,tltype8b,yposng,flipyposng