diff --git a/Makefile.am b/Makefile.am
index 000ec6f0..d733b503 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = ccstruct ccutil classify cube cutil dict image neural_networks/runtime
 #SUBDIRS += po
 #AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
 #endif
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = eurotext.tif phototest.tif ReleaseNotes \
       aclocal.m4 config configure.ac runautoconf tesseract.spec contrib
@@ -10,13 +11,9 @@ EXTRA_DIST = eurotext.tif phototest.tif ReleaseNotes \
 #EXTRA_DIST = doc/html doc/@PACKAGE_NAME@_@PACKAGE_VERSION@.pdf doc/@PACKAGE_NAME@_@PACKAGE_VERSION@.ps.gz
 
 dist-hook:
-# Need to remove CVS directories from directories
+# Need to remove .svn directories from directories
 # added using EXTRA_DIST. $(distdir)/tessdata would in
 # theory suffice.
-	rm -rf `find $(distdir) -name CVS`
 	rm -rf `find $(distdir) -name .svn`
 	rm -rf `find $(distdir) -name .deps`
-# Also remove extra files not needed in a distribution
-#	rm -rf `find $(distdir) -name configure.ac`
-	rm -rf `find $(distdir) -name acinclude.m4`
-#	rm -rf `find $(distdir) -name aclocal.m4`
+	rm -rf `find $(distdir) -name Makefile.in`
diff --git a/runautoconf b/runautoconf
index 8b29b79e..d3f1c978 100755
--- a/runautoconf
+++ b/runautoconf
@@ -67,7 +67,7 @@ autoheader -f || bail_out
 # they are copied from the system so they can be used in a distribution.
 
 echo "Running automake --add-missing --copy"
-automake --add-missing -c  > /dev/null || bail_out
+automake --add-missing -c  -Wno-portability > /dev/null || bail_out
 
 # --- Step 5: Generate configure and include/miaconfig.h from:
 #             . configure.ac
diff --git a/tessdata/Makefile.am b/tessdata/Makefile.am
index 914d4439..07b482fd 100644
--- a/tessdata/Makefile.am
+++ b/tessdata/Makefile.am
@@ -1,6 +1,6 @@
 datadir = @datadir@/tessdata
-data_DATA =  *.traineddata \
-    *.cube.*
+data_DATA =  $(wildcard *.traineddata) \
+    $(wildcard *.cube.*)
 
 SUBDIRS = configs tessconfigs
 
diff --git a/vs2008/ccmain.vcproj b/vs2008/ccmain.vcproj
index 5377d654..30ceb3d9 100644
--- a/vs2008/ccmain.vcproj
+++ b/vs2008/ccmain.vcproj
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -175,7 +175,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
diff --git a/vs2008/ccstruct.vcproj b/vs2008/ccstruct.vcproj
index 1842ceea..fc7d084f 100644
--- a/vs2008/ccstruct.vcproj
+++ b/vs2008/ccstruct.vcproj
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -175,7 +175,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
diff --git a/vs2008/ccutil.vcproj b/vs2008/ccutil.vcproj
index 4abc2d2b..82330cda 100644
--- a/vs2008/ccutil.vcproj
+++ b/vs2008/ccutil.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="ccutil"
 	ProjectGUID="{DF2FA86F-A663-4805-AED7-2F81D9EAC796}"
 	RootNamespace="ccutil"
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -175,7 +175,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -347,37 +347,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\ccutil\debugwin.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="mfcpch.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="mfcpch.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release.dynamic|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="mfcpch.h"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\ccutil\elst.cpp"
 				>
@@ -800,10 +769,6 @@
 				RelativePath="..\ccutil\clst.h"
 				>
 			</File>
-			<File
-				RelativePath="..\ccutil\debugwin.h"
-				>
-			</File>
 			<File
 				RelativePath="..\ccutil\elst.h"
 				>
