diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec
index f8f02bbf6fc..8fdd97c82ae 100644
--- a/dlls/dbghelp/dbghelp.spec
+++ b/dlls/dbghelp/dbghelp.spec
@@ -28,7 +28,7 @@
 @ stdcall SymCleanup(long)
 @ stdcall SymEnumSourceFiles(ptr long long str ptr ptr)
 @ stub SymEnumSym
-@ stdcall SymEnumSymbols(long long str ptr ptr)
+@ stdcall SymEnumSymbols(ptr long long str ptr ptr)
 @ stdcall SymEnumTypes(ptr long long ptr ptr)
 @ stdcall SymEnumerateModules(long ptr ptr)
 @ stub SymEnumerateModules64
diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c
index 61640337e57..604998fde3e 100644
--- a/dlls/dbghelp/path.c
+++ b/dlls/dbghelp/path.c
@@ -191,7 +191,7 @@ BOOL WINAPI SearchTreeForFile(LPSTR root, LPSTR file, LPSTR buffer)
  *
  */
 BOOL WINAPI EnumDirTree(HANDLE hProcess, PCSTR root, PCSTR file,
-                        LPSTR buffer, PENUMDIRTREE_CALLBACK cb, void* user)
+                        LPSTR buffer, PENUMDIRTREE_CALLBACK cb, PVOID user)
 {
     TRACE("(%p %s %s %p %p %p)\n", hProcess, root, file, buffer, cb, user);
 
diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c
index 87a6f672282..09cb33440af 100644
--- a/dlls/dbghelp/source.c
+++ b/dlls/dbghelp/source.c
@@ -96,7 +96,7 @@ const char* source_get(const struct module* module, unsigned idx)
  */
 BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, LPSTR Mask,
                                PSYM_ENUMSOURCFILES_CALLBACK cbSrcFiles,
-                               void* UserContext)
+                               PVOID UserContext)
 {
     struct process*     pcs;
     struct module*      module;
diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c
index 9746b3c0c3a..67d06251538 100644
--- a/dlls/dbghelp/type.c
+++ b/dlls/dbghelp/type.c
@@ -361,7 +361,7 @@ struct symt_typedef* symt_new_typedef(struct module* module, struct symt* ref,
  */
 BOOL WINAPI SymEnumTypes(HANDLE hProcess, ULONG64 BaseOfDll,
                          PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback,
-                         void* UserContext)
+                         PVOID UserContext)
 {
     struct process*     pcs;
     struct module*      module;
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 30fdb6f6447..a2b1afe544e 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -600,11 +600,15 @@ HANDLE
 HMODULE
 IMAGEHLP_SYMBOL_TYPE_INFO
 ULONG
-unsigned long
+
+%longlong
+
+DWORD64
+ULONG64
 
 %ptr
 
-DWORD *
+DWORD64 *
 LPAPI_VERSION
 LPSTACKFRAME
 LPVOID
@@ -631,7 +635,7 @@ PSYMBOL_INFO
 PTRANSLATE_ADDRESS_ROUTINE
 PVOID
 char *
-void *
+char **
 
 %str