diff --git a/Filelist.txt b/Filelist.txt
index 983b81e8..663a1b17 100644
--- a/Filelist.txt
+++ b/Filelist.txt
@@ -52,10 +52,7 @@ cpu.cpp
 cpu.h
 crc.cpp
 crc.h
-cryptdll.dsp
 cryptdll.vcproj
-cryptest.dsp
-cryptest.dsw
 cryptest.sh
 cryptest.sln
 cryptest.vcproj
@@ -64,7 +61,6 @@ cryptest_bds.bdsgroup
 cryptest_bds.bdsproj
 cryptest_bds.bpf
 cryptlib.cpp
-cryptlib.dsp
 cryptlib.h
 cryptlib.vcproj
 cryptlib_bds.bdsproj
@@ -84,7 +80,6 @@ dh2.h
 dll.cpp
 dll.h
 dlltest.cpp
-dlltest.dsp
 dlltest.vcproj
 dmac.h
 dsa.cpp
@@ -285,6 +280,7 @@ validat3.cpp
 validate.h
 vmac.cpp
 vmac.h
+vc60.zip
 vs2010.zip
 wait.cpp
 wait.h
diff --git a/GNUmakefile b/GNUmakefile
index d32e56f9..ac0de7b3 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -668,7 +668,7 @@ dlltest.exe: cryptopp.dll $(DLLTESTOBJS)
 	$(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS)
 
 # This recipe prepares the distro files
-TEXT_FILES := *.h *.cpp adhoc.cpp.proto License.txt Readme.txt Install.txt Filelist.txt CMakeLists.txt config.recommend Doxyfile cryptest* cryptlib* dlltest* cryptdll* *.sln *.vcproj *.dsw *.dsp cryptopp.rc TestVectors/*.txt TestData/*.dat
+TEXT_FILES := *.h *.cpp adhoc.cpp.proto License.txt Readme.txt Install.txt Filelist.txt CMakeLists.txt config.recommend Doxyfile cryptest* cryptlib* dlltest* cryptdll* *.sln *.vcproj cryptopp.rc TestVectors/*.txt TestData/*.dat
 EXEC_FILES := GNUmakefile GNUmakefile-cross TestData/ TestVectors/
 
 ifeq ($(wildcard Filelist.txt),Filelist.txt)
diff --git a/config.h b/config.h
index bd168a7c..0dd9a327 100644
--- a/config.h
+++ b/config.h
@@ -262,7 +262,7 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
 	typedef word32 hword;
 	typedef word64 word;
 #else
-	#define CRYPTOPP_NATIVE_DWORD_AVAILABLE
+	#define CRYPTOPP_NATIVE_DWORD_AVAILABLE 1
 	#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__)
 		#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400
 			// GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3
@@ -271,7 +271,7 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
 			typedef word64 word;
 			typedef __uint128_t dword;
 			typedef __uint128_t word128;
-			#define CRYPTOPP_WORD128_AVAILABLE
+			#define CRYPTOPP_WORD128_AVAILABLE 1
 		#else
 			// if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results
 			typedef word16 hword;
diff --git a/config.recommend b/config.recommend
index 991355a9..4e1863d7 100644
--- a/config.recommend
+++ b/config.recommend
@@ -262,7 +262,7 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
 	typedef word32 hword;
 	typedef word64 word;
 #else
-	#define CRYPTOPP_NATIVE_DWORD_AVAILABLE
+	#define CRYPTOPP_NATIVE_DWORD_AVAILABLE 1
 	#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__)
 		#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400
 			// GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3
@@ -271,7 +271,7 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
 			typedef word64 word;
 			typedef __uint128_t dword;
 			typedef __uint128_t word128;
-			#define CRYPTOPP_WORD128_AVAILABLE
+			#define CRYPTOPP_WORD128_AVAILABLE 1
 		#else
 			// if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results
 			typedef word16 hword;