Index: B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/kernel/al_smi.c
===================================================================
--- B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/kernel/al_smi.c	(revision 8299)
+++ B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/kernel/al_smi.c	(revision 8300)
@@ -140,6 +140,9 @@
 	IN		const	ib_cq_handle_t				h_cq,
 	IN				void						*cq_context );
 
+#ifdef NTDDI_WIN8
+KDEFERRED_ROUTINE spl_qp_send_dpc_cb;
+#else
 void
 spl_qp_send_dpc_cb(
     IN              KDPC                        *p_dpc,
@@ -147,7 +150,11 @@
     IN              void                        *arg1,
     IN              void                        *arg2
     );
+#endif
 
+#ifdef NTDDI_WIN8
+KDEFERRED_ROUTINE spl_qp_recv_dpc_cb;
+#else
 void
 spl_qp_recv_dpc_cb(
     IN              KDPC                        *p_dpc,
@@ -155,6 +162,7 @@
     IN              void                        *arg1,
     IN              void                        *arg2
     );
+#endif
 
 void
 spl_qp_recv_comp_cb(
@@ -2547,9 +2555,7 @@
 	AL_EXIT( AL_DBG_SMI );
 }
 
-#ifdef NTDDI_WIN8
-KDEFERRED_ROUTINE spl_qp_send_dpc_cb;
-#endif
+
 void
 spl_qp_send_dpc_cb(
     IN              KDPC                        *p_dpc,
@@ -2660,9 +2666,6 @@
 	AL_EXIT( AL_DBG_SMI );
 }
 
-#ifdef NTDDI_WIN8
-KDEFERRED_ROUTINE spl_qp_recv_dpc_cb;
-#endif
 void
 spl_qp_recv_dpc_cb(
     IN              KDPC                        *p_dpc,
Index: B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/kernel/al_ndi_cm.c
===================================================================
--- B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/kernel/al_ndi_cm.c	(revision 8299)
+++ B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/kernel/al_ndi_cm.c	(revision 8300)
@@ -1427,9 +1427,8 @@
  *
  ******************************************************************/
 	
-#ifdef NTDDI_WIN8
+
 static IO_WORKITEM_ROUTINE __ndi_do_rtu;
-#endif
 static void
 __ndi_do_rtu(
 	IN				DEVICE_OBJECT*				p_dev_obj,
@@ -1545,9 +1544,8 @@
  * REP CM request
  *
  ******************************************************************/
-#ifdef NTDDI_WIN8
+
 static IO_WORKITEM_ROUTINE __ndi_do_rep;
-#endif
 static void
 __ndi_do_rep(
 	IN				DEVICE_OBJECT*				p_dev_obj,
Index: B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/kernel/al_proxy_subnet.c
===================================================================
--- B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/kernel/al_proxy_subnet.c	(revision 8299)
+++ B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/kernel/al_proxy_subnet.c	(revision 8300)
@@ -161,7 +161,7 @@
 	AL_EXIT( AL_DBG_QUERY );
 }
 
-
+static DRIVER_CANCEL __proxy_cancel_sa_req;
 static void
 __proxy_cancel_sa_req(
 	IN				DEVICE_OBJECT*				p_dev_obj,