diff --git a/Makefile.am b/Makefile.am
index 5b432245..19ab7206 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,23 +58,15 @@ EXTRA_DIST += Mkfiles/Makefile.flat
 EXTRA_DIST += Mkfiles/Makefile.dj
 EXTRA_DIST += Mkfiles/dj/config.h
 EXTRA_DIST += Mkfiles/vc/yasm-module.c
-EXTRA_DIST += Mkfiles/vc/yasm.dep
-EXTRA_DIST += Mkfiles/vc/yasm.dsp
-EXTRA_DIST += Mkfiles/vc/yasm.dsw
-EXTRA_DIST += Mkfiles/vc/yasm.mak
 EXTRA_DIST += Mkfiles/vc/yasm.sln
-EXTRA_DIST += Mkfiles/vc/yasm.suo
 EXTRA_DIST += Mkfiles/vc/yasm.vcproj
 EXTRA_DIST += Mkfiles/vc/config.h
-EXTRA_DIST += Mkfiles/vc/libyasm/libyasm.dep
-EXTRA_DIST += Mkfiles/vc/libyasm/libyasm.dsp
-EXTRA_DIST += Mkfiles/vc/libyasm/libyasm.mak
+EXTRA_DIST += Mkfiles/vc/genmacro/genmacro.vcproj
+EXTRA_DIST += Mkfiles/vc/genmacro/run.bat
 EXTRA_DIST += Mkfiles/vc/libyasm/libyasm.vcproj
-EXTRA_DIST += Mkfiles/vc/modules/build.bat
-EXTRA_DIST += Mkfiles/vc/modules/modules.dep
-EXTRA_DIST += Mkfiles/vc/modules/modules.dsp
-EXTRA_DIST += Mkfiles/vc/modules/modules.mak
 EXTRA_DIST += Mkfiles/vc/modules/modules.vcproj
+EXTRA_DIST += Mkfiles/vc/re2c/re2c.vcproj
+EXTRA_DIST += Mkfiles/vc/re2c/run.bat
 
 # Until this gets fixed in automake
 DISTCLEANFILES = libyasm/stamp-h libyasm/stamp-h[0-9]*
