diff --git a/rtl/win/wininc/defines.inc b/rtl/win/wininc/defines.inc
index 567accb3d2..c13b863daa 100644
--- a/rtl/win/wininc/defines.inc
+++ b/rtl/win/wininc/defines.inc
@@ -5453,6 +5453,41 @@ const
   UISF_HIDEACCEL = $2;
   UISF_ACTIVE    = $4;
 
+const
+  IMAGE_DEBUG_TYPE_UNKNOWN       = 0;
+  IMAGE_DEBUG_TYPE_COFF          = 1;
+  IMAGE_DEBUG_TYPE_CODEVIEW      = 2;
+  IMAGE_DEBUG_TYPE_FPO           = 3;
+  IMAGE_DEBUG_TYPE_MISC          = 4;
+  IMAGE_DEBUG_TYPE_EXCEPTION     = 5;
+  IMAGE_DEBUG_TYPE_FIXUP         = 6;
+  IMAGE_DEBUG_TYPE_OMAP_TO_SRC   = 7;
+  IMAGE_DEBUG_TYPE_OMAP_FROM_SRC = 8;
+  IMAGE_DEBUG_TYPE_BORLAND       = 9;
+  IMAGE_DEBUG_TYPE_RESERVED10    = 10;
+  IMAGE_DEBUG_TYPE_CLSID         = 11;
+
+// Directory Entries
+
+  IMAGE_DIRECTORY_ENTRY_EXPORT    = 0; // Export Directory
+  IMAGE_DIRECTORY_ENTRY_IMPORT    = 1; // Import Directory
+  IMAGE_DIRECTORY_ENTRY_RESOURCE  = 2; // Resource Directory
+  IMAGE_DIRECTORY_ENTRY_EXCEPTION = 3; // Exception Directory
+  IMAGE_DIRECTORY_ENTRY_SECURITY  = 4; // Security Directory
+  IMAGE_DIRECTORY_ENTRY_BASERELOC = 5; // Base Relocation Table
+  IMAGE_DIRECTORY_ENTRY_DEBUG     = 6; // Debug Directory
+
+  IMAGE_DIRECTORY_ENTRY_COPYRIGHT      = 7;   // (X86 usage)
+
+  IMAGE_DIRECTORY_ENTRY_ARCHITECTURE   = 7; // Architecture Specific Data
+  IMAGE_DIRECTORY_ENTRY_GLOBALPTR      = 8; // RVA of GP
+  IMAGE_DIRECTORY_ENTRY_TLS            = 9; // TLS Directory
+  IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG    = 10; // Load Configuration Directory
+  IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT   = 11; // Bound Import Directory in headers
+  IMAGE_DIRECTORY_ENTRY_IAT            = 12; // Import Address Table
+  IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT   = 13; // Delay Load Import Descriptors
+  IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR = 14; // COM Runtime descriptor
+
 {$endif read_interface}
 
 
diff --git a/rtl/win/wininc/struct.inc b/rtl/win/wininc/struct.inc
index 550b741422..13f6fe2b69 100644
--- a/rtl/win/wininc/struct.inc
+++ b/rtl/win/wininc/struct.inc
@@ -6996,7 +6996,6 @@ type
 //
 
   PIMAGE_FILE_HEADER = ^IMAGE_FILE_HEADER;
-  {$EXTERNALSYM PIMAGE_FILE_HEADER}
   _IMAGE_FILE_HEADER = record
     Machine: WORD;
     NumberOfSections: WORD;
@@ -7006,9 +7005,7 @@ type
     SizeOfOptionalHeader: WORD;
     Characteristics: WORD;
   end;
-  {$EXTERNALSYM _IMAGE_FILE_HEADER}
   IMAGE_FILE_HEADER = _IMAGE_FILE_HEADER;
-  {$EXTERNALSYM IMAGE_FILE_HEADER}
   TImageFileHeader = IMAGE_FILE_HEADER;
   PImageFileHeader = PIMAGE_FILE_HEADER;
 
@@ -7019,7 +7016,6 @@ type
 
 type
   PIMAGE_DEBUG_DIRECTORY = ^IMAGE_DEBUG_DIRECTORY;
-  {$EXTERNALSYM PIMAGE_DEBUG_DIRECTORY}
   _IMAGE_DEBUG_DIRECTORY = record
     Characteristics: DWORD;
     TimeDateStamp: DWORD;
@@ -7030,9 +7026,7 @@ type
     AddressOfRawData: DWORD;
     PointerToRawData: DWORD;
   end;
-  {$EXTERNALSYM _IMAGE_DEBUG_DIRECTORY}
   IMAGE_DEBUG_DIRECTORY = _IMAGE_DEBUG_DIRECTORY;
