Clean up unnecessary dependencies.

24 files changed, 559 insertions, 564 deletions

diff --git a/Makefile.in b/Makefile.in
index 05ddcc6..a4d3336 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -185,49 +185,49 @@ alldeps: perlreq
 # @object-ending: ".$(O)"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(O): assemble.c insns.h assemble.h insnsi.h nasmlib.h version.h \
+assemble.$(O): assemble.c insns.h insnsi.h assemble.h nasmlib.h version.h \
  regvals.c nasm.h regs.h
 disasm.$(O): disasm.c insns.h regs.c insnsn.c insnsi.h sync.h version.h \
  names.c nasm.h regdis.c disasm.h regs.h
-eval.$(O): eval.c labels.h insnsi.h nasmlib.h version.h nasm.h eval.h regs.h
-float.$(O): float.c insnsi.h version.h nasm.h regs.h
+eval.$(O): eval.c labels.h nasmlib.h version.h nasm.h eval.h regs.h
+float.$(O): float.c version.h nasm.h regs.h
 insnsa.$(O): insnsa.c insns.h insnsi.h version.h nasm.h regs.h
 insnsd.$(O): insnsd.c insns.h insnsi.h version.h nasm.h regs.h
 insnsn.$(O): insnsn.c
-labels.$(O): labels.c insnsi.h nasmlib.h version.h nasm.h regs.h
-listing.$(O): listing.c listing.h insnsi.h nasmlib.h version.h nasm.h regs.h
+labels.$(O): labels.c nasmlib.h version.h nasm.h regs.h
+listing.$(O): listing.c listing.h nasmlib.h version.h nasm.h regs.h
 macros.$(O): macros.c
 names.$(O): names.c insnsn.c regs.c
 nasm.$(O): nasm.c listing.h preproc.h insns.h outform.h assemble.h parser.h \
  nasm.h regs.h labels.h insnsi.h version.h nasmlib.h eval.h
-nasmlib.$(O): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(O): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(O): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(O): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.$(O): output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.$(O): output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.$(O): output/outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outcoff.$(O): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.$(O): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outelf.$(O): output/outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outieee.$(O): output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.$(O): output/outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf.$(O): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf2.$(O): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(O): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(O): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h version.h
+outform.$(O): outform.c outform.h nasm.h regs.h version.h
+output/outaout.$(O): output/outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outas86.$(O): output/outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outbin.$(O): output/outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outcoff.$(O): output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outdbg.$(O): output/outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outelf.$(O): output/outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outieee.$(O): output/outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outobj.$(O): output/outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf.$(O): output/outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf2.$(O): output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+parser.$(O): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(O): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(O): regdis.c
 regflags.$(O): regflags.c
 regs.$(O): regs.c
diff --git a/Mkfiles/Makefile.b32 b/Mkfiles/Makefile.b32
index 7fe78fa..548aa80 100644
--- a/Mkfiles/Makefile.b32
+++ b/Mkfiles/Makefile.b32
@@ -175,48 +175,45 @@ assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+eval.$(OBJ): eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.$(OBJ): float.c nasm.h regs.h version.h
 insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.$(OBJ): insnsn.c
-labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.$(OBJ): labels.c nasm.h regs.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.$(OBJ): outform.c outform.h nasm.h regs.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.$(OBJ): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.bc3 b/Mkfiles/Makefile.bc3
index d0453d1..342aadc 100644
--- a/Mkfiles/Makefile.bc3
+++ b/Mkfiles/Makefile.bc3
@@ -26,6 +26,7 @@
 #
 
 CC = bcc                #compiler
+
 # opimizations
 OPTFLAGS = -d -O1 -Ogmp -k-
   # -d  = merge duplicate strings
@@ -38,13 +39,15 @@ OPTFLAGS = -d -O1 -Ogmp -k-
   # -k- = omit stack frames where practical
 #output formats
 OUTFORMS = -DOF_ONLY -DOF_BIN -DOF_OBJ -DOF_WIN32 -DOF_AS86
+
 #compiler flags