diff --git a/Mkfiles/vc/genmacro/genmacro.vcproj b/Mkfiles/vc/genmacro/genmacro.vcproj
new file mode 100644
index 00000000..c461a1b4
--- /dev/null
+++ b/Mkfiles/vc/genmacro/genmacro.vcproj
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="genmacro"
+	ProjectGUID="{225700A5-07B8-434E-AD61-555278BF6733}"
+	RootNamespace="genmacro"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/genmacro.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/genmacro.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="run.bat $(TargetPath)"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/genmacro.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="run.bat $(TargetPath)"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\..\modules\preprocs\nasm\genmacro.c">
+			</File>
+			<File
+				RelativePath=".\run.bat">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Mkfiles/vc/genmacro/run.bat b/Mkfiles/vc/genmacro/run.bat
new file mode 100644
index 00000000..83e80ab8
--- /dev/null
+++ b/Mkfiles/vc/genmacro/run.bat
@@ -0,0 +1,2 @@
+cd ..\..\..
+%1 modules\preprocs\nasm\standard.mac
diff --git a/Mkfiles/vc/libyasm/libyasm.dep b/Mkfiles/vc/libyasm/libyasm.dep
deleted file mode 100644
index bfb1cd4c..00000000
--- a/Mkfiles/vc/libyasm/libyasm.dep
+++ /dev/null
@@ -1,181 +0,0 @@
-# Microsoft Developer Studio Generated Dependency File, included by libyasm.mak
-
-..\..\..\libyasm\arch.c : \
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\bitvect.c : \
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\bytecode.c : \
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bc-int.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr-int.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\errwarn.c : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\expr.c : \
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr-int.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\file.c : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\floatnum.c : \
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\hamt.c : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\intnum.c : \
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\linemgr.c : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\mergesort.c : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\section.c : \
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\strcasecmp.c : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\strsep.c : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\symrec.c : \
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\valparam.c : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\xmalloc.c : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
-
-..\..\..\libyasm\xstrdup.c : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\valparam.h"\
-	".\config.h"\
-	
diff --git a/Mkfiles/vc/libyasm/libyasm.dsp b/Mkfiles/vc/libyasm/libyasm.dsp
deleted file mode 100644
index 97857606..00000000
--- a/Mkfiles/vc/libyasm/libyasm.dsp
+++ /dev/null
@@ -1,268 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libyasm" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libyasm - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libyasm.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libyasm.mak" CFG="libyasm - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libyasm - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libyasm - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libyasm - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I ".." /I "../../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "libyasm - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /I "../../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libyasm - Win32 Release"
-# Name "libyasm - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\arch.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\assocdat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\bitvect.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\bytecode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\errwarn.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\expr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\file.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\floatnum.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\hamt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\intnum.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\linemgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\mergesort.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\objfmt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\section.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\strcasecmp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\strsep.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\symrec.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\valparam.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\xmalloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\xstrdup.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\arch.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\libyasm\bc-int.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\bitvect.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\bytecode.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\libyasm\compat-queue.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\coretype.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\dbgfmt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\errwarn.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\libyasm\expr-int.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\expr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\file.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\floatnum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\hamt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\intnum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\linemgr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\objfmt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\optimizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\parser.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\preproc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\section.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\symrec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\util.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\libyasm\valparam.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/Mkfiles/vc/libyasm/libyasm.mak b/Mkfiles/vc/libyasm/libyasm.mak
deleted file mode 100644
index a83d30ca..00000000
--- a/Mkfiles/vc/libyasm/libyasm.mak
+++ /dev/null
@@ -1,354 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on libyasm.dsp
-!IF "$(CFG)" == ""
-CFG=libyasm - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to libyasm - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "libyasm - Win32 Release" && "$(CFG)" != "libyasm - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libyasm.mak" CFG="libyasm - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libyasm - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libyasm - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "libyasm - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-ALL : "$(OUTDIR)\libyasm.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\arch.obj"
-	-@erase "$(INTDIR)\bitvect.obj"
-	-@erase "$(INTDIR)\bytecode.obj"
-	-@erase "$(INTDIR)\errwarn.obj"
-	-@erase "$(INTDIR)\expr.obj"
-	-@erase "$(INTDIR)\file.obj"
-	-@erase "$(INTDIR)\floatnum.obj"
-	-@erase "$(INTDIR)\hamt.obj"
-	-@erase "$(INTDIR)\intnum.obj"
-	-@erase "$(INTDIR)\linemgr.obj"
-	-@erase "$(INTDIR)\mergesort.obj"
-	-@erase "$(INTDIR)\section.obj"
-	-@erase "$(INTDIR)\strcasecmp.obj"
-	-@erase "$(INTDIR)\strsep.obj"
-	-@erase "$(INTDIR)\symrec.obj"
-	-@erase "$(INTDIR)\valparam.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\xmalloc.obj"
-	-@erase "$(INTDIR)\xstrdup.obj"
-	-@erase "$(OUTDIR)\libyasm.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I ".." /I "../../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\libyasm.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libyasm.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libyasm.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\arch.obj" \
-	"$(INTDIR)\bitvect.obj" \
-	"$(INTDIR)\bytecode.obj" \
-	"$(INTDIR)\errwarn.obj" \
-	"$(INTDIR)\expr.obj" \
-	"$(INTDIR)\file.obj" \
-	"$(INTDIR)\floatnum.obj" \
-	"$(INTDIR)\hamt.obj" \
-	"$(INTDIR)\intnum.obj" \
-	"$(INTDIR)\linemgr.obj" \
-	"$(INTDIR)\mergesort.obj" \
-	"$(INTDIR)\section.obj" \
-	"$(INTDIR)\strcasecmp.obj" \
-	"$(INTDIR)\strsep.obj" \
-	"$(INTDIR)\symrec.obj" \
-	"$(INTDIR)\valparam.obj" \
-	"$(INTDIR)\xmalloc.obj" \
-	"$(INTDIR)\xstrdup.obj"
-
-"$(OUTDIR)\libyasm.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "libyasm - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-ALL : "$(OUTDIR)\libyasm.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\arch.obj"
-	-@erase "$(INTDIR)\bitvect.obj"
-	-@erase "$(INTDIR)\bytecode.obj"
-	-@erase "$(INTDIR)\errwarn.obj"
-	-@erase "$(INTDIR)\expr.obj"
-	-@erase "$(INTDIR)\file.obj"
-	-@erase "$(INTDIR)\floatnum.obj"
-	-@erase "$(INTDIR)\hamt.obj"
-	-@erase "$(INTDIR)\intnum.obj"
-	-@erase "$(INTDIR)\linemgr.obj"
-	-@erase "$(INTDIR)\mergesort.obj"
-	-@erase "$(INTDIR)\section.obj"
-	-@erase "$(INTDIR)\strcasecmp.obj"
-	-@erase "$(INTDIR)\strsep.obj"
-	-@erase "$(INTDIR)\symrec.obj"
-	-@erase "$(INTDIR)\valparam.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(INTDIR)\xmalloc.obj"
-	-@erase "$(INTDIR)\xstrdup.obj"
-	-@erase "$(OUTDIR)\libyasm.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I ".." /I "../../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\libyasm.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libyasm.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libyasm.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\arch.obj" \
-	"$(INTDIR)\bitvect.obj" \
-	"$(INTDIR)\bytecode.obj" \
-	"$(INTDIR)\errwarn.obj" \
-	"$(INTDIR)\expr.obj" \
-	"$(INTDIR)\file.obj" \
-	"$(INTDIR)\floatnum.obj" \
-	"$(INTDIR)\hamt.obj" \
-	"$(INTDIR)\intnum.obj" \
-	"$(INTDIR)\linemgr.obj" \
-	"$(INTDIR)\mergesort.obj" \
-	"$(INTDIR)\section.obj" \
-	"$(INTDIR)\strcasecmp.obj" \
-	"$(INTDIR)\strsep.obj" \
-	"$(INTDIR)\symrec.obj" \
-	"$(INTDIR)\valparam.obj" \
-	"$(INTDIR)\xmalloc.obj" \
-	"$(INTDIR)\xstrdup.obj"
-
-"$(OUTDIR)\libyasm.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("libyasm.dep")
-!INCLUDE "libyasm.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "libyasm.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "libyasm - Win32 Release" || "$(CFG)" == "libyasm - Win32 Debug"
-SOURCE=..\..\..\libyasm\arch.c
-
-"$(INTDIR)\arch.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\bitvect.c
-
-"$(INTDIR)\bitvect.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\bytecode.c
-
-"$(INTDIR)\bytecode.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\errwarn.c
-
-"$(INTDIR)\errwarn.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\expr.c
-
-"$(INTDIR)\expr.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\file.c
-
-"$(INTDIR)\file.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\floatnum.c
-
-"$(INTDIR)\floatnum.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\hamt.c
-
-"$(INTDIR)\hamt.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\intnum.c
-
-"$(INTDIR)\intnum.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\linemgr.c
-
-"$(INTDIR)\linemgr.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\mergesort.c
-
-"$(INTDIR)\mergesort.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\section.c
-
-"$(INTDIR)\section.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\strcasecmp.c
-
-"$(INTDIR)\strcasecmp.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\strsep.c
-
-"$(INTDIR)\strsep.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\symrec.c
-
-"$(INTDIR)\symrec.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\valparam.c
-
-"$(INTDIR)\valparam.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\xmalloc.c
-
-"$(INTDIR)\xmalloc.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\libyasm\xstrdup.c
-
-"$(INTDIR)\xstrdup.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/Mkfiles/vc/modules/build.bat b/Mkfiles/vc/modules/build.bat
deleted file mode 100644
index a6be8db9..00000000
--- a/Mkfiles/vc/modules/build.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-
-set Perl= "c:\program files\perl\bin\perl"
-cd ..\..\..\modules\preprocs\nasm
-%Perl% macros.pl standard.mac
diff --git a/Mkfiles/vc/modules/modules.dep b/Mkfiles/vc/modules/modules.dep
deleted file mode 100644
index 6322e017..00000000
--- a/Mkfiles/vc/modules/modules.dep
+++ /dev/null
@@ -1,443 +0,0 @@
-# Microsoft Developer Studio Generated Dependency File, included by modules.mak
-
-..\..\..\modules\arch\x86\x86arch.c : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\arch\x86\x86arch.h"\
-	"..\libyasm\config.h"\
-	
-
-..\..\..\modules\arch\x86\x86bc.c : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bc-int.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\arch\x86\x86arch.h"\
-	"..\libyasm\config.h"\
-	
-
-..\..\..\modules\arch\x86\x86expr.c : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr-int.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\arch\x86\x86arch.h"\
-	"..\libyasm\config.h"\
-	
-
-..\..\..\x86id.c : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bc-int.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr-int.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\arch\x86\x86arch.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\modules\dbgfmts\null\null-dbgfmt.c" : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\modules\objfmts\bin\bin-objfmt.c" : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bc-int.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr-int.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\modules\objfmts\coff\coff-objfmt.c" : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bc-int.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr-int.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\modules\objfmts\dbg\dbg-objfmt.c" : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\modules\optimizers\basic\basic-optimizer.c" : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bc-int.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\nasm-bison.c" : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr-int.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\parsers\nasm\nasm-defs.h"\
-	"..\..\..\modules\parsers\nasm\nasm-parser.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\modules\parsers\nasm\nasm-parser.c" : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\parsers\nasm\nasm-parser.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\nasm-token.c" : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\parsers\nasm\nasm-defs.h"\
-	"..\..\..\modules\parsers\nasm\nasm-parser.h"\
-	"..\..\..\nasm-bison.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\modules\preprocs\nasm\nasm-eval.c" : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\preprocs\nasm\nasm-eval.h"\
-	"..\..\..\modules\preprocs\nasm\nasm.h"\
-	"..\..\..\modules\preprocs\nasm\nasmlib.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\modules\preprocs\nasm\nasm-pp.c" : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\preprocs\nasm\nasm-pp.h"\
-	"..\..\..\modules\preprocs\nasm\nasm.h"\
-	"..\..\..\modules\preprocs\nasm\nasmlib.h"\
-	"..\..\..\nasm-macros.c"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\modules\preprocs\nasm\nasm-preproc.c" : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\preprocs\nasm\nasm-eval.h"\
-	"..\..\..\modules\preprocs\nasm\nasm-pp.h"\
-	"..\..\..\modules\preprocs\nasm\nasm.h"\
-	"..\..\..\modules\preprocs\nasm\nasmlib.h"\
-	"..\libyasm\config.h"\
-	
-
-..\..\..\modules\preprocs\nasm\nasmlib.c : \
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\preprocs\nasm\nasm.h"\
-	"..\..\..\modules\preprocs\nasm\nasmlib.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\modules\preprocs\yapp\yapp-preproc.c" : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\preprocs\yapp\yapp-preproc.h"\
-	"..\..\..\modules\preprocs\yapp\yapp-token.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\yapp-token.c" : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\..\..\modules\preprocs\yapp\yapp-preproc.h"\
-	"..\..\..\modules\preprocs\yapp\yapp-token.h"\
-	"..\libyasm\config.h"\
-	
-
-"..\..\..\modules\preprocs\raw\raw-preproc.c" : \
-	"..\..\..\libyasm.h"\
-	"..\..\..\libyasm\arch.h"\
-	"..\..\..\libyasm\bitvect.h"\
-	"..\..\..\libyasm\bytecode.h"\
-	"..\..\..\libyasm\compat-queue.h"\
-	"..\..\..\libyasm\coretype.h"\
-	"..\..\..\libyasm\dbgfmt.h"\
-	"..\..\..\libyasm\errwarn.h"\
-	"..\..\..\libyasm\expr.h"\
-	"..\..\..\libyasm\file.h"\
-	"..\..\..\libyasm\floatnum.h"\
-	"..\..\..\libyasm\hamt.h"\
-	"..\..\..\libyasm\intnum.h"\
-	"..\..\..\libyasm\linemgr.h"\
-	"..\..\..\libyasm\objfmt.h"\
-	"..\..\..\libyasm\optimizer.h"\
-	"..\..\..\libyasm\preproc.h"\
-	"..\..\..\libyasm\section.h"\
-	"..\..\..\libyasm\symrec.h"\
-	"..\..\..\libyasm\valparam.h"\
-	"..\libyasm\config.h"\
-	
diff --git a/Mkfiles/vc/modules/modules.dsp b/Mkfiles/vc/modules/modules.dsp
deleted file mode 100644
index fe2c5526..00000000
--- a/Mkfiles/vc/modules/modules.dsp
+++ /dev/null
@@ -1,252 +0,0 @@
-# Microsoft Developer Studio Project File - Name="modules" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=modules - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "modules.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "modules.mak" CFG="modules - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "modules - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "modules - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "modules - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I ".." /I "../../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "modules - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /I "../../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "modules - Win32 Release"
-# Name "modules - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "arch"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\modules\arch\lc3b\lc3barch.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\modules\arch\lc3b\lc3barch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\modules\arch\lc3b\lc3bbc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\lc3bid.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\modules\arch\x86\x86arch.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\modules\arch\x86\x86arch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\modules\arch\x86\x86bc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\modules\arch\x86\x86expr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\x86id.c
-# End Source File
-# End Group
-# Begin Group "dbgfmts"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\..\..\modules\dbgfmts\null\null-dbgfmt.c"
-# End Source File
-# End Group
-# Begin Group "objfmts"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\..\..\modules\objfmts\bin\bin-objfmt.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\modules\objfmts\coff\coff-objfmt.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\modules\objfmts\dbg\dbg-objfmt.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\modules\objfmts\elf\elf-objfmt.c"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\modules\objfmts\elf\elf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\modules\objfmts\elf\elf.h
-# End Source File
-# End Group
-# Begin Group "optimizers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\..\..\modules\optimizers\basic\basic-optimizer.c"
-# End Source File
-# End Group
-# Begin Group "parsers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\..\..\nasm-bison.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\nasm-bison.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\modules\parsers\nasm\nasm-defs.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\modules\parsers\nasm\nasm-parser.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\modules\parsers\nasm\nasm-parser.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\nasm-token.c"
-# End Source File
-# End Group
-# Begin Group "preprocs"
-
-# PROP Default_Filter ""
-# Begin Group "nasm"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\..\..\modules\preprocs\nasm\nasm-eval.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\modules\preprocs\nasm\nasm-eval.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\nasm-macros.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\modules\preprocs\nasm\nasm-pp.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\modules\preprocs\nasm\nasm-pp.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\modules\preprocs\nasm\nasm-preproc.c"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\modules\preprocs\nasm\nasm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\modules\preprocs\nasm\nasmlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\modules\preprocs\nasm\nasmlib.h
-# End Source File
-# End Group
-# Begin Group "raw"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\..\..\modules\preprocs\raw\raw-preproc.c"
-# End Source File
-# End Group
-# End Group
-# End Group
-# End Target
-# End Project
diff --git a/Mkfiles/vc/modules/modules.mak b/Mkfiles/vc/modules/modules.mak
deleted file mode 100644
index 0684a8bd..00000000
--- a/Mkfiles/vc/modules/modules.mak
+++ /dev/null
@@ -1,454 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on modules.dsp
-!IF "$(CFG)" == ""
-CFG=modules - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to modules - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "modules - Win32 Release" && "$(CFG)" != "modules - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "modules.mak" CFG="modules - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "modules - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "modules - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "modules - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\modules.lib"
-
-!ELSE 
-
-ALL : "libyasm - Win32 Release" "$(OUTDIR)\modules.lib"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libyasm - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\basic-optimizer.obj"
-	-@erase "$(INTDIR)\bin-objfmt.obj"
-	-@erase "$(INTDIR)\coff-objfmt.obj"
-	-@erase "$(INTDIR)\dbg-objfmt.obj"
-	-@erase "$(INTDIR)\elf-objfmt.obj"
-	-@erase "$(INTDIR)\elf.obj"
-	-@erase "$(INTDIR)\lc3barch.obj"
-	-@erase "$(INTDIR)\lc3bbc.obj"
-	-@erase "$(INTDIR)\lc3bid.obj"
-	-@erase "$(INTDIR)\nasm-bison.obj"
-	-@erase "$(INTDIR)\nasm-eval.obj"
-	-@erase "$(INTDIR)\nasm-macros.obj"
-	-@erase "$(INTDIR)\nasm-parser.obj"
-	-@erase "$(INTDIR)\nasm-pp.obj"
-	-@erase "$(INTDIR)\nasm-preproc.obj"
-	-@erase "$(INTDIR)\nasm-token.obj"
-	-@erase "$(INTDIR)\nasmlib.obj"
-	-@erase "$(INTDIR)\null-dbgfmt.obj"
-	-@erase "$(INTDIR)\raw-preproc.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\x86arch.obj"
-	-@erase "$(INTDIR)\x86bc.obj"
-	-@erase "$(INTDIR)\x86expr.obj"
-	-@erase "$(INTDIR)\x86id.obj"
-	-@erase "$(OUTDIR)\modules.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I ".." /I "../../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\modules.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\modules.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\modules.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\x86arch.obj" \
-	"$(INTDIR)\x86bc.obj" \
-	"$(INTDIR)\x86expr.obj" \
-	"$(INTDIR)\x86id.obj" \
-	"$(INTDIR)\null-dbgfmt.obj" \
-	"$(INTDIR)\bin-objfmt.obj" \
-	"$(INTDIR)\coff-objfmt.obj" \
-	"$(INTDIR)\dbg-objfmt.obj" \
-	"$(INTDIR)\basic-optimizer.obj" \
-	"$(INTDIR)\nasm-bison.obj" \
-	"$(INTDIR)\nasm-parser.obj" \
-	"$(INTDIR)\nasm-token.obj" \
-	"$(INTDIR)\nasm-eval.obj" \
-	"$(INTDIR)\nasm-macros.obj" \
-	"$(INTDIR)\nasm-pp.obj" \
-	"$(INTDIR)\nasm-preproc.obj" \
-	"$(INTDIR)\nasmlib.obj" \
-	"$(INTDIR)\raw-preproc.obj" \
-	"$(INTDIR)\lc3bbc.obj" \
-	"$(INTDIR)\lc3barch.obj" \
-	"$(INTDIR)\lc3bid.obj" \
-	"$(INTDIR)\elf-objfmt.obj" \
-	"$(INTDIR)\elf.obj" \
-	"..\libyasm\Release\libyasm.lib"
-
-"$(OUTDIR)\modules.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "modules - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\modules.lib"
-
-!ELSE 
-
-ALL : "libyasm - Win32 Debug" "$(OUTDIR)\modules.lib"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libyasm - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\basic-optimizer.obj"
-	-@erase "$(INTDIR)\bin-objfmt.obj"
-	-@erase "$(INTDIR)\coff-objfmt.obj"
-	-@erase "$(INTDIR)\dbg-objfmt.obj"
-	-@erase "$(INTDIR)\elf-objfmt.obj"
-	-@erase "$(INTDIR)\elf.obj"
-	-@erase "$(INTDIR)\lc3barch.obj"
-	-@erase "$(INTDIR)\lc3bbc.obj"
-	-@erase "$(INTDIR)\lc3bid.obj"
-	-@erase "$(INTDIR)\nasm-bison.obj"
-	-@erase "$(INTDIR)\nasm-eval.obj"
-	-@erase "$(INTDIR)\nasm-macros.obj"
-	-@erase "$(INTDIR)\nasm-parser.obj"
-	-@erase "$(INTDIR)\nasm-pp.obj"
-	-@erase "$(INTDIR)\nasm-preproc.obj"
-	-@erase "$(INTDIR)\nasm-token.obj"
-	-@erase "$(INTDIR)\nasmlib.obj"
-	-@erase "$(INTDIR)\null-dbgfmt.obj"
-	-@erase "$(INTDIR)\raw-preproc.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(INTDIR)\x86arch.obj"
-	-@erase "$(INTDIR)\x86bc.obj"
-	-@erase "$(INTDIR)\x86expr.obj"
-	-@erase "$(INTDIR)\x86id.obj"
-	-@erase "$(OUTDIR)\modules.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I ".." /I "../../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\modules.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\modules.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\modules.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\x86arch.obj" \
-	"$(INTDIR)\x86bc.obj" \
-	"$(INTDIR)\x86expr.obj" \
-	"$(INTDIR)\x86id.obj" \
-	"$(INTDIR)\null-dbgfmt.obj" \
-	"$(INTDIR)\bin-objfmt.obj" \
-	"$(INTDIR)\coff-objfmt.obj" \
-	"$(INTDIR)\dbg-objfmt.obj" \
-	"$(INTDIR)\basic-optimizer.obj" \
-	"$(INTDIR)\nasm-bison.obj" \
-	"$(INTDIR)\nasm-parser.obj" \
-	"$(INTDIR)\nasm-token.obj" \
-	"$(INTDIR)\nasm-eval.obj" \
-	"$(INTDIR)\nasm-macros.obj" \
-	"$(INTDIR)\nasm-pp.obj" \
-	"$(INTDIR)\nasm-preproc.obj" \
-	"$(INTDIR)\nasmlib.obj" \
-	"$(INTDIR)\raw-preproc.obj" \
-	"$(INTDIR)\lc3bbc.obj" \
-	"$(INTDIR)\lc3barch.obj" \
-	"$(INTDIR)\lc3bid.obj" \
-	"$(INTDIR)\elf-objfmt.obj" \
-	"$(INTDIR)\elf.obj" \
-	"..\libyasm\Debug\libyasm.lib"
-
-"$(OUTDIR)\modules.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("modules.dep")
-!INCLUDE "modules.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "modules.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "modules - Win32 Release" || "$(CFG)" == "modules - Win32 Debug"
-SOURCE=..\..\..\modules\arch\lc3b\lc3barch.c
-
-"$(INTDIR)\lc3barch.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\modules\arch\lc3b\lc3bbc.c
-
-"$(INTDIR)\lc3bbc.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\lc3bid.c
-
-"$(INTDIR)\lc3bid.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\modules\arch\x86\x86arch.c
-
-"$(INTDIR)\x86arch.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\modules\arch\x86\x86bc.c
-
-"$(INTDIR)\x86bc.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\modules\arch\x86\x86expr.c
-
-"$(INTDIR)\x86expr.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\x86id.c
-
-"$(INTDIR)\x86id.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\modules\dbgfmts\null\null-dbgfmt.c"
-
-"$(INTDIR)\null-dbgfmt.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\modules\objfmts\bin\bin-objfmt.c"
-
-"$(INTDIR)\bin-objfmt.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\modules\objfmts\coff\coff-objfmt.c"
-
-"$(INTDIR)\coff-objfmt.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\modules\objfmts\dbg\dbg-objfmt.c"
-
-"$(INTDIR)\dbg-objfmt.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\modules\objfmts\elf\elf-objfmt.c"
-
-"$(INTDIR)\elf-objfmt.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\modules\objfmts\elf\elf.c
-
-"$(INTDIR)\elf.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\modules\optimizers\basic\basic-optimizer.c"
-
-"$(INTDIR)\basic-optimizer.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\nasm-bison.c"
-
-"$(INTDIR)\nasm-bison.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\modules\parsers\nasm\nasm-parser.c"
-
-"$(INTDIR)\nasm-parser.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\nasm-token.c"
-
-"$(INTDIR)\nasm-token.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\modules\preprocs\nasm\nasm-eval.c"
-
-"$(INTDIR)\nasm-eval.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\nasm-macros.c"
-
-"$(INTDIR)\nasm-macros.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\modules\preprocs\nasm\nasm-pp.c"
-
-"$(INTDIR)\nasm-pp.obj" : $(SOURCE) "$(INTDIR)" "..\..\..\nasm-macros.c"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\modules\preprocs\nasm\nasm-preproc.c"
-
-"$(INTDIR)\nasm-preproc.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\..\modules\preprocs\nasm\nasmlib.c
-
-"$(INTDIR)\nasmlib.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE="..\..\..\modules\preprocs\raw\raw-preproc.c"
-
-"$(INTDIR)\raw-preproc.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!IF  "$(CFG)" == "modules - Win32 Release"
-
-"libyasm - Win32 Release" : 
-   cd "\cygwin\home\Pete\yasm\yasm\Mkfiles\vc\libyasm"
-   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Release" 
-   cd "..\modules"
-
-"libyasm - Win32 ReleaseCLEAN" : 
-   cd "\cygwin\home\Pete\yasm\yasm\Mkfiles\vc\libyasm"
-   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\modules"
-
-!ELSEIF  "$(CFG)" == "modules - Win32 Debug"
-
-"libyasm - Win32 Debug" : 
-   cd "\cygwin\home\Pete\yasm\yasm\Mkfiles\vc\libyasm"
-   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Debug" 
-   cd "..\modules"
-
-"libyasm - Win32 DebugCLEAN" : 
-   cd "\cygwin\home\Pete\yasm\yasm\Mkfiles\vc\libyasm"
-   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\modules"
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/Mkfiles/vc/modules/modules.vcproj b/Mkfiles/vc/modules/modules.vcproj
index 0184a8c2..ad3d4836 100644
--- a/Mkfiles/vc/modules/modules.vcproj
+++ b/Mkfiles/vc/modules/modules.vcproj
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="modules"
+	RootNamespace="modules"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -98,8 +99,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="cmd &lt;build.bat"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -122,9 +122,6 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath=".\build.bat">
-			</File>
 			<Filter
 				Name="arch"
 				Filter="">