-  {$EXTERNALSYM IMAGE_DEBUG_DIRECTORY}
   TImageDebugDirectory = IMAGE_DEBUG_DIRECTORY;
   PImageDebugDirectory = PIMAGE_DEBUG_DIRECTORY;
 
@@ -7042,24 +7036,19 @@ type
 
 type
   PIMAGE_DATA_DIRECTORY = ^IMAGE_DATA_DIRECTORY;
-  {$EXTERNALSYM PIMAGE_DATA_DIRECTORY}
   _IMAGE_DATA_DIRECTORY = record
     VirtualAddress: DWORD;
     Size: DWORD;
   end;
-  {$EXTERNALSYM _IMAGE_DATA_DIRECTORY}
   IMAGE_DATA_DIRECTORY = _IMAGE_DATA_DIRECTORY;
-  {$EXTERNALSYM IMAGE_DATA_DIRECTORY}
   TImageDataDirectory = IMAGE_DATA_DIRECTORY;
   PImageDataDirectory = PIMAGE_DATA_DIRECTORY;
 
 const
   IMAGE_NUMBEROF_DIRECTORY_ENTRIES = 16;
-  {$EXTERNALSYM IMAGE_NUMBEROF_DIRECTORY_ENTRIES}
 
 type
   PIMAGE_OPTIONAL_HEADER32 = ^IMAGE_OPTIONAL_HEADER32;
-  {$EXTERNALSYM PIMAGE_OPTIONAL_HEADER32}
   _IMAGE_OPTIONAL_HEADER = record
     //
     // Standard fields.
@@ -7099,14 +7088,11 @@ type
     NumberOfRvaAndSizes: DWORD;
     DataDirectory: array [0..IMAGE_NUMBEROF_DIRECTORY_ENTRIES - 1] of IMAGE_DATA_DIRECTORY;
   end;
-  {$EXTERNALSYM _IMAGE_OPTIONAL_HEADER}
   IMAGE_OPTIONAL_HEADER32 = _IMAGE_OPTIONAL_HEADER;
-  {$EXTERNALSYM IMAGE_OPTIONAL_HEADER32}
   TImageOptionalHeader32 = IMAGE_OPTIONAL_HEADER32;
   PImageOptionalHeader32 = PIMAGE_OPTIONAL_HEADER32;
 
   PIMAGE_ROM_OPTIONAL_HEADER = ^IMAGE_ROM_OPTIONAL_HEADER;
-  {$EXTERNALSYM PIMAGE_ROM_OPTIONAL_HEADER}
   _IMAGE_ROM_OPTIONAL_HEADER = record
     Magic: Word;
     MajorLinkerVersion: Byte;
@@ -7122,14 +7108,11 @@ type
     CprMask: array [0..3] of DWORD;
     GpValue: DWORD;
   end;
-  {$EXTERNALSYM _IMAGE_ROM_OPTIONAL_HEADER}
   IMAGE_ROM_OPTIONAL_HEADER = _IMAGE_ROM_OPTIONAL_HEADER;
-  {$EXTERNALSYM IMAGE_ROM_OPTIONAL_HEADER}
   TImageRomOptionalHeader = IMAGE_ROM_OPTIONAL_HEADER;
   PImageRomOptionalHeader = PIMAGE_ROM_OPTIONAL_HEADER;
 
   PIMAGE_OPTIONAL_HEADER64 = ^IMAGE_OPTIONAL_HEADER64;
-  {$EXTERNALSYM PIMAGE_OPTIONAL_HEADER64}
   _IMAGE_OPTIONAL_HEADER64 = record
     Magic: Word;
     MajorLinkerVersion: Byte;
@@ -7162,86 +7145,62 @@ type
     NumberOfRvaAndSizes: DWORD;
     DataDirectory: array [0..IMAGE_NUMBEROF_DIRECTORY_ENTRIES - 1] of IMAGE_DATA_DIRECTORY;
   end;
-  {$EXTERNALSYM _IMAGE_OPTIONAL_HEADER64}
   IMAGE_OPTIONAL_HEADER64 = _IMAGE_OPTIONAL_HEADER64;
-  {$EXTERNALSYM IMAGE_OPTIONAL_HEADER64}
   TImageOptionalHeader64 = IMAGE_OPTIONAL_HEADER64;
   PImageOptionalHeader64 = PIMAGE_OPTIONAL_HEADER64;
 
 const
   IMAGE_SIZEOF_ROM_OPTIONAL_HEADER  = 56;
-  {$EXTERNALSYM IMAGE_SIZEOF_ROM_OPTIONAL_HEADER}
   IMAGE_SIZEOF_STD_OPTIONAL_HEADER  = 28;
-  {$EXTERNALSYM IMAGE_SIZEOF_STD_OPTIONAL_HEADER}
   IMAGE_SIZEOF_NT_OPTIONAL32_HEADER = 224;
