diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 218ca6a..8805727 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-06  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* ntddndis.h: Added a few endif comments.
+	(NDIS_OBJECT_HEADER): Added from experimental vista_7_headers.
+	* ntddscsi.h: Added a few endif comments.
+	(DD_SCSI_DEVICE_NAME_U): Added from ddk_test version.
+
 2010-07-05  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* winnt.h: remove duplicated ULONG type definition. not supposed to be
diff --git a/mingw-w64-headers/include/ntddndis.h b/mingw-w64-headers/include/ntddndis.h
index 57805a7..8597f94 100644
--- a/mingw-w64-headers/include/ntddndis.h
+++ b/mingw-w64-headers/include/ntddndis.h
@@ -40,6 +40,12 @@
 
 #include <guiddef.h>
 
+  typedef struct _NDIS_OBJECT_HEADER {
+    UCHAR  Type;
+    UCHAR  Revision;
+    USHORT Size;
+  } NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER;
+
 #define OID_GEN_SUPPORTED_LIST 0x00010101
 #define OID_GEN_HARDWARE_STATUS 0x00010102
 #define OID_GEN_MEDIA_SUPPORTED 0x00010103
@@ -1628,7 +1634,7 @@
     ULONG Length;
     WW_MBX_CHANNEL_PAIR ChannelPair[1];
   } WW_MBX_TEMPDEFAULTLIST,*WW_PMBX_TEMPDEFAULTLIST;
-#endif
+#endif /* WIRELESS_WAN */
 
   typedef struct _BPC_FILETIME {
     ULONG dwLowDateTime;
@@ -1868,4 +1874,6 @@
 #define NDIS_MINIPORT_SENDS_PACKET_ARRAY 0x08000000
 #define NDIS_MINIPORT_FILTER_IM 0x10000000
 #define NDIS_MINIPORT_SHORT_PACKETS_ARE_PADDED 0x20000000
-#endif
+
+#endif /* _NTDDNDIS_ */
+
diff --git a/mingw-w64-headers/include/ntddscsi.h b/mingw-w64-headers/include/ntddscsi.h
index 991a7a4..827db69 100644
--- a/mingw-w64-headers/include/ntddscsi.h
+++ b/mingw-w64-headers/include/ntddscsi.h
@@ -11,7 +11,7 @@
 
 DEFINE_GUID(ScsiRawInterfaceGuid,0x53f56309L,0xb6bf,0x11d0,0x94,0xf2,0x00,0xa0,0xc9,0x1e,0xfb,0x8b);
 DEFINE_GUID(WmiScsiAddressGuid,0x53f5630fL,0xb6bf,0x11d0,0x94,0xf2,0x00,0xa0,0xc9,0x1e,0xfb,0x8b);
-#endif
+#endif /* DEFINE_GUID */
 
 #ifndef _NTDDSCSIH_
 #define _NTDDSCSIH_
@@ -20,9 +20,10 @@
 extern "C" {
 #endif
 
-#define IOCTL_SCSI_BASE FILE_DEVICE_CONTROLLER
+#define IOCTL_SCSI_BASE		FILE_DEVICE_CONTROLLER
 
-#define DD_SCSI_DEVICE_NAME "\\Device\\ScsiPort"
+#define DD_SCSI_DEVICE_NAME	"\\Device\\ScsiPort"
+#define DD_SCSI_DEVICE_NAME_U  L"\\Device\\ScsiPort"
 
 #define IOCTL_SCSI_PASS_THROUGH CTL_CODE(IOCTL_SCSI_BASE,0x0401,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS)
 #define IOCTL_SCSI_MINIPORT CTL_CODE(IOCTL_SCSI_BASE,0x0402,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS)
@@ -101,7 +102,7 @@
     ULONG SenseInfoOffset;
     UCHAR Cdb[16];
   } SCSI_PASS_THROUGH_DIRECT32,*PSCSI_PASS_THROUGH_DIRECT32;
-#endif
+#endif /* _WIN64 */
 
   typedef struct _ATA_PASS_THROUGH_EX {
     USHORT Length;
@@ -164,7 +165,7 @@
     UCHAR PreviousTaskFile[8];
     UCHAR CurrentTaskFile[8];
   } ATA_PASS_THROUGH_DIRECT32,*PATA_PASS_THROUGH_DIRECT32;
-#endif
+#endif /* _WIN64 */
 
 #define ATA_FLAGS_DRDY_REQUIRED (1 << 0)
 #define ATA_FLAGS_DATA_IN (1 << 1)
@@ -243,4 +244,6 @@
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* _NTDDSCSIH_ */
+