-CFLAGS = -mh $(OPTFLAGS) $(OUTFORMS)
+CFLAGS = $(OPTFLAGS) -mh -f- $(OUTFORMS) -DFARDATA=far
   # -mh = model huge
+  # -f- = no floating point
 
-LINKFLAGS = -d -mh
+LINKFLAGS = -d -mh -M -f-
   # -d  = merge duplicate strings
-  # -mh = model huge
+  # -M  = generate map file (to find address space bottlenecks)
 
 LIBS =                  #any libaries to add, out side of the standard libary
 EXE = .exe              #executable file extention (keep the . as the start)
@@ -58,9 +61,9 @@ LIB = lib               #LIB file extension
 # The OBJ files that NASM is dependent on
 
 NASMOBJS = nasm.$(OBJ)   nasmlib.$(OBJ)  float.$(OBJ)  \
-	   insnsa.$(OBJ) assemble.$(OBJ) labels.$(OBJ) \
+	   assemble.$(OBJ) labels.$(OBJ) \
 	   parser.$(OBJ) outform.$(OBJ)  preproc.$(OBJ) \
-	   listing.$(OBJ) eval.$(OBJ)
+	   listing.$(OBJ) eval.$(OBJ) insnsa.$(OBJ)
 
 ################################################################
 # The OBJ files that NDISASM is dependent on
@@ -81,10 +84,10 @@ OUTOBJ= output\\outbin.$(OBJ) output\\outaout.$(OBJ) output\\outcoff.$(OBJ) \
 all : nasm$(EXE) ndisasm$(EXE)
 
 ################################################################
-# Build the output formats as a library
-output\\out.$(LIB): $(OUTOBJ)
-	-del output\\out.$(LIB)
-	for %a in (output\\*.$(OBJ)) do tlib /C output\\out.$(LIB) +%a
+# Rules to put the CFLAGS in a file
+CFLAGS: Makefile
+	echo $(CFLAGS) > CFLAGS
+	$(MAKE) clean
 
 ################################################################
 # NASM, NDISASM link.  The &&!...! construct in Borland Make
@@ -104,14 +107,26 @@ $(NDISASMOBJS)
 !
 
 ################################################################
+# Build the output formats as a library
+# The & ... $? construct tells Borland Make to repeat for all
+# out of date dependencies
+output\\out.$(LIB): $(OUTOBJ)
+	-del output\\out.$(LIB)
+	for %a in (output\\*.$(OBJ)) do tlib /C output\\out.$(LIB) +%a
+
+################################################################
 # A quick way to delete the OBJ files as well as the binaries.
 
 clean :
 	-del *.$(OBJ)
 	-del output\\*.$(OBJ)
 	-del output\\out.$(LIB)
+	-del *.$(LIB)
+	-del insnsa_?.c
 	-del nasm$(EXE)
 	-del ndisasm$(EXE)
+	-del *.map
+	-del CFLAGS
 
 #-- Magic hints to mkdep.pl --#
 # @object-ending: ".$(OBJ)"
@@ -121,48 +136,45 @@ assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+eval.$(OBJ): eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.$(OBJ): float.c nasm.h regs.h version.h
 insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.$(OBJ): insnsn.c
-labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.$(OBJ): labels.c nasm.h regs.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output\\outaout.$(OBJ): output\\outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outas86.$(OBJ): output\\outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outbin.$(OBJ): output\\outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outcoff.$(OBJ): output\\outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outdbg.$(OBJ): output\\outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outelf.$(OBJ): output\\outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outieee.$(OBJ): output\\outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outobj.$(OBJ): output\\outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outrdf.$(OBJ): output\\outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outrdf2.$(OBJ): output\\outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.$(OBJ): outform.c outform.h nasm.h regs.h version.h
+output\\outaout.$(OBJ): output\\outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outas86.$(OBJ): output\\outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outbin.$(OBJ): output\\outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outcoff.$(OBJ): output\\outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outdbg.$(OBJ): output\\outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outelf.$(OBJ): output\\outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outieee.$(OBJ): output\\outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outobj.$(OBJ): output\\outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outrdf.$(OBJ): output\\outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outrdf2.$(OBJ): output\\outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.$(OBJ): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.bor b/Mkfiles/Makefile.bor
index 61d370f..ff9e73f 100644
--- a/Mkfiles/Makefile.bor
+++ b/Mkfiles/Makefile.bor
@@ -66,48 +66,45 @@ assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+eval.$(OBJ): eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.$(OBJ): float.c nasm.h regs.h version.h
 insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.$(OBJ): insnsn.c
-labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.$(OBJ): labels.c nasm.h regs.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.$(OBJ): outform.c outform.h nasm.h regs.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.$(OBJ): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 3b8db41..b13c3ff 100644
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -89,45 +89,40 @@ assemble.o: assemble.c insns.h assemble.h regvals.c nasm.h regs.h insnsi.h \
  nasmlib.h version.h
 disasm.o: disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.o: eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-float.o: float.c nasm.h regs.h insnsi.h version.h
+eval.o: eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.o: float.c nasm.h regs.h version.h
 insnsa.o: insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.o: insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.o: insnsn.c
-labels.o: labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.o: listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h version.h
+labels.o: labels.c nasm.h regs.h nasmlib.h version.h
+listing.o: listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
 nasm.o: nasm.c listing.h preproc.h insns.h outform.h assemble.h parser.h \
  nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.o: nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+nasmlib.o: nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
  nasmlib.h version.h
 ndisasm.o: ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.o: outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.o: output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.o: output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.o: output/outbin.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+outform.o: outform.c outform.h nasm.h regs.h version.h
+output/outaout.o: output/outaout.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outcoff.o: output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.o: output/outdbg.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outas86.o: output/outas86.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outelf.o: output/outelf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outbin.o: output/outbin.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outcoff.o: output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outieee.o: output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.o: output/outobj.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outdbg.o: output/outdbg.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outelf.o: output/outelf.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outieee.o: output/outieee.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outrdf.o: output/outrdf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outobj.o: output/outobj.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outrdf.o: output/outrdf.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outrdf2.o: output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outrdf2.o: output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.o: parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.o: preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h version.h
+parser.o: parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.o: preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
diff --git a/Mkfiles/Makefile.djo b/Mkfiles/Makefile.djo
index 34488eb..a10423e 100644
--- a/Mkfiles/Makefile.djo
+++ b/Mkfiles/Makefile.djo
@@ -96,45 +96,40 @@ assemble.o: assemble.c insns.h assemble.h regvals.c nasm.h regs.h insnsi.h \
  nasmlib.h version.h
 disasm.o: disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.o: eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-float.o: float.c nasm.h regs.h insnsi.h version.h
+eval.o: eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.o: float.c nasm.h regs.h version.h
 insnsa.o: insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.o: insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.o: insnsn.c
-labels.o: labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.o: listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h version.h
+labels.o: labels.c nasm.h regs.h nasmlib.h version.h
+listing.o: listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
 nasm.o: nasm.c listing.h preproc.h insns.h outform.h assemble.h parser.h \
  nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.o: nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+nasmlib.o: nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
  nasmlib.h version.h
 ndisasm.o: ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.o: outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.o: output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.o: output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.o: output/outbin.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+outform.o: outform.c outform.h nasm.h regs.h version.h
+output/outaout.o: output/outaout.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outcoff.o: output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.o: output/outdbg.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outas86.o: output/outas86.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outelf.o: output/outelf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outbin.o: output/outbin.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outcoff.o: output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outieee.o: output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.o: output/outobj.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outdbg.o: output/outdbg.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outelf.o: output/outelf.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outieee.o: output/outieee.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outrdf.o: output/outrdf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outobj.o: output/outobj.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outrdf.o: output/outrdf.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outrdf2.o: output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outrdf2.o: output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.o: parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.o: preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h version.h
+parser.o: parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.o: preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
diff --git a/Mkfiles/Makefile.dl b/Mkfiles/Makefile.dl
index 712bb41..4be8edd 100644
--- a/Mkfiles/Makefile.dl
+++ b/Mkfiles/Makefile.dl
@@ -50,48 +50,45 @@ assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+eval.$(OBJ): eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.$(OBJ): float.c nasm.h regs.h version.h
 insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.$(OBJ): insnsn.c
-labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.$(OBJ): labels.c nasm.h regs.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.$(OBJ): outform.c outform.h nasm.h regs.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.$(OBJ): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.dos b/Mkfiles/Makefile.dos
index a7dbfc2..a890541 100644
--- a/Mkfiles/Makefile.dos
+++ b/Mkfiles/Makefile.dos
@@ -63,48 +63,45 @@ assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+eval.$(OBJ): eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.$(OBJ): float.c nasm.h regs.h version.h
 insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.$(OBJ): insnsn.c
-labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.$(OBJ): labels.c nasm.h regs.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.$(OBJ): outform.c outform.h nasm.h regs.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.$(OBJ): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.emx b/Mkfiles/Makefile.emx
index 27427df..213b2f4 100644
--- a/Mkfiles/Makefile.emx
+++ b/Mkfiles/Makefile.emx
@@ -146,45 +146,40 @@ assemble.o: assemble.c insns.h assemble.h regvals.c nasm.h regs.h insnsi.h \
  nasmlib.h version.h
 disasm.o: disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.o: eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-float.o: float.c nasm.h regs.h insnsi.h version.h
+eval.o: eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.o: float.c nasm.h regs.h version.h
 insnsa.o: insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.o: insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.o: insnsn.c
-labels.o: labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.o: listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h version.h
+labels.o: labels.c nasm.h regs.h nasmlib.h version.h
+listing.o: listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
 nasm.o: nasm.c listing.h preproc.h insns.h outform.h assemble.h parser.h \
  nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.o: nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+nasmlib.o: nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
  nasmlib.h version.h
 ndisasm.o: ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.o: outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.o: output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.o: output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.o: output/outbin.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+outform.o: outform.c outform.h nasm.h regs.h version.h
+output/outaout.o: output/outaout.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outcoff.o: output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.o: output/outdbg.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outas86.o: output/outas86.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outelf.o: output/outelf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outbin.o: output/outbin.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outcoff.o: output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outieee.o: output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.o: output/outobj.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outdbg.o: output/outdbg.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outelf.o: output/outelf.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outieee.o: output/outieee.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outrdf.o: output/outrdf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outobj.o: output/outobj.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outrdf.o: output/outrdf.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outrdf2.o: output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outrdf2.o: output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.o: parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.o: preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h version.h
+parser.o: parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.o: preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
diff --git a/Mkfiles/Makefile.lcc b/Mkfiles/Makefile.lcc
index 18baa57..a624430 100644
--- a/Mkfiles/Makefile.lcc
+++ b/Mkfiles/Makefile.lcc
@@ -115,48 +115,45 @@ assemble.${OBJ}: assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.${OBJ}: disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.${OBJ}: eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.${OBJ}: float.c nasm.h regs.h insnsi.h version.h
+eval.${OBJ}: eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.${OBJ}: float.c nasm.h regs.h version.h
 insnsa.${OBJ}: insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.${OBJ}: insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.${OBJ}: insnsn.c
-labels.${OBJ}: labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.${OBJ}: listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.${OBJ}: labels.c nasm.h regs.h nasmlib.h version.h
+listing.${OBJ}: listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.${OBJ}: macros.c
 names.${OBJ}: names.c regs.c insnsn.c
 nasm.${OBJ}: nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.${OBJ}: nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.${OBJ}: nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.${OBJ}: ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.${OBJ}: outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.${OBJ}: output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.${OBJ}: output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.${OBJ}: output/outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outcoff.${OBJ}: output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.${OBJ}: output/outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outelf.${OBJ}: output/outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outieee.${OBJ}: output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.${OBJ}: output/outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf.${OBJ}: output/outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf2.${OBJ}: output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.${OBJ}: parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.${OBJ}: preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.${OBJ}: outform.c outform.h nasm.h regs.h version.h
