Move canned OpenWatcom config to config/watcom.h.

Move the canned OpenWatcom configuration file to config/watcom.h. Also exclude config/config.h from being a dependency for MSVC. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2025-09-22 10:43:39 -04:00 · 2016-10-19 13:23:04 -07:00
parent 4c9132e3a0
commit f5287231c1
7 changed files with 855 additions and 738 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -375,286 +375,316 @@ alldeps: perlreq tools/syncfiles.pl tools/mkdep.pl
 #-- Everything below is generated by mkdep.pl - do not edit --#
 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 include/compiler.h include/disp8.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/disp8.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/directiv.$(O): asm/directiv.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/regs.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 \
- include/compiler.h include/labels.h include/nasm.h include/nasmint.h \
+ config/watcom.h include/compiler.h include/labels.h include/nasm.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- x86/insnsi.h x86/regs.h
+ include/tables.h x86/insnsi.h x86/regs.h
 asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
+ include/opflags.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/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.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 include/compiler.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/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 \
 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 \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/regs.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 \
- include/compiler.h include/iflag.h include/insns.h include/labels.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/labels.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/raa.h include/saa.h include/strlist.h include/tables.h \
+ include/opflags.h include/raa.h include/saa.h include/strlist.h \
- include/ver.h output/outform.h x86/iflaggen.h x86/insnsi.h x86/regs.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 include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
+ include/compiler.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.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 include/compiler.h include/hashtbl.h \
+ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
- include/nasmint.h include/nasmlib.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
 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
 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
 asm/rdstrnum.$(O): asm/rdstrnum.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
 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 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/quote.$(O): asm/quote.c asm/quote.h config/config.h config/msvc.h \
 config/unknown.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 \
 config/config.h config/msvc.h config/unknown.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/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 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 include/compiler.h include/iflag.h include/insns.h \
+ config/unknown.h config/watcom.h include/compiler.h include/iflag.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.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 include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
+ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
 x86/regs.h
 asm/tokhash.$(O): asm/tokhash.c asm/directiv.h asm/pptok.h asm/preproc.h \
 asm/stdscan.h asm/tokens.h config/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/hashtbl.h include/iflag.h include/insns.h \
+ config/watcom.h include/compiler.h include/hashtbl.h include/iflag.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/opflags.h include/strlist.h include/tables.h x86/iflaggen.h \
 x86/insnsi.h x86/regs.h
 common/common.$(O): common/common.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.h disasm/disasm.h \
+ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \
- disasm/sync.h include/compiler.h include/disp8.h include/iflag.h \
+ disasm/disasm.h disasm/sync.h include/compiler.h include/disp8.h \
- include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h x86/iflaggen.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/insnsi.h x86/regdis.h x86/regs.h
+ x86/iflaggen.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/config.h config/msvc.h config/unknown.h \
- disasm/disasm.h disasm/sync.h include/compiler.h include/iflag.h \
+ config/watcom.h disasm/disasm.h disasm/sync.h include/compiler.h \
- include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h include/ver.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.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 disasm/sync.h include/compiler.h include/nasmint.h \
+ config/unknown.h config/watcom.h disasm/sync.h include/compiler.h \
- include/nasmlib.h
+ include/nasmint.h include/nasmlib.h
 macros/macros.$(O): macros/macros.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
 include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h \
 include/opflags.h include/strlist.h include/tables.h output/outform.h \
 x86/insnsi.h x86/regs.h
 nasmlib/bsi.$(O): nasmlib/bsi.c config/config.h config/msvc.h \
 config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/crc64.$(O): nasmlib/crc64.c config/config.h config/msvc.h \
 config/unknown.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 include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/file.$(O): nasmlib/file.c config/config.h config/msvc.h \
 config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/filename.$(O): nasmlib/filename.c config/config.h config/msvc.h \
 config/unknown.h include/compiler.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 \
 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
+ output/outform.h x86/insnsi.h x86/regs.h
 nasmlib/bsi.$(O): nasmlib/bsi.c config/config.h config/msvc.h \
 config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 include/nasmlib.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/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
 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 \
 include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
 include/tables.h x86/insnsi.h x86/regs.h
 nasmlib/ilog2.$(O): nasmlib/ilog2.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.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 include/compiler.h include/nasmint.h include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 include/nasmlib.h
 nasmlib/md5c.$(O): nasmlib/md5c.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/md5.h include/nasmint.h
+ config/unknown.h config/watcom.h include/compiler.h include/md5.h \
 include/nasmint.h
 nasmlib/raa.$(O): nasmlib/raa.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h \
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
- include/raa.h
+ include/nasmlib.h include/raa.h
 nasmlib/rbtree.$(O): nasmlib/rbtree.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/rbtree.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/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/regs.h
+ x86/insnsi.h x86/regs.h
 nasmlib/realpath.$(O): nasmlib/realpath.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 nasmlib/saa.$(O): nasmlib/saa.c config/config.h config/msvc.h \
 config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h \
 include/saa.h
 nasmlib/srcfile.$(O): nasmlib/srcfile.c config/config.h config/msvc.h \
 config/unknown.h include/compiler.h include/hashtbl.h include/nasmint.h \
 include/nasmlib.h
 nasmlib/saa.$(O): nasmlib/saa.c config/config.h config/msvc.h \
 config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 include/nasmlib.h include/saa.h
 nasmlib/srcfile.$(O): nasmlib/srcfile.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/string.$(O): nasmlib/string.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 include/nasmlib.h
 nasmlib/strlist.$(O): nasmlib/strlist.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h \
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
- include/strlist.h
+ include/nasmlib.h include/strlist.h
 nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h
 nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.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/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/hashtbl.h include/md5.h include/nasm.h \
+ config/watcom.h include/compiler.h include/hashtbl.h include/md5.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 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/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 \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h output/outlib.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/insnsi.h x86/regs.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
 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
 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
 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
 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
 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
 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 \
 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 \
 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 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
 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
 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 \
 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
 output/outas86.$(O): output/outas86.c asm/directiv.h asm/pptok.h \
 asm/preproc.h config/config.h config/msvc.h config/unknown.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
 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 \
 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
 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 \
 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
 output/outdbg.$(O): output/outdbg.c asm/directiv.h asm/pptok.h asm/preproc.h \
 config/config.h config/msvc.h config/unknown.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
 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 \
 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
 output/outform.$(O): output/outform.c asm/directiv.h asm/pptok.h \
 asm/preproc.h config/config.h config/msvc.h config/unknown.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 \
 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 \
 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
 output/outlib.$(O): output/outlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
 config/config.h config/msvc.h config/unknown.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/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h \
 asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/opflags.h include/raa.h include/rbtree.h include/saa.h \
