diff --git a/libs/openzap/openzap.vcproj b/libs/openzap/openzap.vcproj
index 001ce13352..6cb321a698 100644
--- a/libs/openzap/openzap.vcproj
+++ b/libs/openzap/openzap.vcproj
@@ -45,10 +45,14 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
+				DisableLanguageExtensions="true"
+				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
+				WarnAsError="true"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -106,10 +110,14 @@
 				AdditionalIncludeDirectories="src/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
+				DisableLanguageExtensions="true"
+				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
+				WarnAsError="true"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -171,6 +179,22 @@
 			<File
 				RelativePath=".\src\zap_wanpipe.c"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\zap_zt.c"
diff --git a/libs/openzap/src/include/openzap.h b/libs/openzap/src/include/openzap.h
index 725196225d..3424a4ca47 100644
--- a/libs/openzap/src/include/openzap.h
+++ b/libs/openzap/src/include/openzap.h
@@ -37,7 +37,7 @@
 #define _XOPEN_SOURCE 500
 
 #ifdef _MSC_VER
-#if (_MSC_VER >= 1400)			// VC8+
+#if (_MSC_VER >= 1400)			/* VC8+ */
 #ifndef _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_DEPRECATE
 #endif
@@ -63,6 +63,11 @@
 #include "hashtable.h"
 #include "zap_config.h"
 
+#ifdef  NDEBUG
+#undef assert
+#define assert(_Expression)     ((void)(_Expression))
+#endif
+
 #define ZAP_MAX_CHANNELS_SPAN 513
 #define ZAP_MAX_SPANS_INTERFACE 33