+output/outaout.${OBJ}: output/outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outas86.${OBJ}: output/outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outbin.${OBJ}: output/outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outcoff.${OBJ}: output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outdbg.${OBJ}: output/outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outelf.${OBJ}: output/outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outieee.${OBJ}: output/outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outobj.${OBJ}: output/outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf.${OBJ}: output/outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf2.${OBJ}: output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.${OBJ}: parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.${OBJ}: preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.${OBJ}: regdis.c
 regflags.${OBJ}: regflags.c
 regs.${OBJ}: regs.c
diff --git a/Mkfiles/Makefile.ms7 b/Mkfiles/Makefile.ms7
index 73605f0..ed9733e 100644
--- a/Mkfiles/Makefile.ms7
+++ b/Mkfiles/Makefile.ms7
@@ -160,48 +160,45 @@ assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+eval.$(OBJ): eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.$(OBJ): float.c nasm.h regs.h version.h
 insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.$(OBJ): insnsn.c
-labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.$(OBJ): labels.c nasm.h regs.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output\outaout.$(OBJ): output\outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\outas86.$(OBJ): output\outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\outbin.$(OBJ): output\outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\outcoff.$(OBJ): output\outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\outdbg.$(OBJ): output\outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\outelf.$(OBJ): output\outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\outieee.$(OBJ): output\outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\outobj.$(OBJ): output\outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\outrdf.$(OBJ): output\outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\outrdf2.$(OBJ): output\outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.$(OBJ): outform.c outform.h nasm.h regs.h version.h
+output\outaout.$(OBJ): output\outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\outas86.$(OBJ): output\outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\outbin.$(OBJ): output\outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\outcoff.$(OBJ): output\outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\outdbg.$(OBJ): output\outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\outelf.$(OBJ): output\outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\outieee.$(OBJ): output\outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\outobj.$(OBJ): output\outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\outrdf.$(OBJ): output\outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\outrdf2.$(OBJ): output\outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.$(OBJ): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.os2 b/Mkfiles/Makefile.os2
index cccf6a2..880e130 100644
--- a/Mkfiles/Makefile.os2
+++ b/Mkfiles/Makefile.os2
@@ -110,48 +110,45 @@ assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+eval.$(OBJ): eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.$(OBJ): float.c nasm.h regs.h version.h
 insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.$(OBJ): insnsn.c
-labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.$(OBJ): labels.c nasm.h regs.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output\\outaout.$(OBJ): output\\outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outas86.$(OBJ): output\\outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outbin.$(OBJ): output\\outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outcoff.$(OBJ): output\\outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outdbg.$(OBJ): output\\outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outelf.$(OBJ): output\\outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outieee.$(OBJ): output\\outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outobj.$(OBJ): output\\outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outrdf.$(OBJ): output\\outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output\\outrdf2.$(OBJ): output\\outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.$(OBJ): outform.c outform.h nasm.h regs.h version.h
+output\\outaout.$(OBJ): output\\outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outas86.$(OBJ): output\\outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outbin.$(OBJ): output\\outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outcoff.$(OBJ): output\\outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outdbg.$(OBJ): output\\outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outelf.$(OBJ): output\\outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outieee.$(OBJ): output\\outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outobj.$(OBJ): output\\outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outrdf.$(OBJ): output\\outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output\\outrdf2.$(OBJ): output\\outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.$(OBJ): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.sc b/Mkfiles/Makefile.sc
index 25a1048..34a93dc 100644
--- a/Mkfiles/Makefile.sc
+++ b/Mkfiles/Makefile.sc
@@ -92,48 +92,45 @@ assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+eval.$(OBJ): eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.$(OBJ): float.c nasm.h regs.h version.h
 insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.$(OBJ): insnsn.c
-labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.$(OBJ): labels.c nasm.h regs.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.$(OBJ): outform.c outform.h nasm.h regs.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.$(OBJ): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.scw b/Mkfiles/Makefile.scw
index a372b61..9d40b19 100644
--- a/Mkfiles/Makefile.scw
+++ b/Mkfiles/Makefile.scw
@@ -89,48 +89,45 @@ assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+eval.$(OBJ): eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.$(OBJ): float.c nasm.h regs.h version.h
 insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.$(OBJ): insnsn.c
-labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.$(OBJ): labels.c nasm.h regs.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.$(OBJ): outform.c outform.h nasm.h regs.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.$(OBJ): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.unx b/Mkfiles/Makefile.unx
index 1c66d00..c760ae8 100644
--- a/Mkfiles/Makefile.unx
+++ b/Mkfiles/Makefile.unx
@@ -117,45 +117,40 @@ assemble.o: assemble.c insns.h assemble.h regvals.c nasm.h regs.h insnsi.h \
  nasmlib.h version.h
 disasm.o: disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.o: eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-float.o: float.c nasm.h regs.h insnsi.h version.h
+eval.o: eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.o: float.c nasm.h regs.h version.h
 insnsa.o: insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.o: insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.o: insnsn.c
-labels.o: labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.o: listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h version.h
+labels.o: labels.c nasm.h regs.h nasmlib.h version.h
+listing.o: listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
 nasm.o: nasm.c listing.h preproc.h insns.h outform.h assemble.h parser.h \
  nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.o: nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+nasmlib.o: nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
  nasmlib.h version.h
 ndisasm.o: ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.o: outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.o: output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.o: output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.o: output/outbin.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+outform.o: outform.c outform.h nasm.h regs.h version.h
+output/outaout.o: output/outaout.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outcoff.o: output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.o: output/outdbg.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outas86.o: output/outas86.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outelf.o: output/outelf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outbin.o: output/outbin.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outcoff.o: output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outieee.o: output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.o: output/outobj.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outdbg.o: output/outdbg.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outelf.o: output/outelf.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outieee.o: output/outieee.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outrdf.o: output/outrdf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+output/outobj.o: output/outobj.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outrdf.o: output/outrdf.c outform.h nasm.h regs.h nasmlib.h version.h
+output/outrdf2.o: output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
-output/outrdf2.o: output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.o: parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.o: preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h version.h
+parser.o: parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.o: preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
diff --git a/Mkfiles/Makefile.vc b/Mkfiles/Makefile.vc
index b6317a5..37f3a0f 100644
--- a/Mkfiles/Makefile.vc
+++ b/Mkfiles/Makefile.vc
@@ -104,48 +104,45 @@ assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+eval.$(OBJ): eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.$(OBJ): float.c nasm.h regs.h version.h
 insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.$(OBJ): insnsn.c
-labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.$(OBJ): labels.c nasm.h regs.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.$(OBJ): outform.c outform.h nasm.h regs.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.$(OBJ): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.wc b/Mkfiles/Makefile.wc
index 87fe397..9f77d8f 100644
--- a/Mkfiles/Makefile.wc
+++ b/Mkfiles/Makefile.wc
@@ -105,48 +105,45 @@ assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+eval.$(OBJ): eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.$(OBJ): float.c nasm.h regs.h version.h
 insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.$(OBJ): insnsn.c
-labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.$(OBJ): labels.c nasm.h regs.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.$(OBJ): outform.c outform.h nasm.h regs.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.$(OBJ): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.wcw b/Mkfiles/Makefile.wcw
index 4bc1cdd..0ff5a59 100644
--- a/Mkfiles/Makefile.wcw
+++ b/Mkfiles/Makefile.wcw
@@ -105,48 +105,45 @@ assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
  insnsi.h nasmlib.h version.h
 disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
  insnsn.c insnsi.h version.h regdis.c
-eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
- eval.h
-float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+eval.$(OBJ): eval.c nasm.h regs.h labels.h nasmlib.h version.h eval.h
+float.$(OBJ): float.c nasm.h regs.h version.h
 insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
 insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
 insnsn.$(OBJ): insnsn.c
-labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
-listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
- version.h
+labels.$(OBJ): labels.c nasm.h regs.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h nasmlib.h version.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
  parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
-nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
- nasmlib.h version.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.c names.c nasm.h regs.h insnsn.c \
+ insnsi.h nasmlib.h version.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
  nasmlib.h version.h
-outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
-output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
- nasmlib.h version.h
-parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
- nasmlib.h version.h
-preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+outform.$(OBJ): outform.c outform.h nasm.h regs.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h nasmlib.h \
+ version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h nasmlib.h \
  version.h