diff --git a/vs2008/classify.vcproj b/vs2008/classify.vcproj
index b5355b3b..6e96d6b8 100644
--- a/vs2008/classify.vcproj
+++ b/vs2008/classify.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="classify"
 	ProjectGUID="{C7C7FBB5-7082-428C-8F81-8FBA7A37AC85}"
 	RootNamespace="classify"
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -175,7 +175,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
diff --git a/vs2008/cntraining.vcproj b/vs2008/cntraining.vcproj
index 8d18a6ca..4253ff12 100644
--- a/vs2008/cntraining.vcproj
+++ b/vs2008/cntraining.vcproj
@@ -54,7 +54,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				BrowseInformation="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -140,7 +140,7 @@
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
 				BrowseInformation="1"
-				WarningLevel="3"
+				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
 				ShowIncludes="false"
@@ -231,7 +231,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				BrowseInformation="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/vs2008/combine_tessdata.vcproj b/vs2008/combine_tessdata.vcproj
index b96cd1b5..b2ecded3 100644
--- a/vs2008/combine_tessdata.vcproj
+++ b/vs2008/combine_tessdata.vcproj
@@ -54,7 +54,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				BrowseInformation="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -139,7 +139,7 @@
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
 				BrowseInformation="1"
-				WarningLevel="3"
+				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
 			/>
@@ -229,7 +229,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				BrowseInformation="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/vs2008/cube.vcproj b/vs2008/cube.vcproj
index 26f212dc..6e3207bf 100644
--- a/vs2008/cube.vcproj
+++ b/vs2008/cube.vcproj
@@ -45,7 +45,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -112,7 +112,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="0"
 			/>
 			<Tool
@@ -179,7 +179,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="0"
 			/>
 			<Tool
diff --git a/vs2008/cutil.vcproj b/vs2008/cutil.vcproj
index f5c2d06b..ecf1def2 100644
--- a/vs2008/cutil.vcproj
+++ b/vs2008/cutil.vcproj
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -175,7 +175,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
diff --git a/vs2008/dict.vcproj b/vs2008/dict.vcproj
index 97fd026d..cc53173b 100644
--- a/vs2008/dict.vcproj
+++ b/vs2008/dict.vcproj
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -175,7 +175,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
diff --git a/vs2008/image.vcproj b/vs2008/image.vcproj
index bba42268..0c2c690c 100644
--- a/vs2008/image.vcproj
+++ b/vs2008/image.vcproj
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -175,7 +175,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
diff --git a/vs2008/libtesseract_tessopt.vcproj b/vs2008/libtesseract_tessopt.vcproj
index 0bfab221..c9afc672 100644
--- a/vs2008/libtesseract_tessopt.vcproj
+++ b/vs2008/libtesseract_tessopt.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="libtesseract_tessopt"
 	ProjectGUID="{8784A544-7616-4E56-8485-277A2F387ECA}"
 	RootNamespace="libtesseract_tessopt"
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -175,7 +175,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
diff --git a/vs2008/libtesseract_training.vcproj b/vs2008/libtesseract_training.vcproj
index 952c810a..450f1d6e 100644
--- a/vs2008/libtesseract_training.vcproj
+++ b/vs2008/libtesseract_training.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="libtesseract_training"
 	ProjectGUID="{454A6BAE-5F8A-461A-B8C3-5AAA531006F3}"
 	RootNamespace="libtesseract_training"
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -175,7 +175,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
diff --git a/vs2008/mftraining.vcproj b/vs2008/mftraining.vcproj
index 769b67f8..614d217e 100644
--- a/vs2008/mftraining.vcproj
+++ b/vs2008/mftraining.vcproj
@@ -50,7 +50,7 @@
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
 				BrowseInformation="1"
-				WarningLevel="3"
+				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
 			/>
@@ -140,7 +140,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				BrowseInformation="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -230,7 +230,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				BrowseInformation="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/vs2008/neural_networks.vcproj b/vs2008/neural_networks.vcproj
index 22d99ed3..71d24c63 100644
--- a/vs2008/neural_networks.vcproj
+++ b/vs2008/neural_networks.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="neural_networks"
 	ProjectGUID="{2EDB497A-E9CF-40E6-A8F2-B001D895A8AE}"
 	RootNamespace="neural_networks"
@@ -44,7 +44,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -110,7 +110,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="0"
 			/>
 			<Tool
@@ -176,7 +176,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="0"
 			/>
 			<Tool