+ include/nasmlib.h include/opflags.h include/raa.h include/rbtree.h \
- include/strlist.h include/tables.h output/outform.h output/outlib.h \
+ include/saa.h include/strlist.h include/tables.h output/outform.h \
- x86/insnsi.h x86/regs.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 \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h include/ver.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/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 \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/opflags.h include/rdoff.h include/saa.h include/strlist.h \
+ include/nasmlib.h include/opflags.h include/rdoff.h include/saa.h \
- include/tables.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.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 include/compiler.h include/nasmint.h include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 include/nasmlib.h
 stdlib/strlcpy.$(O): stdlib/strlcpy.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h
 stdlib/strnlen.$(O): stdlib/strnlen.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.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 include/compiler.h include/nasmint.h include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.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 include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/disp8.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/compiler.h include/disp8.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/regs.h
+ x86/insnsi.h x86/regs.h
 x86/iflag.$(O): x86/iflag.c config/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/iflag.h include/nasmint.h x86/iflaggen.h
+ config/watcom.h include/compiler.h include/iflag.h include/nasmint.h \
 x86/iflaggen.h
 x86/insnsa.$(O): x86/insnsa.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 x86/insnsb.$(O): x86/insnsb.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 x86/insnsd.$(O): x86/insnsd.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 x86/insnsn.$(O): x86/insnsn.c config/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/nasmint.h include/tables.h x86/insnsi.h
+ config/watcom.h include/compiler.h include/nasmint.h include/tables.h \
 x86/insnsi.h
 x86/regdis.$(O): x86/regdis.c x86/regdis.h x86/regs.h
 x86/regflags.$(O): x86/regflags.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
+ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
 x86/regs.h
 x86/regs.$(O): x86/regs.c config/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/nasmint.h include/tables.h x86/insnsi.h
+ config/watcom.h include/compiler.h include/nasmint.h include/tables.h \
 x86/regvals.$(O): x86/regvals.c config/config.h config/msvc.h \
 config/unknown.h include/compiler.h include/nasmint.h include/tables.h \
 x86/insnsi.h
 x86/regvals.$(O): x86/regvals.c config/config.h config/msvc.h \
 config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 include/tables.h x86/insnsi.h
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -262,290 +262,290 @@ everything: all doc rdf
 #-- Magic hints to mkdep.pl --#
 # @object-ending: ".$(O)"
 # @path-separator: "/"
-# @exclude: "config.h"
+# @exclude: "config/config.h"
 #-- Everything below is generated by mkdep.pl - do not edit --#
 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 \
+ asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.h config/msvc.h \
- config/msvc.h config/unknown.h include/compiler.h include/disp8.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
 asm/directiv.$(O): asm/directiv.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.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 \
+ 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 \
 x86/insnsi.h x86/regs.h
 asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.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/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 \
+ 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/config.h config/msvc.h config/unknown.h include/compiler.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/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 \
+ 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/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 \
+ 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/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 include/compiler.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
-asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config/config.h \
+asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config/msvc.h \
- config/msvc.h config/unknown.h include/compiler.h include/hashtbl.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 \
+ 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/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 include/compiler.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/quote.$(O): asm/quote.c asm/quote.h config/config.h config/msvc.h \
+asm/quote.$(O): asm/quote.c asm/quote.h config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.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 \
- config/config.h config/msvc.h config/unknown.h include/compiler.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/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 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 \
+ asm/quote.h asm/stdscan.h asm/tokens.h config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/iflag.h include/insns.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
 asm/strfunc.$(O): asm/strfunc.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.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/tokhash.$(O): asm/tokhash.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/stdscan.h asm/tokens.h config/config.h config/msvc.h config/unknown.h \
+ asm/stdscan.h asm/tokens.h config/msvc.h config/unknown.h config/watcom.h \
 include/compiler.h include/hashtbl.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
 common/common.$(O): common/common.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.h disasm/disasm.h \
+ asm/tokens.h config/msvc.h config/unknown.h config/watcom.h disasm/disasm.h \
 disasm/sync.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/regdis.h x86/regs.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 \
+ 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/sync.$(O): disasm/sync.c config/config.h config/msvc.h \
+disasm/sync.$(O): disasm/sync.c config/msvc.h config/unknown.h \
- config/unknown.h disasm/sync.h include/compiler.h include/nasmint.h \
+ config/watcom.h disasm/sync.h include/compiler.h include/nasmint.h \
 include/nasmlib.h
 macros/macros.$(O): macros/macros.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.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 output/outform.h \
 x86/insnsi.h x86/regs.h
-nasmlib/bsi.$(O): nasmlib/bsi.c config/config.h config/msvc.h \
+nasmlib/bsi.$(O): nasmlib/bsi.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
-nasmlib/crc64.$(O): nasmlib/crc64.c config/config.h config/msvc.h \
+nasmlib/crc64.$(O): nasmlib/crc64.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/hashtbl.h include/nasmint.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 \
+nasmlib/error.$(O): nasmlib/error.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.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 \
+nasmlib/file.$(O): nasmlib/file.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
-nasmlib/filename.$(O): nasmlib/filename.c config/config.h config/msvc.h \
+nasmlib/filename.$(O): nasmlib/filename.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.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 \
+ 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
-nasmlib/ilog2.$(O): nasmlib/ilog2.c config/config.h config/msvc.h \
+nasmlib/ilog2.$(O): nasmlib/ilog2.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.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 \
+nasmlib/malloc.$(O): nasmlib/malloc.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
-nasmlib/md5c.$(O): nasmlib/md5c.c config/config.h config/msvc.h \
+nasmlib/md5c.$(O): nasmlib/md5c.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/md5.h include/nasmint.h
+ config/watcom.h include/compiler.h include/md5.h include/nasmint.h
-nasmlib/raa.$(O): nasmlib/raa.c config/config.h config/msvc.h \
+nasmlib/raa.$(O): nasmlib/raa.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h \
 include/raa.h
-nasmlib/rbtree.$(O): nasmlib/rbtree.c config/config.h config/msvc.h \
+nasmlib/rbtree.$(O): nasmlib/rbtree.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/rbtree.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/config.h config/msvc.h config/unknown.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
-nasmlib/realpath.$(O): nasmlib/realpath.c config/config.h config/msvc.h \
+nasmlib/realpath.$(O): nasmlib/realpath.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
-nasmlib/saa.$(O): nasmlib/saa.c config/config.h config/msvc.h \
+nasmlib/saa.$(O): nasmlib/saa.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h \
 include/saa.h