+parser.$(OBJ): parser.c insns.h parser.h nasm.h regs.h insnsi.h regflags.c \
+ float.h nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h nasmlib.h version.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/insns.h b/insns.h
index 162e5ff..3fb2d84 100644
--- a/insns.h
+++ b/insns.h
@@ -10,6 +10,15 @@
 #ifndef NASM_INSNS_H
 #define NASM_INSNS_H
 
+#include "insnsi.h"		       /* instruction opcode enum */
+
+/* max length of any instruction, register name etc. */
+#if MAX_INSLEN > 9		/* MAX_INSLEN defined in insnsi.h */
+#define MAX_KEYWORD MAX_INSLEN
+#else
+#define MAX_KEYWORD 9
+#endif
+
 struct itemplate {
     int opcode;			       /* the token, passed from "parser.c" */
     int operands;		       /* number of operands */
diff --git a/insns.pl b/insns.pl
index 0d95f28..5adcc75 100644
--- a/insns.pl
+++ b/insns.pl
@@ -69,7 +69,6 @@ if ( !defined($output) || $output eq 'a' ) {
     
     print A "/* This file auto-generated from insns.dat by insns.pl" .
         " - don't edit it */\n\n";
-    print A "#include <stdio.h>\n";
     print A "#include \"nasm.h\"\n";
     print A "#include \"insns.h\"\n";
     print A "\n";
@@ -98,7 +97,6 @@ if ( !defined($output) || $output eq 'd' ) {
     
     print D "/* This file auto-generated from insns.dat by insns.pl" .
         " - don't edit it */\n\n";
-    print D "#include <stdio.h>\n";
     print D "#include \"nasm.h\"\n";
     print D "#include \"insns.h\"\n";
     print D "\n";
diff --git a/nasm.h b/nasm.h
index 4db1c29..8f4f293 100644
--- a/nasm.h
+++ b/nasm.h
@@ -11,6 +11,7 @@
 #ifndef NASM_NASM_H
 #define NASM_NASM_H
 
+#include <stdio.h>
 #include "version.h"		       /* generated NASM version macros */
 
 #ifndef NULL
@@ -432,16 +433,6 @@ enum {
 /* Register names automatically generated from regs.dat */
 #include "regs.h"
 
-/* Instruction names automatically generated from insns.dat */
-#include "insnsi.h"
-
-/* max length of any instruction, register name etc. */
-#if MAX_INSLEN > 9
-#define MAX_KEYWORD MAX_INSLEN
-#else
-#define MAX_KEYWORD 9
-#endif
-
 enum {				       /* condition code names */
     C_A, C_AE, C_B, C_BE, C_C, C_E, C_G, C_GE, C_L, C_LE, C_NA, C_NAE,
     C_NB, C_NBE, C_NC, C_NE, C_NG, C_NGE, C_NL, C_NLE, C_NO, C_NP,
diff --git a/nasmlib.c b/nasmlib.c
index a2c7d4f..b1bc430 100644
--- a/nasmlib.c
+++ b/nasmlib.c
@@ -13,6 +13,7 @@
 
 #include "nasm.h"
 #include "nasmlib.h"
+#include "insns.h"		/* For MAX_KEYWORD */
 
 static efunc nasm_malloc_error;
 
diff --git a/parser.c b/parser.c
index 2fe7bfb..b2a0340 100644
--- a/parser.c
+++ b/parser.c
@@ -15,6 +15,7 @@
 #include <ctype.h>
 
 #include "nasm.h"
+#include "insns.h"
 #include "nasmlib.h"
 #include "parser.h"
 #include "float.h"
diff --git a/test/absolute.asm b/test/absolute.asm
new file mode 100644
index 0000000..901a83f
--- /dev/null
+++ b/test/absolute.asm
@@ -0,0 +1,39 @@
+	org 7c00h
+init_foo:
+	jmp init_bar
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	
+init_bar:
+	mov [b1],dl
+	mov [b2],edx
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	ret
+		
+	absolute init_bar+7
+b1:	resb 1
+b2:	resd 6
+