diff --git a/vs2008/tesseract.vcproj b/vs2008/tesseract.vcproj
index 319125d5..7d55a35d 100644
--- a/vs2008/tesseract.vcproj
+++ b/vs2008/tesseract.vcproj
@@ -60,7 +60,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -154,7 +154,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
 			/>
@@ -251,7 +251,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/vs2008/textord.vcproj b/vs2008/textord.vcproj
index abca9fc8..a8380e7d 100644
--- a/vs2008/textord.vcproj
+++ b/vs2008/textord.vcproj
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -175,7 +175,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
diff --git a/vs2008/unicharset_extractor.vcproj b/vs2008/unicharset_extractor.vcproj
index 98505dda..d047bb0a 100644
--- a/vs2008/unicharset_extractor.vcproj
+++ b/vs2008/unicharset_extractor.vcproj
@@ -54,7 +54,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
+				WarningLevel="0"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -141,7 +141,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				WarningLevel="3"
+				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
 			/>
@@ -231,7 +231,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
+				WarningLevel="0"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -351,10 +351,6 @@
 				RelativePath="..\ccutil\clst.h"
 				>
 			</File>
-			<File
-				RelativePath="..\ccutil\debugwin.h"
-				>
-			</File>
 			<File
 				RelativePath="..\ccutil\elst.h"
 				>
diff --git a/vs2008/viewer.vcproj b/vs2008/viewer.vcproj
index b5732545..5430ff16 100644
--- a/vs2008/viewer.vcproj
+++ b/vs2008/viewer.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="viewer"
 	ProjectGUID="{CE11FF6E-60D3-4E61-AFE2-F8F501100238}"
 	RootNamespace="viewer"
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -112,7 +112,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="0"
 			/>
 			<Tool
@@ -177,7 +177,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="0"
 			/>
 			<Tool
diff --git a/vs2008/wordlist2dawg.vcproj b/vs2008/wordlist2dawg.vcproj
index 7395a5c9..d8162bd9 100644
--- a/vs2008/wordlist2dawg.vcproj
+++ b/vs2008/wordlist2dawg.vcproj
@@ -57,7 +57,7 @@
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
 				PrecompiledHeaderFile=""
-				WarningLevel="3"
+				WarningLevel="0"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -147,7 +147,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
-				WarningLevel="3"
+				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
 			/>
@@ -240,7 +240,7 @@
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
 				PrecompiledHeaderFile=""
-				WarningLevel="3"
+				WarningLevel="0"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/vs2008/wordrec.vcproj b/vs2008/wordrec.vcproj
index e8a6f5ec..b2dccbcb 100644
--- a/vs2008/wordrec.vcproj
+++ b/vs2008/wordrec.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="wordrec"
 	ProjectGUID="{C2342D39-FD84-4448-A050-7FF3B4A33F3D}"
 	RootNamespace="wordrec"
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -175,7 +175,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
diff --git a/vs2010/ccmain.vcxproj b/vs2010/ccmain.vcxproj
index 00244590..d6c7a7e3 100644
--- a/vs2010/ccmain.vcxproj
+++ b/vs2010/ccmain.vcxproj
@@ -106,7 +106,6 @@
     <ClInclude Include="..\ccutil\boxread.h" />
     <ClInclude Include="..\ccutil\ccutil.h" />
     <ClInclude Include="..\ccutil\clst.h" />
-    <ClInclude Include="..\ccutil\debugwin.h" />
     <ClInclude Include="..\ccutil\elst.h" />
     <ClInclude Include="..\ccutil\elst2.h" />
     <ClInclude Include="..\ccutil\errcode.h" />
@@ -176,7 +175,6 @@
     <ClCompile Include="..\ccutil\boxread.cpp" />
     <ClCompile Include="..\ccutil\ccutil.cpp" />
     <ClCompile Include="..\ccutil\clst.cpp" />
-    <ClCompile Include="..\ccutil\debugwin.cpp" />
     <ClCompile Include="..\ccutil\elst.cpp" />
     <ClCompile Include="..\ccutil\elst2.cpp" />
     <ClCompile Include="..\ccutil\errcode.cpp" />
