--- np2/win9x/x86/makegrph.x86	2004/07/22 11:31:32	1.3
+++ np2/win9x/x86/makegrph.x86	2011/02/02 13:50:29	1.7
@@ -1,5 +1,8 @@
 
-%include 'x86/np2asm.inc'
+%include 'pccore.inc'
+%include 'cpucore.inc'
+%include 'iocore.inc'
+%include 'vram.inc'
 
 section .bss
 
@@ -7,7 +10,6 @@ section .bss
 	extern	_mem
 	extern	_np2_vram
 	extern	_renewal_line
-	extern	_gdc
 	extern	_dsync
 	extern	_vramupdate
 	global	_grph_table
@@ -91,9 +93,9 @@ maketbl_4:		mov		[esi], eax
 				mov		edi, _np2_vram
 				add		edi, [_dsync + dsync_t.grphvad]
 				and		ecx, 1
-				je		short adjustpage
+				je		short .adjustpage
 				add		edi, SCRN_BUFSIZE
-adjustpage:		inc		cl
+.adjustpage:	inc		cl
 				mov		byte [esp+21], cl				; DISPPAGE
 				mov		ch, cl
 				movzx	eax, cx
@@ -251,5 +253,3 @@ deldirty_lp:	and		[ebx], edx
 				popad
 				ret
 
-	ends
-