-nasmlib/srcfile.$(O): nasmlib/srcfile.c config/config.h config/msvc.h \
+nasmlib/srcfile.$(O): nasmlib/srcfile.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/hashtbl.h include/nasmint.h \
+ config/watcom.h include/compiler.h include/hashtbl.h include/nasmint.h \
 include/nasmlib.h
-nasmlib/string.$(O): nasmlib/string.c config/config.h config/msvc.h \
+nasmlib/string.$(O): nasmlib/string.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
-nasmlib/strlist.$(O): nasmlib/strlist.c config/config.h config/msvc.h \
+nasmlib/strlist.$(O): nasmlib/strlist.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h \
 include/strlist.h
 nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h
-nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/config.h config/msvc.h \
+nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.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/config.h config/msvc.h config/unknown.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
 output/legacy.$(O): output/legacy.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.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 \
+ 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/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h \
- asm/preproc.h config/config.h config/msvc.h config/unknown.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/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 \
+ 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
 output/outas86.$(O): output/outas86.c asm/directiv.h asm/pptok.h \
- asm/preproc.h config/config.h config/msvc.h config/unknown.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
 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 \
+ 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
 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 \
+ 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
 output/outdbg.$(O): output/outdbg.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.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
 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 \
+ 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
 output/outform.$(O): output/outform.c asm/directiv.h asm/pptok.h \
- asm/preproc.h config/config.h config/msvc.h config/unknown.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 \
 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 \
+ 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
 output/outlib.$(O): output/outlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.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/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h \
- asm/preproc.h config/config.h config/msvc.h config/unknown.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
 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 \
+ 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
 output/outrdf2.$(O): output/outrdf2.c asm/directiv.h asm/pptok.h \
- asm/preproc.h config/config.h config/msvc.h config/unknown.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
-stdlib/snprintf.$(O): stdlib/snprintf.c config/config.h config/msvc.h \
+stdlib/snprintf.$(O): stdlib/snprintf.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
-stdlib/strlcpy.$(O): stdlib/strlcpy.c config/config.h config/msvc.h \
+stdlib/strlcpy.$(O): stdlib/strlcpy.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h
+ config/watcom.h include/compiler.h include/nasmint.h
-stdlib/strnlen.$(O): stdlib/strnlen.c config/config.h config/msvc.h \
+stdlib/strnlen.$(O): stdlib/strnlen.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h
+ config/watcom.h include/compiler.h include/nasmint.h
-stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/config.h config/msvc.h \
+stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.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 include/compiler.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 \
 include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
 x86/regs.h
-x86/iflag.$(O): x86/iflag.c config/config.h config/msvc.h config/unknown.h \
+x86/iflag.$(O): x86/iflag.c config/msvc.h config/unknown.h config/watcom.h \
 include/compiler.h include/iflag.h include/nasmint.h x86/iflaggen.h
 x86/insnsa.$(O): x86/insnsa.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 x86/insnsb.$(O): x86/insnsb.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 x86/insnsd.$(O): x86/insnsd.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
-x86/insnsn.$(O): x86/insnsn.c config/config.h config/msvc.h config/unknown.h \
+x86/insnsn.$(O): x86/insnsn.c config/msvc.h config/unknown.h config/watcom.h \
 include/compiler.h include/nasmint.h include/tables.h x86/insnsi.h
 x86/regdis.$(O): x86/regdis.c x86/regdis.h x86/regs.h
 x86/regflags.$(O): x86/regflags.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.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
-x86/regs.$(O): x86/regs.c config/config.h config/msvc.h config/unknown.h \
+x86/regs.$(O): x86/regs.c config/msvc.h config/unknown.h config/watcom.h \
 include/compiler.h include/nasmint.h include/tables.h x86/insnsi.h
-x86/regvals.$(O): x86/regvals.c config/config.h config/msvc.h \
+x86/regvals.$(O): x86/regvals.c config/msvc.h config/unknown.h \
- config/unknown.h include/compiler.h include/nasmint.h include/tables.h \
+ config/watcom.h include/compiler.h include/nasmint.h include/tables.h \
 x86/insnsi.h