diff --git a/vs2010/ccmain.vcxproj.filters b/vs2010/ccmain.vcxproj.filters
index 1330c022..a2f5593e 100644
--- a/vs2010/ccmain.vcxproj.filters
+++ b/vs2010/ccmain.vcxproj.filters
@@ -102,9 +102,6 @@
     <ClInclude Include="..\ccutil\clst.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\ccutil\debugwin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\ccutil\elst.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -308,9 +305,6 @@
     <ClCompile Include="..\ccutil\clst.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\ccutil\debugwin.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\ccutil\elst.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/vs2010/ccutil.vcxproj b/vs2010/ccutil.vcxproj
index bd96c021..cae9eda2 100644
--- a/vs2010/ccutil.vcxproj
+++ b/vs2010/ccutil.vcxproj
@@ -17,7 +17,6 @@
     <ClCompile Include="..\ccutil\boxread.cpp" />
     <ClCompile Include="..\ccutil\ccutil.cpp" />
     <ClCompile Include="..\ccutil\clst.cpp" />
-    <ClCompile Include="..\ccutil\debugwin.cpp" />
     <ClCompile Include="..\ccutil\elst.cpp" />
     <ClCompile Include="..\ccutil\elst2.cpp" />
     <ClCompile Include="..\ccutil\errcode.cpp" />
@@ -43,7 +42,6 @@
     <ClInclude Include="..\ccutil\boxread.h" />
     <ClInclude Include="..\ccutil\ccutil.h" />
     <ClInclude Include="..\ccutil\clst.h" />
-    <ClInclude Include="..\ccutil\debugwin.h" />
     <ClInclude Include="..\ccutil\elst.h" />
     <ClInclude Include="..\ccutil\elst2.h" />
     <ClInclude Include="..\ccutil\errcode.h" />
diff --git a/vs2010/ccutil.vcxproj.filters b/vs2010/ccutil.vcxproj.filters
index 53d163a8..bded7661 100644
--- a/vs2010/ccutil.vcxproj.filters
+++ b/vs2010/ccutil.vcxproj.filters
@@ -66,9 +66,6 @@
     <ClCompile Include="..\ccutil\elst.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\ccutil\debugwin.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\ccutil\clst.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -107,9 +104,6 @@
     <ClInclude Include="..\ccutil\clst.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\ccutil\debugwin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\ccutil\elst.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/vs2010/unicharset_extractor.vcproj b/vs2010/unicharset_extractor.vcproj
index 98505dda..b2391d5e 100644
--- a/vs2010/unicharset_extractor.vcproj
+++ b/vs2010/unicharset_extractor.vcproj
@@ -351,10 +351,6 @@
 				RelativePath="..\ccutil\clst.h"
 				>
 			</File>
-			<File
-				RelativePath="..\ccutil\debugwin.h"
-				>
-			</File>
 			<File
 				RelativePath="..\ccutil\elst.h"
 				>
diff --git a/vs2010/unicharset_extractor.vcxproj b/vs2010/unicharset_extractor.vcxproj
index 2a4c4501..a88e1080 100644
--- a/vs2010/unicharset_extractor.vcxproj
+++ b/vs2010/unicharset_extractor.vcxproj
@@ -207,7 +207,6 @@
     <ClInclude Include="..\ccutil\boxread.h" />
     <ClInclude Include="..\ccutil\ccutil.h" />
     <ClInclude Include="..\ccutil\clst.h" />
-    <ClInclude Include="..\ccutil\debugwin.h" />
     <ClInclude Include="..\ccutil\elst.h" />
     <ClInclude Include="..\ccutil\elst2.h" />
     <ClInclude Include="..\ccutil\errcode.h" />
diff --git a/vs2010/unicharset_extractor.vcxproj.filters b/vs2010/unicharset_extractor.vcxproj.filters
index 87679f60..3f648fc6 100644
--- a/vs2010/unicharset_extractor.vcxproj.filters
+++ b/vs2010/unicharset_extractor.vcxproj.filters
@@ -38,9 +38,6 @@
     <ClInclude Include="..\ccutil\clst.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\ccutil\debugwin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\ccutil\elst.h">
       <Filter>Header Files</Filter>
     </ClInclude>