asm/*: Move directive processing to its own file, refactor error handling

Move directive processing to its own file, and move nasmlib/error.c to
asm/error.c (it was not used by the disassembler); remove some extern
declarations from .c files, and do some general code cleanups.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

4 files changed, 441 insertions, 382 deletions

diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index b7555ba8..3c33c972 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -60,7 +60,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	stdlib/strnlen.$(O) \
 	nasmlib/ver.$(O) \
 	nasmlib/crc64.$(O) nasmlib/malloc.$(O) \
-	nasmlib/error.$(O) nasmlib/md5c.$(O) nasmlib/string.$(O) \
+	nasmlib/md5c.$(O) nasmlib/string.$(O) \
 	nasmlib/file.$(O) nasmlib/mmap.$(O) nasmlib/ilog2.$(O) \
 	nasmlib/realpath.$(O) nasmlib/filename.$(O) nasmlib/srcfile.$(O) \
 	nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) \
@@ -72,8 +72,9 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) \
 	x86/disp8.$(O) x86/iflag.$(O) \
 	\
+	asm/error.$(O) \
 	asm/float.$(O) \
-	asm/directbl.$(O) \
+	asm/directiv.$(O) asm/directbl.$(O) \
 	asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \
 	asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) \
 	asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) asm/exprdump.$(O) \
@@ -272,18 +273,27 @@ everything: all doc rdf
 asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h \
  asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/disp8.h \
- include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/error.h include/iflag.h include/insns.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/directbl.$(O): asm/directbl.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
  include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h \
  include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
  x86/regs.h
-asm/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h \
- asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/labels.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+asm/directiv.$(O): asm/directiv.c asm/assemble.h asm/directiv.h asm/eval.h \
+ asm/float.h asm/listing.h asm/pptok.h asm/preproc.h asm/stdscan.h \
+ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
+ include/error.h include/iflag.h include/labels.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h output/outform.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+asm/error.$(O): asm/error.c config/msvc.h config/unknown.h config/watcom.h \
+ include/compiler.h include/error.h include/nasmint.h include/nasmlib.h
+asm/eval.$(O): asm/eval.c asm/assemble.h asm/directiv.h asm/eval.h \
+ asm/float.h asm/pptok.h asm/preproc.h config/msvc.h config/unknown.h \
+ config/watcom.h include/compiler.h include/error.h include/iflag.h \
+ include/labels.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/opflags.h include/strlist.h include/tables.h x86/iflaggen.h \
  x86/insnsi.h x86/regs.h
 asm/exprdump.$(O): asm/exprdump.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
@@ -295,46 +305,47 @@ asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
  include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
 asm/float.$(O): asm/float.c asm/directiv.h asm/float.h asm/pptok.h \
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
- x86/regs.h
-asm/labels.$(O): asm/labels.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
- include/hashtbl.h include/labels.h include/nasm.h include/nasmint.h \
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
  include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
  x86/insnsi.h x86/regs.h
+asm/labels.$(O): asm/labels.c asm/directiv.h asm/pptok.h asm/preproc.h \
+ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
+ include/error.h include/hashtbl.h include/labels.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h x86/insnsi.h x86/regs.h
 asm/listing.$(O): asm/listing.c asm/directiv.h asm/listing.h asm/pptok.h \
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directiv.h asm/eval.h \
  asm/float.h asm/listing.h asm/parser.h asm/pptok.h asm/preproc.h \
  asm/stdscan.h asm/tokens.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/iflag.h include/insns.h include/labels.h \
+ include/compiler.h include/error.h include/iflag.h include/insns.h \
+ include/labels.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/opflags.h include/raa.h include/saa.h include/strlist.h \
+ include/tables.h include/ver.h output/outform.h x86/iflaggen.h x86/insnsi.h \
+ x86/regs.h
+asm/parser.$(O): asm/parser.c asm/assemble.h asm/directiv.h asm/eval.h \
+ asm/float.h asm/parser.h asm/pptok.h asm/preproc.h asm/stdscan.h \
+ asm/tokens.h config/msvc.h config/unknown.h config/watcom.h \
+ include/compiler.h include/error.h include/iflag.h include/insns.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/raa.h include/saa.h include/strlist.h include/tables.h \
- include/ver.h output/outform.h x86/iflaggen.h x86/insnsi.h x86/regs.h
-asm/parser.$(O): asm/parser.c asm/directiv.h asm/eval.h asm/float.h \
- asm/parser.h asm/pptok.h asm/preproc.h asm/stdscan.h asm/tokens.h \
- config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
- include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/hashtbl.h \
  include/nasmint.h include/nasmlib.h
 asm/preproc-nop.$(O): asm/preproc-nop.c asm/directiv.h asm/listing.h \
  asm/pptok.h asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h \
  asm/pptok.h asm/preproc.h asm/quote.h asm/stdscan.h asm/tokens.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
- include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/error.h include/hashtbl.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/quote.$(O): asm/quote.c asm/quote.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 asm/rdstrnum.$(O): asm/rdstrnum.c asm/directiv.h asm/pptok.h asm/preproc.h \
@@ -348,9 +359,10 @@ asm/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h \
  include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/stdscan.$(O): asm/stdscan.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/quote.h asm/stdscan.h asm/tokens.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/iflag.h include/insns.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/iflag.h \
+ include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/opflags.h include/strlist.h include/tables.h x86/iflaggen.h \
+ x86/insnsi.h x86/regs.h
 asm/strfunc.$(O): asm/strfunc.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
@@ -373,10 +385,10 @@ disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h \
  x86/insnsi.h x86/regdis.h x86/regs.h
 disasm/ndisasm.$(O): disasm/ndisasm.c asm/directiv.h asm/pptok.h \
  asm/preproc.h asm/tokens.h config/msvc.h config/unknown.h config/watcom.h \
- disasm/disasm.h disasm/sync.h include/compiler.h include/iflag.h \
- include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h include/ver.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.h
+ disasm/disasm.h disasm/sync.h include/compiler.h include/error.h \
+ include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ include/ver.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 disasm/sync.$(O): disasm/sync.c config/msvc.h config/unknown.h \
  config/watcom.h disasm/sync.h include/compiler.h include/nasmint.h \
  include/nasmlib.h
@@ -390,13 +402,12 @@ nasmlib/bsi.$(O): nasmlib/bsi.c config/msvc.h config/unknown.h \
 nasmlib/crc64.$(O): nasmlib/crc64.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/hashtbl.h include/nasmint.h \
  include/nasmlib.h
-nasmlib/error.$(O): nasmlib/error.c config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/file.$(O): nasmlib/file.c config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h \
- nasmlib/file.h
+ config/watcom.h include/compiler.h include/error.h include/nasmint.h \
+ include/nasmlib.h nasmlib/file.h
 nasmlib/filename.$(O): nasmlib/filename.c config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/error.h include/nasmint.h \
+ include/nasmlib.h
 nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \
@@ -405,12 +416,13 @@ nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h \
 nasmlib/ilog2.$(O): nasmlib/ilog2.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/malloc.$(O): nasmlib/malloc.c config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/error.h include/nasmint.h \
+ include/nasmlib.h
 nasmlib/md5c.$(O): nasmlib/md5c.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/md5.h include/nasmint.h
 nasmlib/mmap.$(O): nasmlib/mmap.c config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h \
- nasmlib/file.h
+ config/watcom.h include/compiler.h include/error.h include/nasmint.h \
+ include/nasmlib.h nasmlib/file.h
 nasmlib/raa.$(O): nasmlib/raa.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h \
  include/raa.h
@@ -418,9 +430,9 @@ nasmlib/rbtree.$(O): nasmlib/rbtree.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/rbtree.h
 nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 nasmlib/realpath.$(O): nasmlib/realpath.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/saa.$(O): nasmlib/saa.c config/msvc.h config/unknown.h \
@@ -439,57 +451,61 @@ nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/hashtbl.h include/md5.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/saa.h \
- include/strlist.h include/tables.h output/outlib.h output/pecoff.h \
- version.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/hashtbl.h include/md5.h \
+ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/saa.h include/strlist.h include/tables.h output/outlib.h \
+ output/pecoff.h version.h x86/insnsi.h x86/regs.h
 output/legacy.$(O): output/legacy.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/strlist.h include/tables.h output/outlib.h x86/insnsi.h x86/regs.h
-output/nulldbg.$(O): output/nulldbg.c asm/directiv.h asm/pptok.h \
- asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/error.h include/nasm.h include/nasmint.h include/nasmlib.h \
  include/opflags.h include/strlist.h include/tables.h output/outlib.h \
  x86/insnsi.h x86/regs.h
+output/nulldbg.$(O): output/nulldbg.c asm/directiv.h asm/pptok.h \
+ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outaout.$(O): output/outaout.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/raa.h include/saa.h include/strlist.h \
- include/tables.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/raa.h include/saa.h \
+ include/strlist.h include/tables.h output/outform.h output/outlib.h \
+ x86/insnsi.h x86/regs.h
 output/outas86.$(O): output/outas86.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/raa.h include/saa.h include/strlist.h \
- include/tables.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/raa.h include/saa.h \
+ include/strlist.h include/tables.h output/outform.h output/outlib.h \
+ x86/insnsi.h x86/regs.h
 output/outbin.$(O): output/outbin.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/labels.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/saa.h include/strlist.h \
- include/tables.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/labels.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/saa.h \
+ include/strlist.h include/tables.h output/outform.h output/outlib.h \
+ x86/insnsi.h x86/regs.h
 output/outcoff.$(O): output/outcoff.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/raa.h include/saa.h include/strlist.h \
- include/tables.h output/outform.h output/outlib.h output/pecoff.h \
- x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/raa.h include/saa.h \
+ include/strlist.h include/tables.h output/outform.h output/outlib.h \
+ output/pecoff.h x86/insnsi.h x86/regs.h
 output/outdbg.$(O): output/outdbg.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/strlist.h include/tables.h output/outform.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ include/error.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/opflags.h include/strlist.h include/tables.h output/outform.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outelf.$(O): output/outelf.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/raa.h include/rbtree.h include/saa.h \
- include/strlist.h include/tables.h include/ver.h output/dwarf.h \
- output/elf.h output/outelf.h output/outform.h output/outlib.h \
- output/stabs.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/raa.h include/rbtree.h \
+ include/saa.h include/strlist.h include/tables.h include/ver.h \
+ output/dwarf.h output/elf.h output/outelf.h output/outform.h \
+ output/outlib.h output/stabs.h x86/insnsi.h x86/regs.h
 output/outform.$(O): output/outform.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
@@ -497,29 +513,31 @@ output/outform.$(O): output/outform.c asm/directiv.h asm/pptok.h \
  x86/insnsi.h x86/regs.h
 output/outieee.$(O): output/outieee.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h include/ver.h \
- output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ include/ver.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outlib.$(O): output/outlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/strlist.h include/tables.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/error.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/opflags.h include/strlist.h include/tables.h output/outlib.h \
+ x86/insnsi.h x86/regs.h
 output/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/raa.h include/rbtree.h include/saa.h \
- include/strlist.h include/tables.h output/outform.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/raa.h include/rbtree.h \
+ include/saa.h include/strlist.h include/tables.h output/outform.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outobj.$(O): output/outobj.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h include/ver.h \
- output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ include/ver.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outrdf2.$(O): output/outrdf2.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/rdoff.h include/saa.h include/strlist.h \
- include/tables.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/rdoff.h include/saa.h \
+ include/strlist.h include/tables.h output/outform.h output/outlib.h \
+ x86/insnsi.h x86/regs.h
 stdlib/snprintf.$(O): stdlib/snprintf.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 stdlib/strlcpy.$(O): stdlib/strlcpy.c config/msvc.h config/unknown.h \
@@ -527,7 +545,8 @@ stdlib/strlcpy.$(O): stdlib/strlcpy.c config/msvc.h config/unknown.h \
 stdlib/strnlen.$(O): stdlib/strnlen.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h
 stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/error.h include/nasmint.h \
+ include/nasmlib.h
 x86/disp8.$(O): x86/disp8.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
  include/disp8.h include/nasm.h include/nasmint.h include/nasmlib.h \
diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak
index 1581a435..5ede0a65 100644
--- a/Mkfiles/netware.mak
+++ b/Mkfiles/netware.mak
@@ -37,7 +37,7 @@ LIBOBJ = snprintf.o vsnprintf.o strlcpy.o \
 	strnlen.o \
 	ver.o \
 	crc64.o malloc.o \
-	error.o md5c.o string.o \
+	md5c.o string.o \
 	file.o mmap.o ilog2.o \
 	realpath.o filename.o srcfile.o \
 	zerobuf.o readnum.o bsi.o \
@@ -49,8 +49,9 @@ LIBOBJ = snprintf.o vsnprintf.o strlcpy.o \
 	regs.o regvals.o regflags.o regdis.o \
 	disp8.o iflag.o \
 	\
+	error.o \
 	float.o \
-	directbl.o \
+	directiv.o directbl.o \
 	assemble.o labels.o parser.o \
 	preproc.o quote.o pptok.o \
 	listing.o eval.o exprlib.o exprdump.o \
@@ -152,15 +153,22 @@ $(OBJDIR)/version.mak: $(PROOT)/version $(PROOT)/version.pl $(OBJDIR)
 # @continuation: "\"
 #-- Everything below is generated by mkdep.pl - do not edit --#
 assemble.o: assemble.c assemble.h directiv.h listing.h pptok.h preproc.h \
- tokens.h config.h msvc.h unknown.h watcom.h compiler.h disp8.h iflag.h \
- insns.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h \
- insnsi.h regs.h
+ tokens.h config.h msvc.h unknown.h watcom.h compiler.h disp8.h error.h \
+ iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
+ iflaggen.h insnsi.h regs.h
 directbl.o: directbl.c directiv.h pptok.h preproc.h config.h msvc.h \
  unknown.h watcom.h compiler.h hashtbl.h nasm.h nasmint.h nasmlib.h \
  opflags.h strlist.h tables.h insnsi.h regs.h
-eval.o: eval.c directiv.h eval.h float.h pptok.h preproc.h config.h msvc.h \
- unknown.h watcom.h compiler.h labels.h nasm.h nasmint.h nasmlib.h opflags.h \
- strlist.h tables.h insnsi.h regs.h
+directiv.o: directiv.c assemble.h directiv.h eval.h float.h listing.h \
+ pptok.h preproc.h stdscan.h config.h msvc.h unknown.h watcom.h compiler.h \
+ error.h iflag.h labels.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ tables.h outform.h iflaggen.h insnsi.h regs.h
+error.o: error.c config.h msvc.h unknown.h watcom.h compiler.h error.h \
+ nasmint.h nasmlib.h
+eval.o: eval.c assemble.h directiv.h eval.h float.h pptok.h preproc.h \
+ config.h msvc.h unknown.h watcom.h compiler.h error.h iflag.h labels.h \
+ nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.h \
+ regs.h
 exprdump.o: exprdump.c directiv.h pptok.h preproc.h config.h msvc.h \
  unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
  strlist.h tables.h insnsi.h regs.h
@@ -168,30 +176,32 @@ exprlib.o: exprlib.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
  watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
  insnsi.h regs.h
 float.o: float.c directiv.h float.h pptok.h preproc.h config.h msvc.h \
- unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
+ unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h \
  strlist.h tables.h insnsi.h regs.h
 labels.o: labels.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h hashtbl.h labels.h nasm.h nasmint.h nasmlib.h opflags.h \
- strlist.h tables.h insnsi.h regs.h
+ watcom.h compiler.h error.h hashtbl.h labels.h nasm.h nasmint.h nasmlib.h \
+ opflags.h strlist.h tables.h insnsi.h regs.h
 listing.o: listing.c directiv.h listing.h pptok.h preproc.h config.h msvc.h \
- unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
+ unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h \
  strlist.h tables.h insnsi.h regs.h
 nasm.o: nasm.c assemble.h directiv.h eval.h float.h listing.h parser.h \
  pptok.h preproc.h stdscan.h tokens.h config.h msvc.h unknown.h watcom.h \
- compiler.h iflag.h insns.h labels.h nasm.h nasmint.h nasmlib.h opflags.h \
- raa.h saa.h strlist.h tables.h ver.h outform.h iflaggen.h insnsi.h regs.h
-parser.o: parser.c directiv.h eval.h float.h parser.h pptok.h preproc.h \
- stdscan.h tokens.h config.h msvc.h unknown.h watcom.h compiler.h iflag.h \
- insns.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h \
+ compiler.h error.h iflag.h insns.h labels.h nasm.h nasmint.h nasmlib.h \
+ opflags.h raa.h saa.h strlist.h tables.h ver.h outform.h iflaggen.h \
  insnsi.h regs.h
+parser.o: parser.c assemble.h directiv.h eval.h float.h parser.h pptok.h \
+ preproc.h stdscan.h tokens.h config.h msvc.h unknown.h watcom.h compiler.h \
+ error.h iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ tables.h iflaggen.h insnsi.h regs.h
 pptok.o: pptok.c pptok.h preproc.h config.h msvc.h unknown.h watcom.h \
  compiler.h hashtbl.h nasmint.h nasmlib.h
 preproc-nop.o: preproc-nop.c directiv.h listing.h pptok.h preproc.h config.h \
- msvc.h unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- strlist.h tables.h insnsi.h regs.h
+ msvc.h unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h \
+ opflags.h strlist.h tables.h insnsi.h regs.h
 preproc.o: preproc.c directiv.h eval.h listing.h pptok.h preproc.h quote.h \
- stdscan.h tokens.h config.h msvc.h unknown.h watcom.h compiler.h hashtbl.h \
- nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h regs.h
+ stdscan.h tokens.h config.h msvc.h unknown.h watcom.h compiler.h error.h \
+ hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h \
+ regs.h
 quote.o: quote.c quote.h config.h msvc.h unknown.h watcom.h compiler.h \
  nasmint.h nasmlib.h
 rdstrnum.o: rdstrnum.c directiv.h pptok.h preproc.h config.h msvc.h \
@@ -201,8 +211,9 @@ segalloc.o: segalloc.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
  unknown.h watcom.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h \
  opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
 stdscan.o: stdscan.c directiv.h pptok.h preproc.h quote.h stdscan.h tokens.h \
- config.h msvc.h unknown.h watcom.h compiler.h iflag.h insns.h nasm.h \
- nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
+ config.h msvc.h unknown.h watcom.h compiler.h error.h iflag.h insns.h \
+ nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.h \
+ regs.h
 strfunc.o: strfunc.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
  watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
  insnsi.h regs.h
@@ -218,9 +229,9 @@ disasm.o: disasm.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
  nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.h \
  regdis.h regs.h
 ndisasm.o: ndisasm.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
- unknown.h watcom.h disasm.h sync.h compiler.h iflag.h insns.h nasm.h \
- nasmint.h nasmlib.h opflags.h strlist.h tables.h ver.h iflaggen.h insnsi.h \
- regs.h
+ unknown.h watcom.h disasm.h sync.h compiler.h error.h iflag.h insns.h \
+ nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h ver.h iflaggen.h \
+ insnsi.h regs.h
 sync.o: sync.c config.h msvc.h unknown.h watcom.h sync.h compiler.h \
  nasmint.h nasmlib.h
 macros.o: macros.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
@@ -230,29 +241,27 @@ bsi.o: bsi.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  nasmlib.h
 crc64.o: crc64.c config.h msvc.h unknown.h watcom.h compiler.h hashtbl.h \
  nasmint.h nasmlib.h
-error.o: error.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
- nasmlib.h
-file.o: file.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
- nasmlib.h file.h
-filename.o: filename.c config.h msvc.h unknown.h watcom.h compiler.h \
+file.o: file.c config.h msvc.h unknown.h watcom.h compiler.h error.h \
+ nasmint.h nasmlib.h file.h
+filename.o: filename.c config.h msvc.h unknown.h watcom.h compiler.h error.h \
  nasmint.h nasmlib.h
 hashtbl.o: hashtbl.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
  watcom.h compiler.h hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h \
  strlist.h tables.h insnsi.h regs.h
 ilog2.o: ilog2.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  nasmlib.h
-malloc.o: malloc.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
- nasmlib.h
+malloc.o: malloc.c config.h msvc.h unknown.h watcom.h compiler.h error.h \
+ nasmint.h nasmlib.h
 md5c.o: md5c.c config.h msvc.h unknown.h watcom.h compiler.h md5.h nasmint.h
-mmap.o: mmap.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
- nasmlib.h file.h
+mmap.o: mmap.c config.h msvc.h unknown.h watcom.h compiler.h error.h \
+ nasmint.h nasmlib.h file.h
 raa.o: raa.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  nasmlib.h raa.h
 rbtree.o: rbtree.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  rbtree.h
 readnum.o: readnum.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ tables.h insnsi.h regs.h
 realpath.o: realpath.c config.h msvc.h unknown.h watcom.h compiler.h \
  nasmint.h nasmlib.h
 saa.o: saa.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
@@ -267,61 +276,62 @@ ver.o: ver.c ver.h version.h
 zerobuf.o: zerobuf.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  nasmlib.h
 codeview.o: codeview.c directiv.h pptok.h preproc.h config.h msvc.h \
- unknown.h watcom.h compiler.h hashtbl.h md5.h nasm.h nasmint.h nasmlib.h \
- opflags.h saa.h strlist.h tables.h outlib.h pecoff.h version.h insnsi.h \
- regs.h
+ unknown.h watcom.h compiler.h error.h hashtbl.h md5.h nasm.h nasmint.h \
+ nasmlib.h opflags.h saa.h strlist.h tables.h outlib.h pecoff.h version.h \
+ insnsi.h regs.h
 legacy.o: legacy.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ tables.h outlib.h insnsi.h regs.h
 nulldbg.o: nulldbg.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ tables.h outlib.h insnsi.h regs.h
 nullout.o: nullout.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ tables.h outlib.h insnsi.h regs.h
 outaout.o: outaout.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \
- msvc.h unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- raa.h saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
+ msvc.h unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h \
+ opflags.h raa.h saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
 outas86.o: outas86.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h saa.h \
- strlist.h tables.h outform.h outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h raa.h \
+ saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
 outbin.o: outbin.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \
- msvc.h unknown.h watcom.h compiler.h labels.h nasm.h nasmint.h nasmlib.h \
- opflags.h saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
+ msvc.h unknown.h watcom.h compiler.h error.h labels.h nasm.h nasmint.h \
+ nasmlib.h opflags.h saa.h strlist.h tables.h outform.h outlib.h insnsi.h \
+ regs.h
 outcoff.o: outcoff.c directiv.h eval.h pptok.h preproc.h config.h msvc.h \
- unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h \
- saa.h strlist.h tables.h outform.h outlib.h pecoff.h insnsi.h regs.h
+ unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h \
+ raa.h saa.h strlist.h tables.h outform.h outlib.h pecoff.h insnsi.h regs.h
 outdbg.o: outdbg.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- outform.h outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ tables.h outform.h outlib.h insnsi.h regs.h
 outelf.o: outelf.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \
- msvc.h unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- raa.h rbtree.h saa.h strlist.h tables.h ver.h dwarf.h elf.h outelf.h \
- outform.h outlib.h stabs.h insnsi.h regs.h
+ msvc.h unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h \
+ opflags.h raa.h rbtree.h saa.h strlist.h tables.h ver.h dwarf.h elf.h \
+ outelf.h outform.h outlib.h stabs.h insnsi.h regs.h
 outform.o: outform.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
  watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
  outform.h insnsi.h regs.h
 outieee.o: outieee.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- ver.h outform.h outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ tables.h ver.h outform.h outlib.h insnsi.h regs.h
 outlib.o: outlib.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ tables.h outlib.h insnsi.h regs.h
 outmacho.o: outmacho.c directiv.h pptok.h preproc.h config.h msvc.h \
- unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h \
- rbtree.h saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
+ unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h \
+ raa.h rbtree.h saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
 outobj.o: outobj.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \
- msvc.h unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- strlist.h tables.h ver.h outform.h outlib.h insnsi.h regs.h
+ msvc.h unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h \
+ opflags.h strlist.h tables.h ver.h outform.h outlib.h insnsi.h regs.h
 outrdf2.o: outrdf2.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h rdoff.h saa.h \
- strlist.h tables.h outform.h outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h rdoff.h \
+ saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
 snprintf.o: snprintf.c config.h msvc.h unknown.h watcom.h compiler.h \
  nasmint.h nasmlib.h
 strlcpy.o: strlcpy.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h
 strnlen.o: strnlen.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h
 vsnprintf.o: vsnprintf.c config.h msvc.h unknown.h watcom.h compiler.h \
- nasmint.h nasmlib.h
+ error.h nasmint.h nasmlib.h
 disp8.o: disp8.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
  watcom.h compiler.h disp8.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
  tables.h insnsi.h regs.h
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index a4ee2238..ae550181 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -53,7 +53,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) &
 	stdlib/strnlen.$(O) &
 	nasmlib/ver.$(O) &
 	nasmlib/crc64.$(O) nasmlib/malloc.$(O) &
-	nasmlib/error.$(O) nasmlib/md5c.$(O) nasmlib/string.$(O) &
+	nasmlib/md5c.$(O) nasmlib/string.$(O) &
 	nasmlib/file.$(O) nasmlib/mmap.$(O) nasmlib/ilog2.$(O) &
 	nasmlib/realpath.$(O) nasmlib/filename.$(O) nasmlib/srcfile.$(O) &
 	nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) &
@@ -65,8 +65,9 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) &
 	x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) &
 	x86/disp8.$(O) x86/iflag.$(O) &
 	&
+	asm/error.$(O) &
 	asm/float.$(O) &
-	asm/directbl.$(O) &
+	asm/directiv.$(O) asm/directbl.$(O) &
 	asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) &
 	asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) &
 	asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) asm/exprdump.$(O) &
@@ -274,18 +275,27 @@ alldeps: perlreq .SYMBOLIC
 asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h &
  asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.h config/msvc.h &
  config/unknown.h config/watcom.h include/compiler.h include/disp8.h &
- include/iflag.h include/insns.h include/nasm.h include/nasmint.h &
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
- x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/error.h include/iflag.h include/insns.h include/nasm.h &
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h &
+ include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/directbl.$(O): asm/directbl.c asm/directiv.h asm/pptok.h asm/preproc.h &
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
  include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h &
  include/opflags.h include/strlist.h include/tables.h x86/insnsi.h &
  x86/regs.h
-asm/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h &
- asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/labels.h include/nasm.h include/nasmint.h &
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
+asm/directiv.$(O): asm/directiv.c asm/assemble.h asm/directiv.h asm/eval.h &
+ asm/float.h asm/listing.h asm/pptok.h asm/preproc.h asm/stdscan.h &
+ config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
+ include/error.h include/iflag.h include/labels.h include/nasm.h &
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h &
+ include/tables.h output/outform.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+asm/error.$(O): asm/error.c config/msvc.h config/unknown.h config/watcom.h &
+ include/compiler.h include/error.h include/nasmint.h include/nasmlib.h
+asm/eval.$(O): asm/eval.c asm/assemble.h asm/directiv.h asm/eval.h &
+ asm/float.h asm/pptok.h asm/preproc.h config/msvc.h config/unknown.h &
+ config/watcom.h include/compiler.h include/error.h include/iflag.h &
+ include/labels.h include/nasm.h include/nasmint.h include/nasmlib.h &
+ include/opflags.h include/strlist.h include/tables.h x86/iflaggen.h &
  x86/insnsi.h x86/regs.h
 asm/exprdump.$(O): asm/exprdump.c asm/directiv.h asm/pptok.h asm/preproc.h &
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
@@ -297,46 +307,47 @@ asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h &
  include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
 asm/float.$(O): asm/float.c asm/directiv.h asm/float.h asm/pptok.h &
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h &
- x86/regs.h
-asm/labels.$(O): asm/labels.c asm/directiv.h asm/pptok.h asm/preproc.h &
- config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
- include/hashtbl.h include/labels.h include/nasm.h include/nasmint.h &
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
  include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
  x86/insnsi.h x86/regs.h
+asm/labels.$(O): asm/labels.c asm/directiv.h asm/pptok.h asm/preproc.h &
+ config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
+ include/error.h include/hashtbl.h include/labels.h include/nasm.h &
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h &
+ include/tables.h x86/insnsi.h x86/regs.h
 asm/listing.$(O): asm/listing.c asm/directiv.h asm/listing.h asm/pptok.h &
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h &
- x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
+ x86/insnsi.h x86/regs.h
 asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directiv.h asm/eval.h &
  asm/float.h asm/listing.h asm/parser.h asm/pptok.h asm/preproc.h &
  asm/stdscan.h asm/tokens.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/iflag.h include/insns.h include/labels.h &
+ include/compiler.h include/error.h include/iflag.h include/insns.h &
+ include/labels.h include/nasm.h include/nasmint.h include/nasmlib.h &
+ include/opflags.h include/raa.h include/saa.h include/strlist.h &
+ include/tables.h include/ver.h output/outform.h x86/iflaggen.h x86/insnsi.h &
+ x86/regs.h
+asm/parser.$(O): asm/parser.c asm/assemble.h asm/directiv.h asm/eval.h &
+ asm/float.h asm/parser.h asm/pptok.h asm/preproc.h asm/stdscan.h &
+ asm/tokens.h config/msvc.h config/unknown.h config/watcom.h &
+ include/compiler.h include/error.h include/iflag.h include/insns.h &
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h &
- include/raa.h include/saa.h include/strlist.h include/tables.h &
- include/ver.h output/outform.h x86/iflaggen.h x86/insnsi.h x86/regs.h
-asm/parser.$(O): asm/parser.c asm/directiv.h asm/eval.h asm/float.h &
- asm/parser.h asm/pptok.h asm/preproc.h asm/stdscan.h asm/tokens.h &
- config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
- include/iflag.h include/insns.h include/nasm.h include/nasmint.h &
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
- x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config/msvc.h &
  config/unknown.h config/watcom.h include/compiler.h include/hashtbl.h &
  include/nasmint.h include/nasmlib.h
 asm/preproc-nop.$(O): asm/preproc-nop.c asm/directiv.h asm/listing.h &
  asm/pptok.h asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h &
- x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
+ x86/insnsi.h x86/regs.h
 asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h &
  asm/pptok.h asm/preproc.h asm/quote.h asm/stdscan.h asm/tokens.h &
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
- include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h &
- x86/regs.h
+ include/error.h include/hashtbl.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
+ x86/insnsi.h x86/regs.h
 asm/quote.$(O): asm/quote.c asm/quote.h config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 asm/rdstrnum.$(O): asm/rdstrnum.c asm/directiv.h asm/pptok.h asm/preproc.h &
@@ -350,9 +361,10 @@ asm/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h &
  include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/stdscan.$(O): asm/stdscan.c asm/directiv.h asm/pptok.h asm/preproc.h &
  asm/quote.h asm/stdscan.h asm/tokens.h config/msvc.h config/unknown.h &
- config/watcom.h include/compiler.h include/iflag.h include/insns.h &
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h &
- include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/iflag.h &
+ include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h &
+ include/opflags.h include/strlist.h include/tables.h x86/iflaggen.h &
+ x86/insnsi.h x86/regs.h
 asm/strfunc.$(O): asm/strfunc.c asm/directiv.h asm/pptok.h asm/preproc.h &
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h &
@@ -375,10 +387,10 @@ disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h &
  x86/insnsi.h x86/regdis.h x86/regs.h
 disasm/ndisasm.$(O): disasm/ndisasm.c asm/directiv.h asm/pptok.h &
  asm/preproc.h asm/tokens.h config/msvc.h config/unknown.h config/watcom.h &
- disasm/disasm.h disasm/sync.h include/compiler.h include/iflag.h &
- include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/strlist.h include/tables.h include/ver.h &
- x86/iflaggen.h x86/insnsi.h x86/regs.h
+ disasm/disasm.h disasm/sync.h include/compiler.h include/error.h &
+ include/iflag.h include/insns.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
+ include/ver.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 disasm/sync.$(O): disasm/sync.c config/msvc.h config/unknown.h &
  config/watcom.h disasm/sync.h include/compiler.h include/nasmint.h &
  include/nasmlib.h
@@ -392,13 +404,12 @@ nasmlib/bsi.$(O): nasmlib/bsi.c config/msvc.h config/unknown.h &
 nasmlib/crc64.$(O): nasmlib/crc64.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/hashtbl.h include/nasmint.h &
  include/nasmlib.h
-nasmlib/error.$(O): nasmlib/error.c config/msvc.h config/unknown.h &
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/file.$(O): nasmlib/file.c config/msvc.h config/unknown.h &
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h &
- nasmlib/file.h
+ config/watcom.h include/compiler.h include/error.h include/nasmint.h &
+ include/nasmlib.h nasmlib/file.h
 nasmlib/filename.$(O): nasmlib/filename.c config/msvc.h config/unknown.h &
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/error.h include/nasmint.h &
+ include/nasmlib.h
 nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h &
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
  include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h &
@@ -407,12 +418,13 @@ nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h &
 nasmlib/ilog2.$(O): nasmlib/ilog2.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/malloc.$(O): nasmlib/malloc.c config/msvc.h config/unknown.h &
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/error.h include/nasmint.h &
+ include/nasmlib.h
 nasmlib/md5c.$(O): nasmlib/md5c.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/md5.h include/nasmint.h
 nasmlib/mmap.$(O): nasmlib/mmap.c config/msvc.h config/unknown.h &
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h &
- nasmlib/file.h
+ config/watcom.h include/compiler.h include/error.h include/nasmint.h &
+ include/nasmlib.h nasmlib/file.h
 nasmlib/raa.$(O): nasmlib/raa.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h &
  include/raa.h
@@ -420,9 +432,9 @@ nasmlib/rbtree.$(O): nasmlib/rbtree.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/rbtree.h
 nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h &
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h &
- x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
+ x86/insnsi.h x86/regs.h
 nasmlib/realpath.$(O): nasmlib/realpath.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/saa.$(O): nasmlib/saa.c config/msvc.h config/unknown.h &
@@ -441,57 +453,61 @@ nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h &
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/hashtbl.h include/md5.h include/nasm.h &
- include/nasmint.h include/nasmlib.h include/opflags.h include/saa.h &
- include/strlist.h include/tables.h output/outlib.h output/pecoff.h &
- version.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/hashtbl.h include/md5.h &
+ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h &
+ include/saa.h include/strlist.h include/tables.h output/outlib.h &
+ output/pecoff.h version.h x86/insnsi.h x86/regs.h
 output/legacy.$(O): output/legacy.c asm/directiv.h asm/pptok.h asm/preproc.h &
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h &
- include/strlist.h include/tables.h output/outlib.h x86/insnsi.h x86/regs.h
-output/nulldbg.$(O): output/nulldbg.c asm/directiv.h asm/pptok.h &
- asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
+ include/error.h include/nasm.h include/nasmint.h include/nasmlib.h &
  include/opflags.h include/strlist.h include/tables.h output/outlib.h &
  x86/insnsi.h x86/regs.h
+output/nulldbg.$(O): output/nulldbg.c asm/directiv.h asm/pptok.h &
+ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h &
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/strlist.h include/tables.h output/outlib.h &
- x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outaout.$(O): output/outaout.c asm/directiv.h asm/eval.h asm/pptok.h &
  asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/raa.h include/saa.h include/strlist.h &
- include/tables.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/raa.h include/saa.h &
+ include/strlist.h include/tables.h output/outform.h output/outlib.h &
+ x86/insnsi.h x86/regs.h
 output/outas86.$(O): output/outas86.c asm/directiv.h asm/pptok.h &
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/raa.h include/saa.h include/strlist.h &
- include/tables.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/raa.h include/saa.h &
+ include/strlist.h include/tables.h output/outform.h output/outlib.h &
+ x86/insnsi.h x86/regs.h
 output/outbin.$(O): output/outbin.c asm/directiv.h asm/eval.h asm/pptok.h &
  asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/labels.h include/nasm.h include/nasmint.h &
- include/nasmlib.h include/opflags.h include/saa.h include/strlist.h &
- include/tables.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/labels.h include/nasm.h &
+ include/nasmint.h include/nasmlib.h include/opflags.h include/saa.h &
+ include/strlist.h include/tables.h output/outform.h output/outlib.h &
+ x86/insnsi.h x86/regs.h
 output/outcoff.$(O): output/outcoff.c asm/directiv.h asm/eval.h asm/pptok.h &
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/raa.h include/saa.h include/strlist.h &
- include/tables.h output/outform.h output/outlib.h output/pecoff.h &
- x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/raa.h include/saa.h &
+ include/strlist.h include/tables.h output/outform.h output/outlib.h &
+ output/pecoff.h x86/insnsi.h x86/regs.h
 output/outdbg.$(O): output/outdbg.c asm/directiv.h asm/pptok.h asm/preproc.h &
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h &
- include/strlist.h include/tables.h output/outform.h output/outlib.h &
- x86/insnsi.h x86/regs.h
+ include/error.h include/nasm.h include/nasmint.h include/nasmlib.h &
+ include/opflags.h include/strlist.h include/tables.h output/outform.h &
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outelf.$(O): output/outelf.c asm/directiv.h asm/eval.h asm/pptok.h &
  asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/raa.h include/rbtree.h include/saa.h &
- include/strlist.h include/tables.h include/ver.h output/dwarf.h &
- output/elf.h output/outelf.h output/outform.h output/outlib.h &
- output/stabs.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/raa.h include/rbtree.h &
+ include/saa.h include/strlist.h include/tables.h include/ver.h &
+ output/dwarf.h output/elf.h output/outelf.h output/outform.h &
+ output/outlib.h output/stabs.h x86/insnsi.h x86/regs.h
 output/outform.$(O): output/outform.c asm/directiv.h asm/pptok.h &
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
  include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
@@ -499,29 +515,31 @@ output/outform.$(O): output/outform.c asm/directiv.h asm/pptok.h &
  x86/insnsi.h x86/regs.h
 output/outieee.$(O): output/outieee.c asm/directiv.h asm/pptok.h &
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/strlist.h include/tables.h include/ver.h &
- output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
+ include/ver.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outlib.$(O): output/outlib.c asm/directiv.h asm/pptok.h asm/preproc.h &
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h &
- include/strlist.h include/tables.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/error.h include/nasm.h include/nasmint.h include/nasmlib.h &
+ include/opflags.h include/strlist.h include/tables.h output/outlib.h &
+ x86/insnsi.h x86/regs.h
 output/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h &
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/raa.h include/rbtree.h include/saa.h &
- include/strlist.h include/tables.h output/outform.h output/outlib.h &
- x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/raa.h include/rbtree.h &
+ include/saa.h include/strlist.h include/tables.h output/outform.h &
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outobj.$(O): output/outobj.c asm/directiv.h asm/eval.h asm/pptok.h &
  asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/strlist.h include/tables.h include/ver.h &
- output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
+ include/ver.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outrdf2.$(O): output/outrdf2.c asm/directiv.h asm/pptok.h &
  asm/preproc.h config/msvc.h config/unknown.h config/watcom.h &
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h &
- include/opflags.h include/rdoff.h include/saa.h include/strlist.h &
- include/tables.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h &
+ include/nasmlib.h include/opflags.h include/rdoff.h include/saa.h &
+ include/strlist.h include/tables.h output/outform.h output/outlib.h &
+ x86/insnsi.h x86/regs.h
 stdlib/snprintf.$(O): stdlib/snprintf.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 stdlib/strlcpy.$(O): stdlib/strlcpy.c config/msvc.h config/unknown.h &
@@ -529,7 +547,8 @@ stdlib/strlcpy.$(O): stdlib/strlcpy.c config/msvc.h config/unknown.h &
 stdlib/strnlen.$(O): stdlib/strnlen.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h
 stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/msvc.h config/unknown.h &
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/error.h include/nasmint.h &
+ include/nasmlib.h
 x86/disp8.$(O): x86/disp8.c asm/directiv.h asm/pptok.h asm/preproc.h &
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
  include/disp8.h include/nasm.h include/nasmint.h include/nasmlib.h &
diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak
index 03545fd4..3d343d25 100644
--- a/Mkfiles/owlinux.mak
+++ b/Mkfiles/owlinux.mak
@@ -64,7 +64,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	stdlib/strnlen.$(O) \
 	nasmlib/ver.$(O) \
 	nasmlib/crc64.$(O) nasmlib/malloc.$(O) \
-	nasmlib/error.$(O) nasmlib/md5c.$(O) nasmlib/string.$(O) \
+	nasmlib/md5c.$(O) nasmlib/string.$(O) \
 	nasmlib/file.$(O) nasmlib/mmap.$(O) nasmlib/ilog2.$(O) \
 	nasmlib/realpath.$(O) nasmlib/filename.$(O) nasmlib/srcfile.$(O) \
 	nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) \
@@ -76,8 +76,9 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) \
 	x86/disp8.$(O) x86/iflag.$(O) \
 	\
+	asm/error.$(O) \
 	asm/float.$(O) \
-	asm/directbl.$(O) \
+	asm/directiv.$(O) asm/directbl.$(O) \
 	asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \
 	asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) \
 	asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) asm/exprdump.$(O) \
@@ -260,19 +261,30 @@ everything: all doc rdf
 asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h \
  asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.h config/config.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
- include/disp8.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/disp8.h include/error.h include/iflag.h include/insns.h \
+ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/directbl.$(O): asm/directbl.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \
  include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
  x86/insnsi.h x86/regs.h
-asm/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h \
- asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/labels.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/insnsi.h x86/regs.h
+asm/directiv.$(O): asm/directiv.c asm/assemble.h asm/directiv.h asm/eval.h \
+ asm/float.h asm/listing.h asm/pptok.h asm/preproc.h asm/stdscan.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
+ include/compiler.h include/error.h include/iflag.h include/labels.h \
+ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/strlist.h include/tables.h output/outform.h x86/iflaggen.h \
+ x86/insnsi.h x86/regs.h
+asm/error.$(O): asm/error.c config/config.h config/msvc.h config/unknown.h \
+ config/watcom.h include/compiler.h include/error.h include/nasmint.h \
+ include/nasmlib.h
+asm/eval.$(O): asm/eval.c asm/assemble.h asm/directiv.h asm/eval.h \
+ asm/float.h asm/pptok.h asm/preproc.h config/config.h config/msvc.h \
+ config/unknown.h config/watcom.h include/compiler.h include/error.h \
+ include/iflag.h include/labels.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/exprdump.$(O): asm/exprdump.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
@@ -285,47 +297,47 @@ asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
  x86/regs.h
 asm/float.$(O): asm/float.c asm/directiv.h asm/float.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/insnsi.h x86/regs.h
-asm/labels.$(O): asm/labels.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/hashtbl.h include/labels.h include/nasm.h \
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
  include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
  include/tables.h x86/insnsi.h x86/regs.h
+asm/labels.$(O): asm/labels.c asm/directiv.h asm/pptok.h asm/preproc.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
+ include/compiler.h include/error.h include/hashtbl.h include/labels.h \
+ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
 asm/listing.$(O): asm/listing.c asm/directiv.h asm/listing.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h x86/insnsi.h x86/regs.h
 asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directiv.h asm/eval.h \
  asm/float.h asm/listing.h asm/parser.h asm/pptok.h asm/preproc.h \
  asm/stdscan.h asm/tokens.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/iflag.h include/insns.h \
- include/labels.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/raa.h include/saa.h include/strlist.h \
- include/tables.h include/ver.h output/outform.h x86/iflaggen.h x86/insnsi.h \
- x86/regs.h
-asm/parser.$(O): asm/parser.c asm/directiv.h asm/eval.h asm/float.h \
- asm/parser.h asm/pptok.h asm/preproc.h asm/stdscan.h asm/tokens.h \
- config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/iflag.h \
+ include/insns.h include/labels.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/raa.h include/saa.h \
+ include/strlist.h include/tables.h include/ver.h output/outform.h \
+ x86/iflaggen.h x86/insnsi.h x86/regs.h
+asm/parser.$(O): asm/parser.c asm/assemble.h asm/directiv.h asm/eval.h \
+ asm/float.h asm/parser.h asm/pptok.h asm/preproc.h asm/stdscan.h \
+ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \
+ include/compiler.h include/error.h include/iflag.h include/insns.h \
+ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config/config.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
  include/hashtbl.h include/nasmint.h include/nasmlib.h
 asm/preproc-nop.$(O): asm/preproc-nop.c asm/directiv.h asm/listing.h \
  asm/pptok.h asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h x86/insnsi.h x86/regs.h
 asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h \
  asm/pptok.h asm/preproc.h asm/quote.h asm/stdscan.h asm/tokens.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/hashtbl.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h x86/insnsi.h x86/regs.h
 asm/quote.$(O): asm/quote.c asm/quote.h config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h
@@ -341,10 +353,10 @@ asm/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h \
  include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/stdscan.$(O): asm/stdscan.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/quote.h asm/stdscan.h asm/tokens.h config/config.h config/msvc.h \
- config/unknown.h config/watcom.h include/compiler.h include/iflag.h \
- include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h x86/iflaggen.h \
- x86/insnsi.h x86/regs.h
+ config/unknown.h config/watcom.h include/compiler.h include/error.h \
+ include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/strfunc.$(O): asm/strfunc.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
@@ -370,9 +382,9 @@ disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h \
 disasm/ndisasm.$(O): disasm/ndisasm.c asm/directiv.h asm/pptok.h \
  asm/preproc.h asm/tokens.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h disasm/disasm.h disasm/sync.h include/compiler.h \
- include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- include/ver.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/error.h include/iflag.h include/insns.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h include/ver.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 disasm/sync.$(O): disasm/sync.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h disasm/sync.h include/compiler.h \
  include/nasmint.h include/nasmlib.h
@@ -387,15 +399,12 @@ nasmlib/bsi.$(O): nasmlib/bsi.c config/config.h config/msvc.h \
 nasmlib/crc64.$(O): nasmlib/crc64.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/hashtbl.h \
  include/nasmint.h include/nasmlib.h
-nasmlib/error.$(O): nasmlib/error.c config/config.h config/msvc.h \
- config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
- include/nasmlib.h
 nasmlib/file.$(O): nasmlib/file.c config/config.h config/msvc.h \
- config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
- include/nasmlib.h nasmlib/file.h
+ config/unknown.h config/watcom.h include/compiler.h include/error.h \
+ include/nasmint.h include/nasmlib.h nasmlib/file.h
 nasmlib/filename.$(O): nasmlib/filename.c config/config.h config/msvc.h \
- config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
- include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.h include/error.h \
+ include/nasmint.h include/nasmlib.h
 nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/hashtbl.h include/nasm.h \
@@ -405,14 +414,14 @@ nasmlib/ilog2.$(O): nasmlib/ilog2.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h
 nasmlib/malloc.$(O): nasmlib/malloc.c config/config.h config/msvc.h \
- config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
- include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.h include/error.h \
+ include/nasmint.h include/nasmlib.h
 nasmlib/md5c.$(O): nasmlib/md5c.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/md5.h \
  include/nasmint.h
 nasmlib/mmap.$(O): nasmlib/mmap.c config/config.h config/msvc.h \
- config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
- include/nasmlib.h nasmlib/file.h
+ config/unknown.h config/watcom.h include/compiler.h include/error.h \
+ include/nasmint.h include/nasmlib.h nasmlib/file.h
 nasmlib/raa.$(O): nasmlib/raa.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h include/raa.h
@@ -421,9 +430,9 @@ nasmlib/rbtree.$(O): nasmlib/rbtree.c config/config.h config/msvc.h \
  include/rbtree.h
 nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h x86/insnsi.h x86/regs.h
 nasmlib/realpath.$(O): nasmlib/realpath.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h
@@ -445,60 +454,60 @@ nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/config.h config/msvc.h \
  include/nasmlib.h
 output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/hashtbl.h include/md5.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/saa.h include/strlist.h include/tables.h output/outlib.h \
- output/pecoff.h version.h x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/hashtbl.h \
+ include/md5.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/opflags.h include/saa.h include/strlist.h include/tables.h \
+ output/outlib.h output/pecoff.h version.h x86/insnsi.h x86/regs.h
 output/legacy.$(O): output/legacy.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h output/outlib.h \
- x86/insnsi.h x86/regs.h
-output/nulldbg.$(O): output/nulldbg.c asm/directiv.h asm/pptok.h \
- asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
  include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
  output/outlib.h x86/insnsi.h x86/regs.h
+output/nulldbg.$(O): output/nulldbg.c asm/directiv.h asm/pptok.h \
+ asm/preproc.h config/config.h config/msvc.h config/unknown.h \
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h output/outlib.h x86/insnsi.h x86/regs.h
 output/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- output/outlib.h x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outaout.$(O): output/outaout.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/raa.h include/saa.h \
- include/strlist.h include/tables.h output/outform.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/raa.h \
+ include/saa.h include/strlist.h include/tables.h output/outform.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outas86.$(O): output/outas86.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/raa.h include/saa.h \
- include/strlist.h include/tables.h output/outform.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/raa.h \
+ include/saa.h include/strlist.h include/tables.h output/outform.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outbin.$(O): output/outbin.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/labels.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/saa.h \
- include/strlist.h include/tables.h output/outform.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/labels.h \
+ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/saa.h include/strlist.h include/tables.h output/outform.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outcoff.$(O): output/outcoff.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/raa.h include/saa.h \
- include/strlist.h include/tables.h output/outform.h output/outlib.h \
- output/pecoff.h x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/raa.h \
+ include/saa.h include/strlist.h include/tables.h output/outform.h \
+ output/outlib.h output/pecoff.h x86/insnsi.h x86/regs.h
 output/outdbg.$(O): output/outdbg.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h output/outform.h \
- output/outlib.h x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outelf.$(O): output/outelf.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/raa.h include/rbtree.h \
- include/saa.h include/strlist.h include/tables.h include/ver.h \
- output/dwarf.h output/elf.h output/outelf.h output/outform.h \
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/raa.h \
+ include/rbtree.h include/saa.h include/strlist.h include/tables.h \
+ include/ver.h output/dwarf.h output/elf.h output/outelf.h output/outform.h \
  output/outlib.h output/stabs.h x86/insnsi.h x86/regs.h
 output/outform.$(O): output/outform.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
@@ -507,31 +516,33 @@ output/outform.$(O): output/outform.c asm/directiv.h asm/pptok.h \
  output/outform.h x86/insnsi.h x86/regs.h
 output/outieee.$(O): output/outieee.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- include/ver.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h include/ver.h output/outform.h output/outlib.h \
+ x86/insnsi.h x86/regs.h
 output/outlib.$(O): output/outlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ include/compiler.h include/error.h include/nasm.h include/nasmint.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/raa.h include/rbtree.h \
- include/saa.h include/strlist.h include/tables.h output/outform.h \
- output/outlib.h x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/raa.h \
+ include/rbtree.h include/saa.h include/strlist.h include/tables.h \
+ output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outobj.$(O): output/outobj.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- include/ver.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h include/ver.h output/outform.h output/outlib.h \
+ x86/insnsi.h x86/regs.h
 output/outrdf2.$(O): output/outrdf2.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/rdoff.h include/saa.h \
- include/strlist.h include/tables.h output/outform.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/nasm.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/rdoff.h \
+ include/saa.h include/strlist.h include/tables.h output/outform.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 stdlib/snprintf.$(O): stdlib/snprintf.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h
@@ -540,8 +551,8 @@ stdlib/strlcpy.$(O): stdlib/strlcpy.c config/config.h config/msvc.h \
 stdlib/strnlen.$(O): stdlib/strnlen.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h
 stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/config.h config/msvc.h \
- config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
- include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.h include/error.h \
+ include/nasmint.h include/nasmlib.h
 x86/disp8.$(O): x86/disp8.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/disp8.h include/nasm.h include/nasmint.h \