diff --git a/include/windef.h b/include/windef.h
index 4578721a8f..34b169bf32 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -178,6 +178,7 @@ typedef long                                   *LPLONG;
 typedef unsigned long   DWORD,      *PDWORD,   *LPDWORD;
 typedef unsigned long   ULONG,      *PULONG;
 typedef float           FLOAT,      *PFLOAT;
+typedef char                        *PSZ;
 
 /* Macros to map Winelib names to the correct implementation name */
 /* Note that Winelib is purely Win32.                             */
diff --git a/include/winternl.h b/include/winternl.h
index ebd0f6025a..99d592ed35 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -479,7 +479,7 @@ typedef enum _SECTION_INHERIT {
     ViewUnmap = 2
 } SECTION_INHERIT;
 
-typedef enum SYSTEM_INFORMATION_CLASS {
+typedef enum _SYSTEM_INFORMATION_CLASS {
     SystemBasicInformation = 0,
     Unknown1,
     SystemPerformanceInformation = 2,
@@ -1014,17 +1014,17 @@ typedef struct _WINSTATIONINFORMATIONW {
 } WINSTATIONINFORMATIONW, *PWINSTATIONINFORMATIONW;
 
 typedef struct _VM_COUNTERS_ {
-    ULONG PeakVirtualSize;
-    ULONG VirtualSize;
-    ULONG PageFaultCount;
-    ULONG PeakWorkingSetSize;
-    ULONG WorkingSetSize;
-    ULONG QuotaPeakPagedPoolUsage;
-    ULONG QuotaPagedPoolUsage;
-    ULONG QuotaPeakNonPagedPoolUsage;
-    ULONG QuotaNonPagedPoolUsage;
-    ULONG PagefileUsage;
-    ULONG PeakPagefileUsage;
+    SIZE_T PeakVirtualSize;
+    SIZE_T VirtualSize;
+    ULONG  PageFaultCount;
+    SIZE_T PeakWorkingSetSize;
+    SIZE_T WorkingSetSize;
+    SIZE_T QuotaPeakPagedPoolUsage;
+    SIZE_T QuotaPagedPoolUsage;
+    SIZE_T QuotaPeakNonPagedPoolUsage;
+    SIZE_T QuotaNonPagedPoolUsage;
+    SIZE_T PagefileUsage;
+    SIZE_T PeakPagefileUsage;
 } VM_COUNTERS, *PVM_COUNTERS;
 
 typedef BOOLEAN (WINAPI * PWINSTATIONQUERYINFORMATIONW)(HANDLE,ULONG,WINSTATIONINFOCLASS,PVOID,ULONG,PULONG);
@@ -1138,6 +1138,7 @@ typedef struct _PORT_MESSAGE_HEADER {
 #define FILE_RESERVE_OPFILTER           0x00100000
 #define FILE_TRANSACTED_MODE            0x00200000
 #define FILE_OPEN_OFFLINE_FILE          0x00400000
+#define FILE_OPEN_FOR_FREE_SPACE_QUERY  0x00800000
 
 #define FILE_ATTRIBUTE_VALID_FLAGS      0x00007fb7
 #define FILE_ATTRIBUTE_VALID_SET_FLAGS  0x000031a7
@@ -1167,6 +1168,8 @@ typedef struct _PORT_MESSAGE_HEADER {
 #define FILE_REMOTE_DEVICE              0x00000010
 #define FILE_DEVICE_IS_MOUNTED          0x00000020
 #define FILE_VIRTUAL_VOLUME             0x00000040
+#define FILE_AUTOGENERATED_DEVICE_NAME  0x00000080
+#define FILE_DEVICE_SECURE_OPEN         0x00000100
 
 #if (_WIN32_WINNT >= 0x0501)
 #define INTERNAL_TS_ACTIVE_CONSOLE_ID ( *((volatile ULONG*)(0x7ffe02d8)) )