diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 6161f3ac6..d1d03b8c6 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -925,6 +925,21 @@
     <platform type="win32W"/>
     <platform type="win64"/>
   </platformtype>
+  <platformtype name="PULONG32" value="int">
+    <unsigned/>
+    <pointer/>
+    <platform type="win32A"/>
+    <platform type="win32W"/>
+    <platform type="win64"/>
+  </platformtype>
+  <platformtype name="PULONG64" value="long">
+    <unsigned/>
+    <long/>
+    <pointer/>
+    <platform type="win32A"/>
+    <platform type="win32W"/>
+    <platform type="win64"/>
+  </platformtype>
   <platformtype name="ULONGLONG" value="long">
     <unsigned/>
     <long/>
@@ -5293,7 +5308,7 @@ HFONT CreateFont(
   <define name="DECLARE_DYNCREATE(x)" value=""/>
   <define name="INVALID_HANDLE_VALUE" value="0"/>
   <define name="INVALID_SOCKET" value="0"/>
-  <define name="WINAPI" value=""/>
+  <define name="WINAPI" value="__stdcall"/>
   <define name="__pragma(x)" value=""/>
   <define name="_countof(_Array)" value="(sizeof(_Array) / sizeof(_Array[0]))"/>
   <define name="__wchar_t" value="wchar_t"/>
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index a1ce7baf7..f84f17add 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -6229,6 +6229,10 @@ private:
                             "PDWORD_PTR pdWordPtr;"
                             "PDWORD32 pdWord32;"
                             "PDWORD64 pdWord64;"
+                            "LONGLONG ll;"
+                            "USN usn;"
+                            "PULONG64 puLong64;"
+                            "PULONG32 puLong32;"
                             "PFLOAT ptrToFloat;";
 
         const char expected[] = "int f ; "
@@ -6306,6 +6310,10 @@ private:
                                 "long * pdWordPtr ; "
                                 "unsigned int * pdWord32 ; "
                                 "unsigned long * pdWord64 ; "
+                                "long long ll ; "
+                                "long long usn ; "
+                                "unsigned long long * puLong64 ; "
+                                "unsigned int * puLong32 ; "
                                 "float * ptrToFloat ;";
 
         // These types should be defined the same on all Windows platforms