Index: B:/users/xalex/PREFAST_TRUNK_3_0_0/core/winmad/kernel/wm_driver.c
===================================================================
--- B:/users/xalex/PREFAST_TRUNK_3_0_0/core/winmad/kernel/wm_driver.c	(revision 8300)
+++ B:/users/xalex/PREFAST_TRUNK_3_0_0/core/winmad/kernel/wm_driver.c	(revision 8301)
@@ -430,6 +430,7 @@
 	return STATUS_SUCCESS;
 }
 
+DRIVER_INITIALIZE DriverEntry;
 NTSTATUS DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
 {
 	WDF_DRIVER_CONFIG		config;
Index: B:/users/xalex/PREFAST_TRUNK_3_0_0/core/winverbs/kernel/wv_driver.c
===================================================================
--- B:/users/xalex/PREFAST_TRUNK_3_0_0/core/winverbs/kernel/wv_driver.c	(revision 8300)
+++ B:/users/xalex/PREFAST_TRUNK_3_0_0/core/winverbs/kernel/wv_driver.c	(revision 8301)
@@ -584,6 +584,7 @@
 	}
 }
 
+DRIVER_INITIALIZE DriverEntry;
 NTSTATUS DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
 {
 	WDF_DRIVER_CONFIG		config;
Index: B:/users/xalex/PREFAST_TRUNK_3_0_0/core/bxm/bxm_precomp.h
===================================================================
--- B:/users/xalex/PREFAST_TRUNK_3_0_0/core/bxm/bxm_precomp.h	(revision 8300)
+++ B:/users/xalex/PREFAST_TRUNK_3_0_0/core/bxm/bxm_precomp.h	(revision 8301)
@@ -21,7 +21,9 @@
 #include <stdio.h>
 #include <WinDef.h>
 #include <ntstrsafe.h>
+#ifndef NTDDI_WIN8
 #include <strsafe.h>
+#endif
 #include <stdlib.h>
 #include <stdarg.h>