diff --git a/include/winnt.h b/include/winnt.h
index 78f9488e8ee..23d33aa29d3 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -2461,12 +2461,16 @@ typedef struct _IMAGE_VXD_HEADER {
 #define IMAGE_FILE_EXECUTABLE_IMAGE	0x0002
 #define IMAGE_FILE_LINE_NUMS_STRIPPED   0x0004
 #define IMAGE_FILE_LOCAL_SYMS_STRIPPED  0x0008
+#define IMAGE_FILE_AGGRESIVE_WS_TRIM	0x0010
+#define IMAGE_FILE_LARGE_ADDRESS_AWARE	0x0020
 #define IMAGE_FILE_16BIT_MACHINE	0x0040
 #define IMAGE_FILE_BYTES_REVERSED_LO	0x0080
 #define IMAGE_FILE_32BIT_MACHINE	0x0100
 #define IMAGE_FILE_DEBUG_STRIPPED	0x0200
+#define IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP	0x0400
 #define IMAGE_FILE_SYSTEM		0x1000
 #define IMAGE_FILE_DLL			0x2000
+#define IMAGE_FILE_UP_SYSTEM_ONLY	0x4000
 #define IMAGE_FILE_BYTES_REVERSED_HI	0x8000
 
 /* These are the settings of the Machine field. */
@@ -2580,12 +2584,13 @@ typedef struct _IMAGE_OPTIONAL_HEADER {
   DWORD LoaderFlags;
   DWORD NumberOfRvaAndSizes;
   IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; /* 0x60 */
+  /* 0xE0 */
 } IMAGE_OPTIONAL_HEADER, *PIMAGE_OPTIONAL_HEADER;
 
 typedef struct _IMAGE_NT_HEADERS {
-  DWORD Signature; /* "PE"\0\0 */
-  IMAGE_FILE_HEADER FileHeader;
-  IMAGE_OPTIONAL_HEADER OptionalHeader;
+  DWORD Signature; /* "PE"\0\0 */	/* 0x00 */
+  IMAGE_FILE_HEADER FileHeader;		/* 0x04 */
+  IMAGE_OPTIONAL_HEADER OptionalHeader;	/* 0x18 */
 } IMAGE_NT_HEADERS, *PIMAGE_NT_HEADERS;
 
 #define IMAGE_SIZEOF_SHORT_NAME 8