diff --git a/src/User32/User32+WINDOWINFO.cs b/src/User32/User32+WINDOWINFO.cs
index 78e72efe..3dc2e7b8 100644
--- a/src/User32/User32+WINDOWINFO.cs
+++ b/src/User32/User32+WINDOWINFO.cs
@@ -3,7 +3,6 @@
 
 namespace PInvoke
 {
-    using System;
     using System.Runtime.InteropServices;
 
     /// <content>
@@ -14,15 +13,15 @@ public partial class User32
         [StructLayout(LayoutKind.Sequential)]
         public struct WINDOWINFO
         {
-            public ushort atomWindowType;
             public uint cbSize;
-            public uint cxWindowBorders;
-            public uint cyWindowBorders;
-            public uint dwExStyle;
+            public RECT rcWindow;
+            public RECT rcClient;
             public uint dwStyle;
+            public uint dwExStyle;
             public uint dwWindowStatus;
-            public RECT rcClient;
-            public RECT rcWindow;
+            public uint cxWindowBorders;
+            public uint cyWindowBorders;
+            public ushort atomWindowType;
             public ushort wCreatorVersion;
 
             public static WINDOWINFO Create()
diff --git a/src/User32/User32+WINMAXINFO.cs b/src/User32/User32+WINMAXINFO.cs
index 9a5ee1fb..76a83946 100644
--- a/src/User32/User32+WINMAXINFO.cs
+++ b/src/User32/User32+WINMAXINFO.cs
@@ -13,11 +13,11 @@ public partial class User32
         [StructLayout(LayoutKind.Sequential)]
         public struct MINMAXINFO
         {
-            public POINT ptMaxPosition;
+            public POINT ptReserved;
             public POINT ptMaxSize;
-            public POINT ptMaxTrackSize;
+            public POINT ptMaxPosition;
             public POINT ptMinTrackSize;
-            public POINT ptReserved;
+            public POINT ptMaxTrackSize;
         }
     }
 }
\ No newline at end of file