diff --git a/src/common/platform/primitives.hpp b/src/common/platform/primitives.hpp
index 19fe4c4b..2a5d6de5 100644
--- a/src/common/platform/primitives.hpp
+++ b/src/common/platform/primitives.hpp
@@ -22,6 +22,7 @@ using ULONG = DWORD;
 using DWORD64 = std::uint64_t;
 using ULONGLONG = DWORD64;
 using LONGLONG = std::int64_t;
+using UINT = std::uint32_t;
 
 typedef union _ULARGE_INTEGER
 {
diff --git a/src/common/platform/window.hpp b/src/common/platform/window.hpp
index 26a67d55..a0f20f9b 100644
--- a/src/common/platform/window.hpp
+++ b/src/common/platform/window.hpp
@@ -7,7 +7,7 @@ typedef struct tagPOINT
 {
     LONG x;
     LONG y;
-} POINT, *PPOINT, NEAR *NPPOINT, FAR *LPPOINT;
+} POINT;
 #endif
 
 using wparam = pointer;
@@ -28,7 +28,7 @@ using hinstance = pointer;
 
 struct msg
 {
-    hwnd hwnd;
+    hwnd window;
     UINT message;
     wparam wParam;
     lparam lParam;