-  {$EXTERNALSYM IMAGE_SIZEOF_NT_OPTIONAL32_HEADER}
   IMAGE_SIZEOF_NT_OPTIONAL64_HEADER = 240;
-  {$EXTERNALSYM IMAGE_SIZEOF_NT_OPTIONAL64_HEADER}
 
   IMAGE_NT_OPTIONAL_HDR32_MAGIC = $10b;
-  {$EXTERNALSYM IMAGE_NT_OPTIONAL_HDR32_MAGIC}
   IMAGE_NT_OPTIONAL_HDR64_MAGIC = $20b;
-  {$EXTERNALSYM IMAGE_NT_OPTIONAL_HDR64_MAGIC}
   IMAGE_ROM_OPTIONAL_HDR_MAGIC  = $107;
-  {$EXTERNALSYM IMAGE_ROM_OPTIONAL_HDR_MAGIC}
 
 type
   IMAGE_OPTIONAL_HEADER = IMAGE_OPTIONAL_HEADER32;
-  {$EXTERNALSYM IMAGE_OPTIONAL_HEADER}
   PIMAGE_OPTIONAL_HEADER = PIMAGE_OPTIONAL_HEADER32;
-  {$EXTERNALSYM PIMAGE_OPTIONAL_HEADER}
   TImageOptionalHeader = IMAGE_OPTIONAL_HEADER;
   PImageOptionalHeader = PIMAGE_OPTIONAL_HEADER;
 
 const
   IMAGE_SIZEOF_NT_OPTIONAL_HEADER = IMAGE_SIZEOF_NT_OPTIONAL32_HEADER;
-  {$EXTERNALSYM IMAGE_SIZEOF_NT_OPTIONAL_HEADER}
   IMAGE_NT_OPTIONAL_HDR_MAGIC     = IMAGE_NT_OPTIONAL_HDR32_MAGIC;
-  {$EXTERNALSYM IMAGE_NT_OPTIONAL_HDR_MAGIC}
 
 type
   PIMAGE_NT_HEADERS64 = ^IMAGE_NT_HEADERS64;
-  {$EXTERNALSYM PIMAGE_NT_HEADERS64}
   _IMAGE_NT_HEADERS64 = record
     Signature: DWORD;
     FileHeader: IMAGE_FILE_HEADER;
     OptionalHeader: IMAGE_OPTIONAL_HEADER64;
   end;
-  {$EXTERNALSYM _IMAGE_NT_HEADERS64}
   IMAGE_NT_HEADERS64 = _IMAGE_NT_HEADERS64;
-  {$EXTERNALSYM IMAGE_NT_HEADERS64}
   TImageNtHeaders64 = IMAGE_NT_HEADERS64;
   PImageNtHeaders64 = PIMAGE_NT_HEADERS64;
 
   PIMAGE_NT_HEADERS32 = ^IMAGE_NT_HEADERS32;
-  {$EXTERNALSYM PIMAGE_NT_HEADERS32}
   _IMAGE_NT_HEADERS = record
     Signature: DWORD;
     FileHeader: IMAGE_FILE_HEADER;
     OptionalHeader: IMAGE_OPTIONAL_HEADER32;
   end;
-  {$EXTERNALSYM _IMAGE_NT_HEADERS}
   IMAGE_NT_HEADERS32 = _IMAGE_NT_HEADERS;
-  {$EXTERNALSYM IMAGE_NT_HEADERS32}
   TImageNtHeaders32 = IMAGE_NT_HEADERS32;
   PImageNtHeaders32 = PIMAGE_NT_HEADERS32;
 
   PIMAGE_ROM_HEADERS = ^IMAGE_ROM_HEADERS;
-  {$EXTERNALSYM PIMAGE_ROM_HEADERS}
   _IMAGE_ROM_HEADERS = record
     FileHeader: IMAGE_FILE_HEADER;
     OptionalHeader: IMAGE_ROM_OPTIONAL_HEADER;
   end;
-  {$EXTERNALSYM _IMAGE_ROM_HEADERS}
   IMAGE_ROM_HEADERS = _IMAGE_ROM_HEADERS;
-  {$EXTERNALSYM IMAGE_ROM_HEADERS}
   TImageRomHeaders = IMAGE_ROM_HEADERS;
   PImageRomHeaders = PIMAGE_ROM_HEADERS;
 
   IMAGE_NT_HEADERS = IMAGE_NT_HEADERS32;
-  {$EXTERNALSYM IMAGE_NT_HEADERS}
   PIMAGE_NT_HEADERS = PIMAGE_NT_HEADERS32;
-  {$EXTERNALSYM PIMAGE_NT_HEADERS}
 
   TImageNtHeaders = IMAGE_NT_HEADERS32;
   PImageNtHeaders = PIMAGE_NT_HEADERS;