--- a/Mkfiles/netware.mak
+++ b/Mkfiles/netware.mak
@@ -147,180 +147,192 @@ $(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 compiler.h disp8.h iflag.h insns.h \
+ tokens.h config.h msvc.h unknown.h watcom.h compiler.h disp8.h iflag.h \
- nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.h \
+ insns.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h \
- regs.h
+ insnsi.h regs.h
 directiv.o: directiv.c directiv.h pptok.h preproc.h config.h msvc.h \
- unknown.h compiler.h hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h \
+ unknown.h watcom.h compiler.h hashtbl.h nasm.h nasmint.h nasmlib.h \
- strlist.h tables.h insnsi.h regs.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 compiler.h labels.h nasm.h nasmint.h nasmlib.h opflags.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
 exprlib.o: exprlib.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h \
+ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- regs.h
+ insnsi.h regs.h
 float.o: float.c directiv.h float.h pptok.h preproc.h config.h msvc.h \
- unknown.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- tables.h insnsi.h regs.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 \
- compiler.h hashtbl.h labels.h nasm.h nasmint.h nasmlib.h opflags.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
 listing.o: listing.c directiv.h listing.h pptok.h preproc.h config.h msvc.h \
- unknown.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- tables.h insnsi.h regs.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 compiler.h \
+ pptok.h preproc.h stdscan.h tokens.h config.h msvc.h unknown.h watcom.h \
- iflag.h insns.h labels.h nasm.h nasmint.h nasmlib.h opflags.h raa.h saa.h \
+ compiler.h iflag.h insns.h labels.h nasm.h nasmint.h nasmlib.h opflags.h \
- strlist.h tables.h ver.h outform.h iflaggen.h insnsi.h regs.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 compiler.h iflag.h insns.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
 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
 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
 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 \
 unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
 strlist.h tables.h insnsi.h regs.h
 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
 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
 tokhash.o: tokhash.c directiv.h pptok.h preproc.h stdscan.h tokens.h \
 config.h msvc.h unknown.h watcom.h compiler.h hashtbl.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 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 compiler.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 compiler.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 compiler.h nasmint.h \
 nasmlib.h
 rdstrnum.o: rdstrnum.c directiv.h pptok.h preproc.h config.h msvc.h \
 unknown.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
 tables.h insnsi.h regs.h
 segalloc.o: segalloc.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
 unknown.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 compiler.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 \
 compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h \
 regs.h
 tokhash.o: tokhash.c directiv.h pptok.h preproc.h stdscan.h tokens.h \
 config.h msvc.h unknown.h compiler.h hashtbl.h iflag.h insns.h nasm.h \
 nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
 common.o: common.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
- unknown.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h \
+ unknown.h watcom.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h \
- strlist.h tables.h iflaggen.h insnsi.h regs.h
+ opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
 disasm.o: disasm.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
- unknown.h disasm.h sync.h compiler.h disp8.h iflag.h insns.h nasm.h \
+ unknown.h watcom.h disasm.h sync.h compiler.h disp8.h iflag.h insns.h \
- nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.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 disasm.h sync.h compiler.h iflag.h insns.h nasm.h nasmint.h \
+ unknown.h watcom.h disasm.h sync.h compiler.h iflag.h insns.h nasm.h \
- nasmlib.h opflags.h strlist.h tables.h ver.h iflaggen.h insnsi.h regs.h
+ nasmint.h nasmlib.h opflags.h strlist.h tables.h ver.h iflaggen.h insnsi.h \
 sync.o: sync.c config.h msvc.h unknown.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 \
 compiler.h hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
 tables.h outform.h insnsi.h regs.h
 bsi.o: bsi.c config.h msvc.h unknown.h compiler.h nasmint.h nasmlib.h
 crc64.o: crc64.c config.h msvc.h unknown.h compiler.h hashtbl.h nasmint.h \
 nasmlib.h
 error.o: error.c config.h msvc.h unknown.h compiler.h nasmint.h nasmlib.h
 file.o: file.c config.h msvc.h unknown.h compiler.h nasmint.h nasmlib.h
 filename.o: filename.c config.h msvc.h unknown.h compiler.h nasmint.h \
 nasmlib.h
 hashtbl.o: hashtbl.c directiv.h pptok.h preproc.h config.h msvc.h unknown.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 compiler.h nasmint.h nasmlib.h
 malloc.o: malloc.c config.h msvc.h unknown.h compiler.h nasmint.h nasmlib.h
 md5c.o: md5c.c config.h msvc.h unknown.h compiler.h md5.h nasmint.h
 raa.o: raa.c config.h msvc.h unknown.h compiler.h nasmint.h nasmlib.h raa.h
 rbtree.o: rbtree.c config.h msvc.h unknown.h compiler.h nasmint.h rbtree.h
 readnum.o: readnum.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
 compiler.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 compiler.h nasmint.h \
+sync.o: sync.c config.h msvc.h unknown.h watcom.h sync.h compiler.h \
 nasmlib.h
 saa.o: saa.c config.h msvc.h unknown.h compiler.h nasmint.h nasmlib.h saa.h
 srcfile.o: srcfile.c config.h msvc.h unknown.h compiler.h hashtbl.h \
 nasmint.h nasmlib.h
-string.o: string.c config.h msvc.h unknown.h compiler.h nasmint.h nasmlib.h
+macros.o: macros.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
-strlist.o: strlist.c config.h msvc.h unknown.h compiler.h nasmint.h \
+ watcom.h compiler.h hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h \
 strlist.h tables.h outform.h insnsi.h regs.h
 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
 filename.o: filename.c config.h msvc.h unknown.h watcom.h compiler.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
 md5c.o: md5c.c config.h msvc.h unknown.h watcom.h compiler.h md5.h nasmint.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
 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 \
 nasmlib.h saa.h
 srcfile.o: srcfile.c config.h msvc.h unknown.h watcom.h compiler.h hashtbl.h \
 nasmint.h nasmlib.h
 string.o: string.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
 nasmlib.h
 strlist.o: strlist.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
 nasmlib.h strlist.h
 ver.o: ver.c ver.h version.h
-zerobuf.o: zerobuf.c config.h msvc.h unknown.h compiler.h nasmint.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 compiler.h hashtbl.h md5.h nasm.h nasmint.h nasmlib.h opflags.h \
+ unknown.h watcom.h compiler.h hashtbl.h md5.h nasm.h nasmint.h nasmlib.h \
- saa.h strlist.h tables.h outlib.h pecoff.h version.h insnsi.h regs.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 \
- compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h outlib.h \
+ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- insnsi.h regs.h
+ outlib.h insnsi.h regs.h
 nulldbg.o: nulldbg.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h outlib.h \
+ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- insnsi.h regs.h
+ outlib.h insnsi.h regs.h
 nullout.o: nullout.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h outlib.h \
+ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- insnsi.h regs.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 compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h \
+ msvc.h unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.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 \
- compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h saa.h strlist.h \
+ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h saa.h \
- tables.h outform.h outlib.h insnsi.h regs.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 compiler.h labels.h nasm.h nasmint.h nasmlib.h opflags.h \
+ msvc.h unknown.h watcom.h compiler.h labels.h nasm.h nasmint.h nasmlib.h \
- saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.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 compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h saa.h \
+ unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h \
- strlist.h tables.h outform.h outlib.h pecoff.h insnsi.h regs.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 \
- compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.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
 outelf.o: outelf.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \
- msvc.h unknown.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h \
+ msvc.h unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- rbtree.h saa.h strlist.h tables.h ver.h dwarf.h elf.h outelf.h outform.h \
+ raa.h rbtree.h saa.h strlist.h tables.h ver.h dwarf.h elf.h outelf.h \
- outlib.h stabs.h insnsi.h regs.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 \
- compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.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 \
- compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h ver.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
+ 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 \
- compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h outlib.h \
+ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- insnsi.h regs.h
+ outlib.h insnsi.h regs.h
 outmacho.o: outmacho.c directiv.h pptok.h preproc.h config.h msvc.h \
- unknown.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h rbtree.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
+ 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 compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ msvc.h unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- tables.h ver.h outform.h outlib.h insnsi.h regs.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 \
- compiler.h nasm.h nasmint.h nasmlib.h opflags.h rdoff.h saa.h strlist.h \
+ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h rdoff.h saa.h \
- tables.h outform.h outlib.h insnsi.h regs.h
+ strlist.h tables.h outform.h outlib.h insnsi.h regs.h
-snprintf.o: snprintf.c config.h msvc.h unknown.h compiler.h nasmint.h \
+snprintf.o: snprintf.c config.h msvc.h unknown.h watcom.h compiler.h \
- nasmlib.h
+ nasmint.h nasmlib.h
-strlcpy.o: strlcpy.c config.h msvc.h unknown.h compiler.h nasmint.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 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 compiler.h nasmint.h \
+vsnprintf.o: vsnprintf.c config.h msvc.h unknown.h watcom.h compiler.h \
- nasmlib.h
+ nasmint.h nasmlib.h
 disp8.o: disp8.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- compiler.h disp8.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
+ watcom.h compiler.h disp8.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
- insnsi.h regs.h
+ tables.h insnsi.h regs.h
-iflag.o: iflag.c config.h msvc.h unknown.h compiler.h iflag.h nasmint.h \
+iflag.o: iflag.c config.h msvc.h unknown.h watcom.h compiler.h iflag.h \
- iflaggen.h
+ nasmint.h iflaggen.h
 insnsa.o: insnsa.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
- unknown.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h \
+ unknown.h watcom.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h \
- strlist.h tables.h iflaggen.h insnsi.h regs.h
+ opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
 insnsb.o: insnsb.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
- unknown.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h \
+ unknown.h watcom.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h \
- strlist.h tables.h iflaggen.h insnsi.h regs.h
+ opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
 insnsd.o: insnsd.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
- unknown.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h \
+ unknown.h watcom.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h \
- strlist.h tables.h iflaggen.h insnsi.h regs.h
+ opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
-insnsn.o: insnsn.c config.h msvc.h unknown.h compiler.h nasmint.h tables.h \
+insnsn.o: insnsn.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
- insnsi.h
+ tables.h insnsi.h
 regdis.o: regdis.c regdis.h regs.h
 regflags.o: regflags.c directiv.h pptok.h preproc.h config.h msvc.h \
- unknown.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
+ unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- tables.h insnsi.h regs.h
+ strlist.h tables.h insnsi.h regs.h
-regs.o: regs.c config.h msvc.h unknown.h compiler.h nasmint.h tables.h \
+regs.o: regs.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
- insnsi.h
+ tables.h insnsi.h
-regvals.o: regvals.c config.h msvc.h unknown.h compiler.h nasmint.h tables.h \
+regvals.o: regvals.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
- insnsi.h
+ tables.h insnsi.h
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -16,7 +16,7 @@ CC      = *wcl386
 DEBUG       =
 CFLAGS      = -zq -6 -ox -wx -ze -fpi $(DEBUG)
 BUILD_CFLAGS    = $(CFLAGS) $(%TARGET_CFLAGS)
-INTERNAL_CFLAGS = -I$(srcdir) -I. -DHAVE_CONFIG_H
+INTERNAL_CFLAGS = -I$(srcdir) -I.
 ALL_CFLAGS  = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
 LD      = *wlink
 LDEBUG      =
@@ -110,7 +110,7 @@ linux386:   .SYMBOLIC
    @set TARGET_LFLAGS=sys linux
    @%make all
-all: config.h perlreq nasm$(X) ndisasm$(X) .SYMBOLIC
+all: perlreq nasm$(X) ndisasm$(X) .SYMBOLIC
 #   cd rdoff && $(MAKE) all
 nasm$(X): $(NASM)
@@ -239,36 +239,6 @@ doc:
 everything: all doc rdf
 config.h: Mkfiles/openwcom.mak
    @echo Creating $@
    @%create $@
    @%append $@ $#define HAVE_DECL_STRCASECMP 1
    @%append $@ $#define HAVE_DECL_STRICMP 1
    @%append $@ $#define HAVE_DECL_STRLCPY 1
    @%append $@ $#define HAVE_DECL_STRNCASECMP 1
    @%append $@ $#define HAVE_DECL_STRNICMP 1
    @%append $@ $#define HAVE_INTTYPES_H 1
    @%append $@ $#define HAVE_LIMITS_H 1
    @%append $@ $#define HAVE_MEMORY_H 1
    @%append $@ $#define HAVE_SNPRINTF 1
    @%append $@ $#define HAVE_STDBOOL_H 1
    @%append $@ $#define HAVE_STDINT_H 1
    @%append $@ $#define HAVE_STDLIB_H 1
    @%append $@ $#define HAVE_STRCASECMP 1
    @%append $@ $#define HAVE_STRCSPN 1
    @%append $@ $#define HAVE_STRICMP 1
    @%append $@ $#define HAVE_STRINGS_H 1
    @%append $@ $#define HAVE_STRING_H 1
    @%append $@ $#define HAVE_STRLCPY 1
    @%append $@ $#define HAVE_STRNCASECMP 1
    @%append $@ $#define HAVE_STRNICMP 1
    @%append $@ $#define HAVE_STRSPN 1
    @%append $@ $#define HAVE_SYS_STAT_H 1
    @%append $@ $#define HAVE_SYS_TYPES_H 1
    @%append $@ $#define HAVE_UNISTD_H 1
    @%append $@ $#define HAVE_VSNPRINTF 1
    @%append $@ $#define STDC_HEADERS 1
 #
 # This build dependencies in *ALL* makefiles.  Partially for that reason,
 # it's expected to be invoked manually.
@@ -280,291 +250,291 @@ alldeps: perlreq .SYMBOLIC
 #-- Magic hints to mkdep.pl --#
 # @object-ending: ".$(O)"
 # @path-separator: "/"
-# @exclude: ""
+# @exclude: "config/config.h"
 # @continuation: "&"
 #-- Everything below is generated by mkdep.pl - do not edit --#
 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 &
+ asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.h config/msvc.h &
- config/msvc.h config/unknown.h include/compiler.h include/disp8.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
 asm/directiv.$(O): asm/directiv.c asm/directiv.h asm/pptok.h asm/preproc.h &
- config/config.h config/msvc.h config/unknown.h include/compiler.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 &
+ 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 &
 x86/insnsi.h x86/regs.h
 asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h &
- config/config.h config/msvc.h config/unknown.h include/compiler.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/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 &
+ 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/config.h config/msvc.h config/unknown.h include/compiler.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/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 &
+ 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/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 &
+ 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/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 include/compiler.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
-asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config/config.h &
+asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config/msvc.h &
- config/msvc.h config/unknown.h include/compiler.h include/hashtbl.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 &
+ 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/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 include/compiler.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/quote.$(O): asm/quote.c asm/quote.h config/config.h config/msvc.h &
+asm/quote.$(O): asm/quote.c asm/quote.h config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.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 &
- config/config.h config/msvc.h config/unknown.h include/compiler.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/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h &
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 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 &
+ asm/quote.h asm/stdscan.h asm/tokens.h config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/iflag.h include/insns.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
 asm/strfunc.$(O): asm/strfunc.c asm/directiv.h asm/pptok.h asm/preproc.h &
- config/config.h config/msvc.h config/unknown.h include/compiler.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/tokhash.$(O): asm/tokhash.c asm/directiv.h asm/pptok.h asm/preproc.h &
- asm/stdscan.h asm/tokens.h config/config.h config/msvc.h config/unknown.h &
+ asm/stdscan.h asm/tokens.h config/msvc.h config/unknown.h config/watcom.h &
 include/compiler.h include/hashtbl.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
 common/common.$(O): common/common.c asm/directiv.h asm/pptok.h asm/preproc.h &
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h &
- asm/tokens.h config/config.h config/msvc.h config/unknown.h disasm/disasm.h &
+ asm/tokens.h config/msvc.h config/unknown.h config/watcom.h disasm/disasm.h &
 disasm/sync.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/regdis.h x86/regs.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 &
+ 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/sync.$(O): disasm/sync.c config/config.h config/msvc.h &
+disasm/sync.$(O): disasm/sync.c config/msvc.h config/unknown.h &
- config/unknown.h disasm/sync.h include/compiler.h include/nasmint.h &
+ config/watcom.h disasm/sync.h include/compiler.h include/nasmint.h &
 include/nasmlib.h
 macros/macros.$(O): macros/macros.c asm/directiv.h asm/pptok.h asm/preproc.h &
- config/config.h config/msvc.h config/unknown.h include/compiler.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 output/outform.h &
 x86/insnsi.h x86/regs.h
-nasmlib/bsi.$(O): nasmlib/bsi.c config/config.h config/msvc.h &
+nasmlib/bsi.$(O): nasmlib/bsi.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
-nasmlib/crc64.$(O): nasmlib/crc64.c config/config.h config/msvc.h &
+nasmlib/crc64.$(O): nasmlib/crc64.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/hashtbl.h include/nasmint.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 &
+nasmlib/error.$(O): nasmlib/error.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.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 &
+nasmlib/file.$(O): nasmlib/file.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
-nasmlib/filename.$(O): nasmlib/filename.c config/config.h config/msvc.h &
+nasmlib/filename.$(O): nasmlib/filename.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.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 &
+ 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
-nasmlib/ilog2.$(O): nasmlib/ilog2.c config/config.h config/msvc.h &
+nasmlib/ilog2.$(O): nasmlib/ilog2.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.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 &
+nasmlib/malloc.$(O): nasmlib/malloc.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
-nasmlib/md5c.$(O): nasmlib/md5c.c config/config.h config/msvc.h &
+nasmlib/md5c.$(O): nasmlib/md5c.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/md5.h include/nasmint.h
+ config/watcom.h include/compiler.h include/md5.h include/nasmint.h
-nasmlib/raa.$(O): nasmlib/raa.c config/config.h config/msvc.h &
+nasmlib/raa.$(O): nasmlib/raa.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h &
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h &
 include/raa.h
-nasmlib/rbtree.$(O): nasmlib/rbtree.c config/config.h config/msvc.h &
+nasmlib/rbtree.$(O): nasmlib/rbtree.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/rbtree.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/config.h config/msvc.h config/unknown.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
-nasmlib/realpath.$(O): nasmlib/realpath.c config/config.h config/msvc.h &
+nasmlib/realpath.$(O): nasmlib/realpath.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
-nasmlib/saa.$(O): nasmlib/saa.c config/config.h config/msvc.h &
+nasmlib/saa.$(O): nasmlib/saa.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h &
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h &
 include/saa.h
-nasmlib/srcfile.$(O): nasmlib/srcfile.c config/config.h config/msvc.h &
+nasmlib/srcfile.$(O): nasmlib/srcfile.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/hashtbl.h include/nasmint.h &
+ config/watcom.h include/compiler.h include/hashtbl.h include/nasmint.h &
 include/nasmlib.h
-nasmlib/string.$(O): nasmlib/string.c config/config.h config/msvc.h &
+nasmlib/string.$(O): nasmlib/string.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
-nasmlib/strlist.$(O): nasmlib/strlist.c config/config.h config/msvc.h &
+nasmlib/strlist.$(O): nasmlib/strlist.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h &
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h &
 include/strlist.h
 nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h
-nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/config.h config/msvc.h &
+nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.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/config.h config/msvc.h config/unknown.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
 output/legacy.$(O): output/legacy.c asm/directiv.h asm/pptok.h asm/preproc.h &
- config/config.h config/msvc.h config/unknown.h include/compiler.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 &
+ 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/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h &
- asm/preproc.h config/config.h config/msvc.h config/unknown.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/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 &
+ 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
 output/outas86.$(O): output/outas86.c asm/directiv.h asm/pptok.h &
- asm/preproc.h config/config.h config/msvc.h config/unknown.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
 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 &
+ 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
 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 &
+ 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
 output/outdbg.$(O): output/outdbg.c asm/directiv.h asm/pptok.h asm/preproc.h &
- config/config.h config/msvc.h config/unknown.h include/compiler.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
 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 &
+ 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
 output/outform.$(O): output/outform.c asm/directiv.h asm/pptok.h &
- asm/preproc.h config/config.h config/msvc.h config/unknown.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 &
 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 &
+ 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
 output/outlib.$(O): output/outlib.c asm/directiv.h asm/pptok.h asm/preproc.h &
- config/config.h config/msvc.h config/unknown.h include/compiler.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/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h &
- asm/preproc.h config/config.h config/msvc.h config/unknown.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
 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 &
+ 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
 output/outrdf2.$(O): output/outrdf2.c asm/directiv.h asm/pptok.h &
- asm/preproc.h config/config.h config/msvc.h config/unknown.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
-stdlib/snprintf.$(O): stdlib/snprintf.c config/config.h config/msvc.h &
+stdlib/snprintf.$(O): stdlib/snprintf.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
-stdlib/strlcpy.$(O): stdlib/strlcpy.c config/config.h config/msvc.h &
+stdlib/strlcpy.$(O): stdlib/strlcpy.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h
+ config/watcom.h include/compiler.h include/nasmint.h
-stdlib/strnlen.$(O): stdlib/strnlen.c config/config.h config/msvc.h &
+stdlib/strnlen.$(O): stdlib/strnlen.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h
+ config/watcom.h include/compiler.h include/nasmint.h
-stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/config.h config/msvc.h &
+stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.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 include/compiler.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 &
 include/opflags.h include/strlist.h include/tables.h x86/insnsi.h &
 x86/regs.h
-x86/iflag.$(O): x86/iflag.c config/config.h config/msvc.h config/unknown.h &
+x86/iflag.$(O): x86/iflag.c config/msvc.h config/unknown.h config/watcom.h &
 include/compiler.h include/iflag.h include/nasmint.h x86/iflaggen.h
 x86/insnsa.$(O): x86/insnsa.c asm/directiv.h asm/pptok.h asm/preproc.h &
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 x86/insnsb.$(O): x86/insnsb.c asm/directiv.h asm/pptok.h asm/preproc.h &
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 x86/insnsd.$(O): x86/insnsd.c asm/directiv.h asm/pptok.h asm/preproc.h &
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
-x86/insnsn.$(O): x86/insnsn.c config/config.h config/msvc.h config/unknown.h &
+x86/insnsn.$(O): x86/insnsn.c config/msvc.h config/unknown.h config/watcom.h &
 include/compiler.h include/nasmint.h include/tables.h x86/insnsi.h
 x86/regdis.$(O): x86/regdis.c x86/regdis.h x86/regs.h
 x86/regflags.$(O): x86/regflags.c asm/directiv.h asm/pptok.h asm/preproc.h &
- config/config.h config/msvc.h config/unknown.h include/compiler.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
-x86/regs.$(O): x86/regs.c config/config.h config/msvc.h config/unknown.h &
+x86/regs.$(O): x86/regs.c config/msvc.h config/unknown.h config/watcom.h &
 include/compiler.h include/nasmint.h include/tables.h x86/insnsi.h
-x86/regvals.$(O): x86/regvals.c config/config.h config/msvc.h &
+x86/regvals.$(O): x86/regvals.c config/msvc.h config/unknown.h &
- config/unknown.h include/compiler.h include/nasmint.h include/tables.h &
+ config/watcom.h include/compiler.h include/nasmint.h include/tables.h &
 x86/insnsi.h
--- a/Mkfiles/owlinux.mak
+++ b/Mkfiles/owlinux.mak
@@ -254,286 +254,316 @@ everything: all doc rdf
 #-- Everything below is generated by mkdep.pl - do not edit --#
 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 include/compiler.h include/disp8.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/disp8.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/directiv.$(O): asm/directiv.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/regs.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 \
- include/compiler.h include/labels.h include/nasm.h include/nasmint.h \
+ config/watcom.h include/compiler.h include/labels.h include/nasm.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- x86/insnsi.h x86/regs.h
+ include/tables.h x86/insnsi.h x86/regs.h
 asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
+ include/opflags.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/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.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 include/compiler.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/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 \
 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 \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/regs.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 \
- include/compiler.h include/iflag.h include/insns.h include/labels.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/labels.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/raa.h include/saa.h include/strlist.h include/tables.h \
+ include/opflags.h include/raa.h include/saa.h include/strlist.h \
- include/ver.h output/outform.h x86/iflaggen.h x86/insnsi.h x86/regs.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 include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
+ include/compiler.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.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 include/compiler.h include/hashtbl.h \
+ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
- include/nasmint.h include/nasmlib.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
 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
 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
 asm/rdstrnum.$(O): asm/rdstrnum.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
 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 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/quote.$(O): asm/quote.c asm/quote.h config/config.h config/msvc.h \
 config/unknown.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 \
 config/config.h config/msvc.h config/unknown.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/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 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 include/compiler.h include/iflag.h include/insns.h \
+ config/unknown.h config/watcom.h include/compiler.h include/iflag.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.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 include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
+ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
 x86/regs.h
 asm/tokhash.$(O): asm/tokhash.c asm/directiv.h asm/pptok.h asm/preproc.h \
 asm/stdscan.h asm/tokens.h config/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/hashtbl.h include/iflag.h include/insns.h \
+ config/watcom.h include/compiler.h include/hashtbl.h include/iflag.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/opflags.h include/strlist.h include/tables.h x86/iflaggen.h \
 x86/insnsi.h x86/regs.h
 common/common.$(O): common/common.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.h disasm/disasm.h \
+ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \
- disasm/sync.h include/compiler.h include/disp8.h include/iflag.h \
+ disasm/disasm.h disasm/sync.h include/compiler.h include/disp8.h \
- include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h x86/iflaggen.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/insnsi.h x86/regdis.h x86/regs.h
+ x86/iflaggen.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/config.h config/msvc.h config/unknown.h \
- disasm/disasm.h disasm/sync.h include/compiler.h include/iflag.h \
+ config/watcom.h disasm/disasm.h disasm/sync.h include/compiler.h \
- include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h include/ver.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.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 disasm/sync.h include/compiler.h include/nasmint.h \
+ config/unknown.h config/watcom.h disasm/sync.h include/compiler.h \
- include/nasmlib.h
+ include/nasmint.h include/nasmlib.h
 macros/macros.$(O): macros/macros.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
 include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h \
 include/opflags.h include/strlist.h include/tables.h output/outform.h \
 x86/insnsi.h x86/regs.h
 nasmlib/bsi.$(O): nasmlib/bsi.c config/config.h config/msvc.h \
 config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/crc64.$(O): nasmlib/crc64.c config/config.h config/msvc.h \
 config/unknown.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 include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/file.$(O): nasmlib/file.c config/config.h config/msvc.h \
 config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/filename.$(O): nasmlib/filename.c config/config.h config/msvc.h \
 config/unknown.h include/compiler.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 \
 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
+ output/outform.h x86/insnsi.h x86/regs.h
 nasmlib/bsi.$(O): nasmlib/bsi.c config/config.h config/msvc.h \
 config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 include/nasmlib.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/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
 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 \
 include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
 include/tables.h x86/insnsi.h x86/regs.h
 nasmlib/ilog2.$(O): nasmlib/ilog2.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.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 include/compiler.h include/nasmint.h include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 include/nasmlib.h
 nasmlib/md5c.$(O): nasmlib/md5c.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/md5.h include/nasmint.h
+ config/unknown.h config/watcom.h include/compiler.h include/md5.h \
 include/nasmint.h
 nasmlib/raa.$(O): nasmlib/raa.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h \
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
- include/raa.h
+ include/nasmlib.h include/raa.h
 nasmlib/rbtree.$(O): nasmlib/rbtree.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/rbtree.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/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/regs.h
+ x86/insnsi.h x86/regs.h
 nasmlib/realpath.$(O): nasmlib/realpath.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 nasmlib/saa.$(O): nasmlib/saa.c config/config.h config/msvc.h \
 config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h \
 include/saa.h
 nasmlib/srcfile.$(O): nasmlib/srcfile.c config/config.h config/msvc.h \
 config/unknown.h include/compiler.h include/hashtbl.h include/nasmint.h \
 include/nasmlib.h
 nasmlib/saa.$(O): nasmlib/saa.c config/config.h config/msvc.h \
 config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 include/nasmlib.h include/saa.h
 nasmlib/srcfile.$(O): nasmlib/srcfile.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/string.$(O): nasmlib/string.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 include/nasmlib.h
 nasmlib/strlist.$(O): nasmlib/strlist.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.h \
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
- include/strlist.h
+ include/nasmlib.h include/strlist.h
 nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h
 nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h include/nasmlib.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/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/hashtbl.h include/md5.h include/nasm.h \
+ config/watcom.h include/compiler.h include/hashtbl.h include/md5.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 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/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 \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h output/outlib.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/insnsi.h x86/regs.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
 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
 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
 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
 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
 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
 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 \
 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 \
 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 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
 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
 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 \
 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
 output/outas86.$(O): output/outas86.c asm/directiv.h asm/pptok.h \
 asm/preproc.h config/config.h config/msvc.h config/unknown.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
 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 \
 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
 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 \
 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
 output/outdbg.$(O): output/outdbg.c asm/directiv.h asm/pptok.h asm/preproc.h \
 config/config.h config/msvc.h config/unknown.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
 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 \
 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
 output/outform.$(O): output/outform.c asm/directiv.h asm/pptok.h \
 asm/preproc.h config/config.h config/msvc.h config/unknown.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 \
 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 \
 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
 output/outlib.$(O): output/outlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
 config/config.h config/msvc.h config/unknown.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/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h \
 asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/opflags.h include/raa.h include/rbtree.h include/saa.h \
+ include/nasmlib.h include/opflags.h include/raa.h include/rbtree.h \
- include/strlist.h include/tables.h output/outform.h output/outlib.h \
+ include/saa.h include/strlist.h include/tables.h output/outform.h \
- x86/insnsi.h x86/regs.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 \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h include/ver.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/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 \
- include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/opflags.h include/rdoff.h include/saa.h include/strlist.h \
+ include/nasmlib.h include/opflags.h include/rdoff.h include/saa.h \
- include/tables.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.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 include/compiler.h include/nasmint.h include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 include/nasmlib.h
 stdlib/strlcpy.$(O): stdlib/strlcpy.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.h
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h
 stdlib/strnlen.$(O): stdlib/strnlen.c config/config.h config/msvc.h \
- config/unknown.h include/compiler.h include/nasmint.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 include/compiler.h include/nasmint.h include/nasmlib.h
+ config/unknown.h config/watcom.h include/compiler.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 include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/disp8.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/compiler.h include/disp8.h include/nasm.h include/nasmint.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/regs.h
+ x86/insnsi.h x86/regs.h
 x86/iflag.$(O): x86/iflag.c config/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/iflag.h include/nasmint.h x86/iflaggen.h
+ config/watcom.h include/compiler.h include/iflag.h include/nasmint.h \
 x86/iflaggen.h
 x86/insnsa.$(O): x86/insnsa.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 x86/insnsb.$(O): x86/insnsb.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 x86/insnsd.$(O): x86/insnsd.c asm/directiv.h asm/pptok.h asm/preproc.h \
- asm/tokens.h config/config.h config/msvc.h config/unknown.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
 x86/insnsn.$(O): x86/insnsn.c config/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/nasmint.h include/tables.h x86/insnsi.h
+ config/watcom.h include/compiler.h include/nasmint.h include/tables.h \
 x86/insnsi.h
 x86/regdis.$(O): x86/regdis.c x86/regdis.h x86/regs.h
 x86/regflags.$(O): x86/regflags.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h include/compiler.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
+ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
 x86/regs.h
 x86/regs.$(O): x86/regs.c config/config.h config/msvc.h config/unknown.h \
- include/compiler.h include/nasmint.h include/tables.h x86/insnsi.h
+ config/watcom.h include/compiler.h include/nasmint.h include/tables.h \
 x86/regvals.$(O): x86/regvals.c config/config.h config/msvc.h \
 config/unknown.h include/compiler.h include/nasmint.h include/tables.h \
 x86/insnsi.h
 x86/regvals.$(O): x86/regvals.c config/config.h config/msvc.h \
 config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
 include/tables.h x86/insnsi.h
--- a/config/watcom.h
+++ b/config/watcom.h
@@ -0,0 +1,73 @@
 /* ----------------------------------------------------------------------- *
 *
 *   Copyright 2016 The NASM Authors - All Rights Reserved
 *   See the file AUTHORS included with the NASM distribution for
 *   the specific copyright holders.
 *
 *   Redistribution and use in source and binary forms, with or without
 *   modification, are permitted provided that the following
 *   conditions are met:
 *
 *   * Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 *   * Redistributions in binary form must reproduce the above
 *     copyright notice, this list of conditions and the following
 *     disclaimer in the documentation and/or other materials provided
 *     with the distribution.
 *
 *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
 *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
 *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 * ----------------------------------------------------------------------- */
 /*
 * config/watcom.h
 *
 * Compiler definitions for OpenWatcom instead of config.h.in.
 *  See config.h.in for the variables which can be defined here.
 *
 * This was taken from openwcom.mak and needs to be actually validated.
 */
 #ifndef NASM_CONFIG_WATCOM_H
 #define NASM_CONFIG_WATCOM_H
 #define HAVE_DECL_STRCASECMP 1
 #define HAVE_DECL_STRICMP 1
 #define HAVE_DECL_STRLCPY 1
 #define HAVE_DECL_STRNCASECMP 1
 #define HAVE_DECL_STRNICMP 1
 #define HAVE_INTTYPES_H 1
 #define HAVE_LIMITS_H 1
 #define HAVE_MEMORY_H 1
 #define HAVE_SNPRINTF 1
 #define HAVE_STDBOOL_H 1
 #define HAVE_STDINT_H 1
 #define HAVE_STDLIB_H 1
 #define HAVE_STRCASECMP 1
 #define HAVE_STRCSPN 1
 #define HAVE_STRICMP 1
 #define HAVE_STRINGS_H 1
 #define HAVE_STRING_H 1
 #define HAVE_STRLCPY 1
 #define HAVE_STRNCASECMP 1
 #define HAVE_STRNICMP 1
 #define HAVE_STRSPN 1
 #define HAVE_SYS_STAT_H 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_UNISTD_H 1
 #define HAVE_VSNPRINTF 1
 #define STDC_HEADERS 1
 #endif /* NASM_CONFIG_WATCOM_H */
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -58,6 +58,8 @@
 # include "config/config.h"
 #elif defined(_MSC_VER) && (_MSC_VER >= 1310)
 # include "config/msvc.h"
 #elif defined(__WATCOM__)
 # include "config/watcom.h"
 #else
 # include "config/unknown.h"
 #endif /* Configuration file */