diff --git a/windows/golded.dsp b/windows/golded.dsp
index 0ad6730..f2d879f 100644
--- a/windows/golded.dsp
+++ b/windows/golded.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Gm /Gi- /GX /Zi /O1 /Ob1 /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /J /FD /c
+# ADD CPP /nologo /MD /W3 /Gm /Gi- /GX /Zi /O1 /Ob1 /I "..\golded3" /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /J /FD /c
 # SUBTRACT CPP /Gy /Fr
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe
 # 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 /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcui" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /J /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib" /I ".\goldlib\gall" /I ".\goldlib\gcui" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /J /FD /GZ /c
 # SUBTRACT CPP /Fr
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/windows/golded.mak b/windows/golded.mak
index bf6cb7f..942d51e 100644
--- a/windows/golded.mak
+++ b/windows/golded.mak
@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
+CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I "..\golded3" /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -318,7 +318,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcui" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib" /I ".\goldlib\gall" /I ".\goldlib\gcui" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
diff --git a/windows/golded.vcproj b/windows/golded.vcproj
index f7b2be4..7f59bd2 100644
--- a/windows/golded.vcproj
+++ b/windows/golded.vcproj
@@ -51,7 +51,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;__INCLUDE_NEW_KEYWORDS__"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -162,7 +162,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="NDEBUG;WIN64;_CONSOLE;HAVE_CONFIG_H;__INCLUDE_NEW_KEYWORDS__"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -264,7 +264,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;__INCLUDE_NEW_KEYWORDS__"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
@@ -359,7 +359,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="_DEBUG;WIN64;_CONSOLE;HAVE_CONFIG_H;__INCLUDE_NEW_KEYWORDS__"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
@@ -459,7 +459,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;__INCLUDE_NEW_KEYWORDS__"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -570,7 +570,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="NDEBUG;WIN64;_CONSOLE;HAVE_CONFIG_H;__INCLUDE_NEW_KEYWORDS__"
 				StringPooling="true"
 				MinimalRebuild="true"
diff --git a/windows/goldlib.dsp b/windows/goldlib.dsp
index 6c2ec5e..27e9118 100644
--- a/windows/goldlib.dsp
+++ b/windows/goldlib.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "obj\release\win32"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /O1 /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /J /FD /c
+# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /O1 /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /J /FD /c
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "obj\debug\win32"
 # 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 /MDd /W3 /Gm /Gi /GX /ZI /Od /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /J /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /J /FD /GZ /c
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/windows/goldlib.mak b/windows/goldlib.mak
index 4052d73..7aac59d 100644
--- a/windows/goldlib.mak
+++ b/windows/goldlib.mak
@@ -233,7 +233,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
+CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -672,7 +672,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
diff --git a/windows/goldlib.vcproj b/windows/goldlib.vcproj
index afc389d..99cc55a 100644
--- a/windows/goldlib.vcproj
+++ b/windows/goldlib.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\goldlib,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;__INCLUDE_NEW_KEYWORDS__"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
@@ -113,7 +113,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\goldlib,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;HAVE_CONFIG_H;__INCLUDE_NEW_KEYWORDS__"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
@@ -187,7 +187,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\goldlib,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;__INCLUDE_NEW_KEYWORDS__"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -261,7 +261,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\goldlib,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;HAVE_CONFIG_H;__INCLUDE_NEW_KEYWORDS__"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -334,7 +334,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\goldlib,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;__INCLUDE_NEW_KEYWORDS__"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -408,7 +408,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\goldlib,..\goldlib\gall,..\goldlib\gcui,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;HAVE_CONFIG_H;__INCLUDE_NEW_KEYWORDS__"
 				StringPooling="true"
 				MinimalRebuild="true"
diff --git a/windows/goldnode.dsp b/windows/goldnode.dsp
index 0e496f7..1b61cc5 100644
--- a/windows/goldnode.dsp
+++ b/windows/goldnode.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Gm /Gi- /GX /Zi /O1 /Ob1 /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /J /FD /c
+# ADD CPP /nologo /MD /W3 /Gm /Gi- /GX /Zi /O1 /Ob1 /I ".\golded3" /I ".\goldlib" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /J /FD /c
 # SUBTRACT CPP /Gy
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe
 # 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 /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /J /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /J /FD /GZ /c
 # SUBTRACT CPP /Fr
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/windows/goldnode.mak b/windows/goldnode.mak
index 6a30f23..35ce9b4 100644
--- a/windows/goldnode.mak
+++ b/windows/goldnode.mak
@@ -61,7 +61,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
+CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I ".\golded3" /I ".\goldlib" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -146,7 +146,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
diff --git a/windows/goldnode.vcproj b/windows/goldnode.vcproj
index 600151b..4c46881 100644
--- a/windows/goldnode.vcproj
+++ b/windows/goldnode.vcproj
@@ -50,7 +50,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -152,7 +152,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="NDEBUG;WIN64;_CONSOLE"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -247,7 +247,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
@@ -339,7 +339,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="_DEBUG;WIN64;_CONSOLE"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
@@ -436,7 +436,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -538,7 +538,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="NDEBUG;WIN64;_CONSOLE"
 				StringPooling="true"
 				MinimalRebuild="true"
diff --git a/windows/rddt.dsp b/windows/rddt.dsp
index d7a2e86..e7415f4 100644
--- a/windows/rddt.dsp
+++ b/windows/rddt.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Gm /Gi- /GX /Zi /O1 /Ob1 /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /J /FD /c
+# ADD CPP /nologo /MD /W3 /Gm /Gi- /GX /Zi /O1 /Ob1 /I ".\golded3" /I ".\goldlib" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /J /FD /c
 # SUBTRACT CPP /Gy
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe
 # 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 /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /J /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /J /FD /GZ /c
 # SUBTRACT CPP /Fr
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/windows/rddt.mak b/windows/rddt.mak
index 859efe0..b51ccb6 100644
--- a/windows/rddt.mak
+++ b/windows/rddt.mak
@@ -61,7 +61,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
+CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I ".\golded3" /I ".\goldlib" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -146,7 +146,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
diff --git a/windows/rddt.vcproj b/windows/rddt.vcproj
index ee85ad9..e6904f6 100644
--- a/windows/rddt.vcproj
+++ b/windows/rddt.vcproj
@@ -50,7 +50,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;NOT_LINK_GESPELL"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -153,7 +153,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="NDEBUG;WIN64;_CONSOLE;NOT_LINK_GESPELL"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -249,7 +249,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
@@ -341,7 +341,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="_DEBUG;WIN64;_CONSOLE"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
@@ -438,7 +438,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;NOT_LINK_GESPELL"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -541,7 +541,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib\hunspell,..\goldlib\smblib,..\goldlib\uulib"
+				AdditionalIncludeDirectories="..\golded3,..\goldlib\gall,..\goldlib\gcfg,..\goldlib\glibc,..\goldlib\gmb3,..\goldlib,..\goldlib\smblib,..\goldlib\uulib"
 				PreprocessorDefinitions="NDEBUG;WIN64;_CONSOLE;NOT_LINK_GESPELL"
 				StringPooling="true"
 				MinimalRebuild="true"