diff --git a/packages/winunits-base/src/richedit.pp b/packages/winunits-base/src/richedit.pp
index 18a188eb6f..293cc99403 100644
--- a/packages/winunits-base/src/richedit.pp
+++ b/packages/winunits-base/src/richedit.pp
@@ -19,7 +19,7 @@ uses Messages, Windows;
 {$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
-{$PACKRECORDS C}
+{$PACKRECORDS 4} // MS header contains pshpack4 under ifdef win32
 {$ENDIF}
 
 Const
@@ -700,7 +700,7 @@ Const
 
      EDITSTREAMCALLBACK = function (dwCookie:DWORD_PTR; pbBuff:LPBYTE; cb:LONG; var pcb:LONG):DWORD;
 
-     _editstream = record
+     _editstream = packed record
           dwCookie : DWORD_PTR;
           dwError : DWORD;
           pfnCallback : EDITSTREAMCALLBACK;
diff --git a/rtl/win/wininc/struct.inc b/rtl/win/wininc/struct.inc
index 86a3c79cbf..1ffa13ad1a 100644
--- a/rtl/win/wininc/struct.inc
+++ b/rtl/win/wininc/struct.inc
@@ -2535,7 +2535,7 @@ Const
      TDRIVERINFO3 = DRIVER_INFO_3;
      PDRIVERINFO3 = ^DRIVER_INFO_3;
 
-     EDITSTREAM = record
+     EDITSTREAM = packed record
           dwCookie : DWORD_PTR;
           dwError : DWORD;
           pfnCallback : EDITSTREAMCALLBACK;