@@ -536,7 +533,7 @@
 						RelativePath="..\..\..\modules\preprocs\nasm\nasm-eval.h">
 					</File>
 					<File
-						RelativePath="..\..\..\modules\preprocs\nasm\nasm-macros.c">
+						RelativePath="..\..\..\nasm-macros.c">
 					</File>
 					<File
 						RelativePath="..\..\..\modules\preprocs\nasm\nasm-pp.c">
diff --git a/Mkfiles/vc/re2c/re2c.vcproj b/Mkfiles/vc/re2c/re2c.vcproj
new file mode 100644
index 00000000..17096158
--- /dev/null
+++ b/Mkfiles/vc/re2c/re2c.vcproj
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="re2c"
+	ProjectGUID="{3C58BE13-50A3-4583-984D-D8902B3D7713}"
+	RootNamespace="re2c"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..,../../.."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/re2c.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/re2c.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="run.bat $(TargetPath)"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..,../../.."
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/re2c.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="run.bat $(TargetPath)"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\..\tools\re2c\actions.c">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\code.c">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\dfa.c">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\main.c">
+			</File>
+			<File
+				RelativePath="..\..\..\re2c-parser.c">
+			</File>
+			<File
+				RelativePath="..\..\..\re2c-parser.h">
+			</File>
+			<File
+				RelativePath=".\run.bat">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\scanner.c">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\substr.c">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\translate.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\..\..\tools\re2c\basics.h">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\dfa.h">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\globals.h">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\ins.h">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\parse.h">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\re.h">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\scanner.h">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\substr.h">
+			</File>
+			<File
+				RelativePath="..\..\..\tools\re2c\token.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Mkfiles/vc/re2c/run.bat b/Mkfiles/vc/re2c/run.bat
new file mode 100644
index 00000000..2615ea18
--- /dev/null
+++ b/Mkfiles/vc/re2c/run.bat
@@ -0,0 +1,4 @@
+cd ..\..\..\
+%1 -s modules\arch\lc3b\lc3bid.re > lc3bid.c
+%1 -s modules\arch\x86\x86id.re > x86id.c
+%1 -s modules\parsers\nasm\nasm-token.re > nasm-token.c
diff --git a/Mkfiles/vc/yasm.dep b/Mkfiles/vc/yasm.dep
deleted file mode 100644
index 3a765098..00000000
--- a/Mkfiles/vc/yasm.dep
+++ /dev/null
@@ -1,504 +0,0 @@
-# Microsoft Developer Studio Generated Dependency File, included by yasm.mak
-
-..\..\src\arch\x86\x86arch.c : \
-	"..\..\src\arch.h"\
-	"..\..\src\arch\x86\x86arch.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\file.h"\
-	"..\..\src\floatnum.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\arch\x86\x86bc.c : \
-	"..\..\src\arch.h"\
-	"..\..\src\arch\x86\x86arch.h"\
-	"..\..\src\bc-int.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\file.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\arch\x86\x86expr.c : \
-	"..\..\src\arch.h"\
-	"..\..\src\arch\x86\x86arch.h"\
-	"..\..\src\bitvect.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr-int.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\floatnum.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\src\dbgfmts\null\null-dbgfmt.c" : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\dbgfmt.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\src\objfmts\bin\bin-objfmt.c" : \
-	"..\..\src\arch.h"\
-	"..\..\src\bc-int.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr-int.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\file.h"\
-	"..\..\src\floatnum.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\objfmt.h"\
-	"..\..\src\section.h"\
-	"..\..\src\symrec.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\src\objfmts\coff\coff-objfmt.c" : \
-	"..\..\src\arch.h"\
-	"..\..\src\bc-int.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr-int.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\file.h"\
-	"..\..\src\floatnum.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\objfmt.h"\
-	"..\..\src\section.h"\
-	"..\..\src\symrec.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\src\objfmts\dbg\dbg-objfmt.c" : \
-	"..\..\src\arch.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\dbgfmt.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\objfmt.h"\
-	"..\..\src\section.h"\
-	"..\..\src\symrec.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\src\optimizers\basic\basic-optimizer.c" : \
-	"..\..\src\bc-int.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\optimizer.h"\
-	"..\..\src\section.h"\
-	"..\..\src\symrec.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\src\parsers\nasm\nasm-parser.c" : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\objfmt.h"\
-	"..\..\src\parsers\nasm\nasm-parser.h"\
-	"..\..\src\preproc.h"\
-	"..\..\src\section.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\src\preprocs\nasm\nasm-eval.c" : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\preprocs\nasm\nasm-eval.h"\
-	"..\..\src\preprocs\nasm\nasm.h"\
-	"..\..\src\preprocs\nasm\nasmlib.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\src\preprocs\nasm\nasm-pp.c" : \
-	"..\..\nasm-macros.c"\
-	"..\..\src\preprocs\nasm\nasm-pp.h"\
-	"..\..\src\preprocs\nasm\nasm.h"\
-	"..\..\src\preprocs\nasm\nasmlib.h"\
-	"..\..\src\valparam.h"\
-	
-
-"..\..\src\preprocs\nasm\nasm-preproc.c" : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\linemgr.h"\
-	"..\..\src\preproc.h"\
-	"..\..\src\preprocs\nasm\nasm-eval.h"\
-	"..\..\src\preprocs\nasm\nasm-pp.h"\
-	"..\..\src\preprocs\nasm\nasm.h"\
-	"..\..\src\preprocs\nasm\nasmlib.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\preprocs\nasm\nasmlib.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\preprocs\nasm\nasm.h"\
-	"..\..\src\preprocs\nasm\nasmlib.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\src\preprocs\raw\raw-preproc.c" : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\linemgr.h"\
-	"..\..\src\preproc.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\src\preprocs\yapp\yapp-preproc.c" : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\hamt.h"\
-	"..\..\src\linemgr.h"\
-	"..\..\src\preproc.h"\
-	"..\..\src\preprocs\yapp\yapp-preproc.h"\
-	"..\..\src\preprocs\yapp\yapp-token.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\nasm-bison.c" : \
-	"..\..\src\arch.h"\
-	"..\..\src\bitvect.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr-int.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\floatnum.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\linemgr.h"\
-	"..\..\src\objfmt.h"\
-	"..\..\src\parsers\nasm\nasm-defs.h"\
-	"..\..\src\parsers\nasm\nasm-parser.h"\
-	"..\..\src\section.h"\
-	"..\..\src\symrec.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\nasm-token.c" : \
-	"..\..\nasm-bison.h"\
-	"..\..\src\arch.h"\
-	"..\..\src\bitvect.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\floatnum.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\linemgr.h"\
-	"..\..\src\parsers\nasm\nasm-defs.h"\
-	"..\..\src\parsers\nasm\nasm-parser.h"\
-	"..\..\src\symrec.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\x86id.c : \
-	"..\..\src\arch.h"\
-	"..\..\src\arch\x86\x86arch.h"\
-	"..\..\src\bc-int.h"\
-	"..\..\src\bitvect.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr-int.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\floatnum.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\symrec.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-"..\..\yapp-token.c" : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\linemgr.h"\
-	"..\..\src\preprocs\yapp\yapp-preproc.h"\
-	"..\..\src\preprocs\yapp\yapp-token.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\arch.c : \
-	"..\..\src\arch.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\bitvect.c : \
-	"..\..\src\bitvect.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\bytecode.c : \
-	"..\..\src\arch.h"\
-	"..\..\src\bc-int.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr-int.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\file.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\objfmt.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\errwarn.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\linemgr.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\expr.c : \
-	"..\..\src\arch.h"\
-	"..\..\src\bitvect.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr-int.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\floatnum.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\section.h"\
-	"..\..\src\symrec.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\file.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\file.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\floatnum.c : \
-	"..\..\src\bitvect.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\file.h"\
-	"..\..\src\floatnum.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\hamt.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\hamt.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\intnum.c : \
-	"..\..\src\bitvect.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\file.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\linemgr.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\hamt.h"\
-	"..\..\src\linemgr.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\main.c : \
-	"..\..\src\arch.h"\
-	"..\..\src\bitvect.h"\
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\dbgfmt.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\file.h"\
-	"..\..\src\floatnum.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\linemgr.h"\
-	"..\..\src\module.h"\
-	"..\..\src\objfmt.h"\
-	"..\..\src\optimizer.h"\
-	"..\..\src\options.h"\
-	"..\..\src\preproc.h"\
-	"..\..\src\section.h"\
-	"..\..\src\symrec.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\mergesort.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-.\module.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\module.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\objfmt.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\module.h"\
-	"..\..\src\objfmt.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\options.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\options.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\parser.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\module.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\section.c : \
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\intnum.h"\
-	"..\..\src\objfmt.h"\
-	"..\..\src\section.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\strcasecmp.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\strsep.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\symrec.c : \
-	"..\..\src\bytecode.h"\
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\errwarn.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\floatnum.h"\
-	"..\..\src\hamt.h"\
-	"..\..\src\objfmt.h"\
-	"..\..\src\section.h"\
-	"..\..\src\symrec.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\valparam.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\expr.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\xmalloc.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
-
-..\..\src\xstrdup.c : \
-	"..\..\src\compat-queue.h"\
-	"..\..\src\coretype.h"\
-	"..\..\src\valparam.h"\
-	".\config.h"\
-	
diff --git a/Mkfiles/vc/yasm.dsp b/Mkfiles/vc/yasm.dsp
deleted file mode 100644
index fdb70d13..00000000
--- a/Mkfiles/vc/yasm.dsp
+++ /dev/null
@@ -1,118 +0,0 @@
-# Microsoft Developer Studio Project File - Name="yasm" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=yasm - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "yasm.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "yasm.mak" CFG="yasm - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "yasm - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "yasm - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "yasm - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "." /I "../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "yasm - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "../.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "yasm - Win32 Release"
-# Name "yasm - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=".\yasm-module.c"
-# ADD CPP /I "../../frontends/yasm"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\frontends\yasm\yasm-module.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\frontends\yasm\yasm-options.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\frontends\yasm\yasm-options.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\frontends\yasm\yasm.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/Mkfiles/vc/yasm.dsw b/Mkfiles/vc/yasm.dsw
deleted file mode 100644
index 827e51f6..00000000
--- a/Mkfiles/vc/yasm.dsw
+++ /dev/null
@@ -1,62 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "libyasm"=.\libyasm\libyasm.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "modules"=.\modules\modules.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libyasm
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "yasm"=.\yasm.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libyasm
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name modules
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/Mkfiles/vc/yasm.mak b/Mkfiles/vc/yasm.mak
deleted file mode 100644
index 9f4902ac..00000000
--- a/Mkfiles/vc/yasm.mak
+++ /dev/null
@@ -1,302 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on yasm.dsp
-!IF "$(CFG)" == ""
-CFG=yasm - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to yasm - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "yasm - Win32 Release" && "$(CFG)" != "yasm - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "yasm.mak" CFG="yasm - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "yasm - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "yasm - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "yasm - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\yasm.exe"
-
-!ELSE 
-
-ALL : "modules - Win32 Release" "libyasm - Win32 Release" "$(OUTDIR)\yasm.exe"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libyasm - Win32 ReleaseCLEAN" "modules - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\yasm-module.obj"
-	-@erase "$(INTDIR)\yasm-options.obj"
-	-@erase "$(INTDIR)\yasm.obj"
-	-@erase "$(OUTDIR)\yasm.exe"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "." /I "../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\yasm.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\yasm.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\yasm.pdb" /machine:I386 /out:"$(OUTDIR)\yasm.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\yasm-module.obj" \
-	"$(INTDIR)\yasm-options.obj" \
-	"$(INTDIR)\yasm.obj" \
-	".\libyasm\Release\libyasm.lib" \
-	".\modules\Release\modules.lib"
-
-"$(OUTDIR)\yasm.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "yasm - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\yasm.exe"
-
-!ELSE 
-
-ALL : "modules - Win32 Debug" "libyasm - Win32 Debug" "$(OUTDIR)\yasm.exe"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libyasm - Win32 DebugCLEAN" "modules - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(INTDIR)\yasm-module.obj"
-	-@erase "$(INTDIR)\yasm-options.obj"
-	-@erase "$(INTDIR)\yasm.obj"
-	-@erase "$(OUTDIR)\yasm.exe"
-	-@erase "$(OUTDIR)\yasm.ilk"
-	-@erase "$(OUTDIR)\yasm.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "." /I "../.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\yasm.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\yasm.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\yasm.pdb" /debug /machine:I386 /out:"$(OUTDIR)\yasm.exe" /pdbtype:sept 
-LINK32_OBJS= \
-	"$(INTDIR)\yasm-module.obj" \
-	"$(INTDIR)\yasm-options.obj" \
-	"$(INTDIR)\yasm.obj" \
-	".\libyasm\Debug\libyasm.lib" \
-	".\modules\Debug\modules.lib"
-
-"$(OUTDIR)\yasm.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("yasm.dep")
-!INCLUDE "yasm.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "yasm.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "yasm - Win32 Release" || "$(CFG)" == "yasm - Win32 Debug"
-SOURCE=".\yasm-module.c"
-
-!IF  "$(CFG)" == "yasm - Win32 Release"
-
-CPP_SWITCHES=/nologo /ML /W3 /GX /O2 /I "." /I "../.." /I "../../frontends/yasm" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\yasm.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\yasm-module.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "yasm - Win32 Debug"
-
-CPP_SWITCHES=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "." /I "../.." /I "../../frontends/yasm" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\yasm.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-"$(INTDIR)\yasm-module.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE="..\..\frontends\yasm\yasm-options.c"
-
-"$(INTDIR)\yasm-options.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\frontends\yasm\yasm.c
-
-"$(INTDIR)\yasm.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!IF  "$(CFG)" == "yasm - Win32 Release"
-
-"libyasm - Win32 Release" : 
-   cd ".\libyasm"
-   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Release" 
-   cd ".."
-
-"libyasm - Win32 ReleaseCLEAN" : 
-   cd ".\libyasm"
-   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Release" RECURSE=1 CLEAN 
-   cd ".."
-
-!ELSEIF  "$(CFG)" == "yasm - Win32 Debug"
-
-"libyasm - Win32 Debug" : 
-   cd ".\libyasm"
-   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Debug" 
-   cd ".."
-
-"libyasm - Win32 DebugCLEAN" : 
-   cd ".\libyasm"
-   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".."
-
-!ENDIF 
-
-!IF  "$(CFG)" == "yasm - Win32 Release"
-
-"modules - Win32 Release" : 
-   cd ".\modules"
-   $(MAKE) /$(MAKEFLAGS) /F .\modules.mak CFG="modules - Win32 Release" 
-   cd ".."
-
-"modules - Win32 ReleaseCLEAN" : 
-   cd ".\modules"
-   $(MAKE) /$(MAKEFLAGS) /F .\modules.mak CFG="modules - Win32 Release" RECURSE=1 CLEAN 
-   cd ".."
-
-!ELSEIF  "$(CFG)" == "yasm - Win32 Debug"
-
-"modules - Win32 Debug" : 
-   cd ".\modules"
-   $(MAKE) /$(MAKEFLAGS) /F .\modules.mak CFG="modules - Win32 Debug" 
-   cd ".."
-
-"modules - Win32 DebugCLEAN" : 
-   cd ".\modules"
-   $(MAKE) /$(MAKEFLAGS) /F .\modules.mak CFG="modules - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".."
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/Mkfiles/vc/yasm.sln b/Mkfiles/vc/yasm.sln
index e80e176f..4427f204 100644
--- a/Mkfiles/vc/yasm.sln
+++ b/Mkfiles/vc/yasm.sln
@@ -5,13 +5,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyasm", "libyasm\libyasm.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modules", "modules\modules.vcproj", "{D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6}"
 	ProjectSection(ProjectDependencies) = postProject
+		{3C58BE13-50A3-4583-984D-D8902B3D7713} = {3C58BE13-50A3-4583-984D-D8902B3D7713}
 		{29FE7874-1256-4AD6-B889-68E399DC9608} = {29FE7874-1256-4AD6-B889-68E399DC9608}
+		{225700A5-07B8-434E-AD61-555278BF6733} = {225700A5-07B8-434E-AD61-555278BF6733}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm", "yasm.vcproj", "{34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6} = {D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6}
 		{29FE7874-1256-4AD6-B889-68E399DC9608} = {29FE7874-1256-4AD6-B889-68E399DC9608}
+		{D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6} = {D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genmacro", "genmacro\genmacro.vcproj", "{225700A5-07B8-434E-AD61-555278BF6733}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "re2c", "re2c\re2c.vcproj", "{3C58BE13-50A3-4583-984D-D8902B3D7713}"
+	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
 Global
@@ -32,6 +42,14 @@ Global
 		{34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}.Debug.Build.0 = Debug|Win32
 		{34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}.Release.ActiveCfg = Release|Win32
 		{34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}.Release.Build.0 = Release|Win32
+		{225700A5-07B8-434E-AD61-555278BF6733}.Debug.ActiveCfg = Debug|Win32
+		{225700A5-07B8-434E-AD61-555278BF6733}.Debug.Build.0 = Debug|Win32
+		{225700A5-07B8-434E-AD61-555278BF6733}.Release.ActiveCfg = Release|Win32
+		{225700A5-07B8-434E-AD61-555278BF6733}.Release.Build.0 = Release|Win32
+		{3C58BE13-50A3-4583-984D-D8902B3D7713}.Debug.ActiveCfg = Debug|Win32
+		{3C58BE13-50A3-4583-984D-D8902B3D7713}.Debug.Build.0 = Debug|Win32
+		{3C58BE13-50A3-4583-984D-D8902B3D7713}.Release.ActiveCfg = Release|Win32
+		{3C58BE13-50A3-4583-984D-D8902B3D7713}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/Mkfiles/vc/yasm.suo b/Mkfiles/vc/yasm.suo
deleted file mode 100644
index c9bb5f09..00000000
Binary files a/Mkfiles/vc/yasm.suo and /dev/null differ
diff --git a/tools/re2c/code.c b/tools/re2c/code.c
index cd9787d7..c4192f27 100644
--- a/tools/re2c/code.c
+++ b/tools/re2c/code.c
@@ -484,25 +484,25 @@ static void SCC_destroy(SCC*);
 static void SCC_delete(SCC*);
 static void SCC_traverse(SCC*, State*);
 
-static inline void
+static void
 SCC_init(SCC *s, unsigned int size)
 {
     s->top = s->stk = malloc(sizeof(State*)*size);
 }
 
-static inline SCC *
+static SCC *
 SCC_new(unsigned int size){
     SCC *s = malloc(sizeof(SCC));
     s->top = s->stk = malloc(sizeof(State*)*size);
     return s;
 }
 
-static inline void
+static void
 SCC_destroy(SCC *s){
     free(s->stk);
 }
 
-static inline void
+static void
 SCC_delete(SCC *s){
     free(s->stk);
     free(s);
diff --git a/tools/re2c/dfa.h b/tools/re2c/dfa.h
index 24db87f0..aaf3fe3d 100644
--- a/tools/re2c/dfa.h
+++ b/tools/re2c/dfa.h
@@ -96,7 +96,7 @@ void DFA_findSCCs(DFA*);
 void DFA_emit(DFA*, FILE *);
 void DFA_out(FILE *, const DFA*);
 
-static inline Action *
+static Action *
 Action_new_Match(State *s)
 {
     Action *a = malloc(sizeof(Action));
@@ -106,7 +106,7 @@ Action_new_Match(State *s)
     return a;
 }
 
-static inline Action *
+static Action *
 Action_new_Enter(State *s, unsigned int l)
 {
     Action *a = malloc(sizeof(Action));
@@ -117,7 +117,7 @@ Action_new_Enter(State *s, unsigned int l)
     return a;
 }
 
-static inline Action *
+static Action *
 Action_new_Save(State *s, unsigned int i)
 {
     Action *a = malloc(sizeof(Action));
@@ -128,7 +128,7 @@ Action_new_Save(State *s, unsigned int i)
     return a;
 }
 
-static inline Action *
+static Action *
 Action_new_Move(State *s)
 {
     Action *a = malloc(sizeof(Action));
@@ -140,7 +140,7 @@ Action_new_Move(State *s)
 
 Action *Action_new_Accept(State*, unsigned int, unsigned int*, State**);
 
-static inline Action *
+static Action *
 Action_new_Rule(State *s, RegExp *r) /* RuleOp */
 {
     Action *a = malloc(sizeof(Action));
diff --git a/tools/re2c/ins.h b/tools/re2c/ins.h
index 4bf447d0..ba6c0870 100644
--- a/tools/re2c/ins.h
+++ b/tools/re2c/ins.h
@@ -25,15 +25,15 @@ typedef union Ins {
     }			c;
 } Ins;
 
-static inline int isMarked(Ins *i){
+static int isMarked(Ins *i){
     return i->i.marked != 0;
 }
 
-static inline void mark(Ins *i){
+static void mark(Ins *i){
     i->i.marked = 1;
 }
 
-static inline void unmark(Ins *i){
+static void unmark(Ins *i){
     i->i.marked = 0;
 }
 
diff --git a/tools/re2c/parse.h b/tools/re2c/parse.h
index 3588398e..92077cac 100644
--- a/tools/re2c/parse.h
+++ b/tools/re2c/parse.h
@@ -12,13 +12,13 @@ typedef struct Symbol {
 } Symbol;
 
 void Symbol_init(Symbol *, const SubStr*);
-static inline Symbol *Symbol_new(const SubStr*);
+static Symbol *Symbol_new(const SubStr*);
 Symbol *Symbol_find(const SubStr*);
 
 void line_source(FILE *, unsigned int);
 void parse(FILE *, FILE *);
 
-static inline Symbol *
+static Symbol *
 Symbol_new(const SubStr *str)
 {
     Symbol *r = malloc(sizeof(Symbol));
diff --git a/tools/re2c/re.h b/tools/re2c/re.h
index 9503897e..99052add 100644
--- a/tools/re2c/re.h
+++ b/tools/re2c/re.h
@@ -23,7 +23,7 @@ typedef struct Range {
     unsigned int	lb, ub;		/* [lb,ub) */
 } Range;
 
-static inline void
+static void
 Range_init(Range *r, unsigned int l, unsigned int u)
 {
     r->next = NULL;
@@ -31,7 +31,7 @@ Range_init(Range *r, unsigned int l, unsigned int u)
     r->ub = u;
 }
 
-static inline Range *
+static Range *
 Range_new(unsigned int l, unsigned int u)
 {
     Range *r = malloc(sizeof(Range));
@@ -41,7 +41,7 @@ Range_new(unsigned int l, unsigned int u)
     return r;
 }
 
-static inline void
+static void
 Range_copy(Range *ro, const Range *r)
 {
     ro->next = NULL;
@@ -49,7 +49,7 @@ Range_copy(Range *ro, const Range *r)
     ro->ub = r->ub;
 }
 
-static inline Range *
+static Range *
 Range_new_copy(Range *r)
 {
     Range *ro = malloc(sizeof(Range));
@@ -94,7 +94,7 @@ typedef struct RegExp {
     } d;
 } RegExp;
 
-static inline RegExp *
+static RegExp *
 RegExp_isA(RegExp *r, RegExpType t)
 {
     return r->type == t ? r : NULL;
@@ -106,7 +106,7 @@ unsigned int RegExp_fixedLength(RegExp*);
 void RegExp_compile(RegExp*, Char*, Ins*);
 void RegExp_display(RegExp*, FILE *);
 
-static inline RegExp *
+static RegExp *
 RegExp_new_NullOp(void)
 {
     RegExp *r = malloc(sizeof(RegExp));
@@ -114,7 +114,7 @@ RegExp_new_NullOp(void)
     return r;
 }
 
-static inline RegExp *
+static RegExp *
 RegExp_new_MatchOp(Range *m)
 {
     RegExp *r = malloc(sizeof(RegExp));
@@ -125,7 +125,7 @@ RegExp_new_MatchOp(Range *m)
 
 RegExp *RegExp_new_RuleOp(RegExp*, RegExp*, Token*, unsigned int);
 
-static inline RegExp *
+static RegExp *
 RegExp_new_AltOp(RegExp *e1, RegExp *e2)
 {
     RegExp *r = malloc(sizeof(RegExp));
@@ -135,7 +135,7 @@ RegExp_new_AltOp(RegExp *e1, RegExp *e2)
     return r;
 }
 
-static inline RegExp *
+static RegExp *
 RegExp_new_CatOp(RegExp *e1, RegExp *e2)
 {
     RegExp *r = malloc(sizeof(RegExp));
@@ -145,7 +145,7 @@ RegExp_new_CatOp(RegExp *e1, RegExp *e2)
     return r;
 }
 
-static inline RegExp *
+static RegExp *
 RegExp_new_CloseOp(RegExp *e)
 {
     RegExp *r = malloc(sizeof(RegExp));
diff --git a/tools/re2c/scanner.h b/tools/re2c/scanner.h
index 9a997af1..a5720b73 100644
--- a/tools/re2c/scanner.h
+++ b/tools/re2c/scanner.h
@@ -11,15 +11,15 @@ typedef struct Scanner {
 } Scanner;
 
 void Scanner_init(Scanner*, FILE *);
-static inline Scanner *Scanner_new(FILE *);
+static Scanner *Scanner_new(FILE *);
 
 int Scanner_echo(Scanner*, FILE *);
 int Scanner_scan(Scanner*);
 void Scanner_fatal(Scanner*, const char*);
-static inline SubStr Scanner_token(Scanner*);
-static inline unsigned int Scanner_line(Scanner*);
+static SubStr Scanner_token(Scanner*);
+static unsigned int Scanner_line(Scanner*);
 
-static inline SubStr
+static SubStr
 Scanner_token(Scanner *s)
 {
     SubStr r;
@@ -27,13 +27,13 @@ Scanner_token(Scanner *s)
     return r;
 }
 
-static inline unsigned int
+static unsigned int
 Scanner_line(Scanner *s)
 {
     return s->cline;
 }
 
-static inline Scanner *
+static Scanner *
 Scanner_new(FILE *i)
 {
     Scanner *r = malloc(sizeof(Scanner));
diff --git a/tools/re2c/substr.h b/tools/re2c/substr.h
index 93498344..0a19b939 100644
--- a/tools/re2c/substr.h
+++ b/tools/re2c/substr.h
@@ -14,14 +14,14 @@ typedef struct SubStr SubStr;
 
 int SubStr_eq(const SubStr *, const SubStr *);
 
-static inline void SubStr_init_u(SubStr*, unsigned char*, unsigned int);
-static inline SubStr *SubStr_new_u(unsigned char*, unsigned int);
+static void SubStr_init_u(SubStr*, unsigned char*, unsigned int);
+static SubStr *SubStr_new_u(unsigned char*, unsigned int);
 
-static inline void SubStr_init(SubStr*, char*, unsigned int);
-static inline SubStr *SubStr_new(char*, unsigned int);
+static void SubStr_init(SubStr*, char*, unsigned int);
+static SubStr *SubStr_new(char*, unsigned int);
 
-static inline void SubStr_copy(SubStr*, const SubStr*);
-static inline SubStr *SubStr_new_copy(const SubStr*);
+static void SubStr_copy(SubStr*, const SubStr*);
+static SubStr *SubStr_new_copy(const SubStr*);
 
 void SubStr_out(const SubStr*, FILE *);
 #define SubStr_delete(x)    free(x)
@@ -38,14 +38,14 @@ Str *Str_new_empty(void);
 void Str_destroy(Str *);
 void Str_delete(Str *);
 
-static inline void
+static void
 SubStr_init_u(SubStr *r, unsigned char *s, unsigned int l)
 {
     r->str = (char*)s;
     r->len = l;
 }
 
-static inline SubStr *
+static SubStr *
 SubStr_new_u(unsigned char *s, unsigned int l)
 {
     SubStr *r = malloc(sizeof(SubStr));
@@ -54,14 +54,14 @@ SubStr_new_u(unsigned char *s, unsigned int l)
     return r;
 }
 
-static inline void
+static void
 SubStr_init(SubStr *r, char *s, unsigned int l)
 {
     r->str = s;
     r->len = l;
 }
 
-static inline SubStr *
+static SubStr *
 SubStr_new(char *s, unsigned int l)
 {
     SubStr *r = malloc(sizeof(SubStr));
@@ -70,14 +70,14 @@ SubStr_new(char *s, unsigned int l)
     return r;
 }
 
-static inline void
+static void
 SubStr_copy(SubStr *r, const SubStr *s)
 {
     r->str = s->str;
     r->len = s->len;
 }
 
-static inline SubStr *
+static SubStr *
 SubStr_new_copy(const SubStr *s)
 {
     SubStr *r = malloc(sizeof(SubStr));
diff --git a/tools/re2c/token.h b/tools/re2c/token.h
index 14915bde..d50a46da 100644
--- a/tools/re2c/token.h
+++ b/tools/re2c/token.h
@@ -8,17 +8,17 @@ typedef struct Token {
     unsigned int	line;
 } Token;
 
-static inline void Token_init(Token *, SubStr, unsigned int);
-static inline Token *Token_new(SubStr, unsigned int);
+static void Token_init(Token *, SubStr, unsigned int);
+static Token *Token_new(SubStr, unsigned int);
 
-static inline void
+static void
 Token_init(Token *r, SubStr t, unsigned int l)
 {
     Str_copy(&r->text, &t);
     r->line = l;
 }
 
-static inline Token *
+static Token *
 Token_new(SubStr t, unsigned int l)
 {
     Token *r = malloc(sizeof(Token));