diff --git a/dlls/imagehlp/debug.c b/dlls/imagehlp/debug.c
index 6b94cfdc946..d73c9f8cf95 100644
--- a/dlls/imagehlp/debug.c
+++ b/dlls/imagehlp/debug.c
@@ -75,7 +75,7 @@ PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(
  */
 BOOL WINAPI StackWalk(
   DWORD MachineType, HANDLE hProcess, HANDLE hThread,
-  PSTACKFRAME StackFrame, PVOID ContextRecord,
+  LPSTACKFRAME StackFrame, LPVOID ContextRecord,
   PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine,
   PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine,
   PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine,
diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c
index 150ca013beb..3803f2d9e70 100644
--- a/dlls/imagehlp/imagehlp_main.c
+++ b/dlls/imagehlp/imagehlp_main.c
@@ -58,7 +58,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 /***********************************************************************
  *           ImagehlpApiVersion (IMAGEHLP.@)
  */
-PAPI_VERSION WINAPI ImagehlpApiVersion()
+LPAPI_VERSION WINAPI ImagehlpApiVersion(VOID)
 {
   return &IMAGEHLP_ApiVersion;
 }
@@ -66,7 +66,7 @@ PAPI_VERSION WINAPI ImagehlpApiVersion()
 /***********************************************************************
  *           ImagehlpApiVersionEx (IMAGEHLP.@)
  */
-PAPI_VERSION WINAPI ImagehlpApiVersionEx(PAPI_VERSION AppVersion)
+LPAPI_VERSION WINAPI ImagehlpApiVersionEx(LPAPI_VERSION AppVersion)
 {
   if(!AppVersion)
     return NULL;
diff --git a/include/imagehlp.h b/include/imagehlp.h
index 2206cd03598..511abc17d2d 100644
--- a/include/imagehlp.h
+++ b/include/imagehlp.h
@@ -25,6 +25,8 @@
 extern "C" {
 #endif /* defined(__cplusplus) */
 
+#define API_VERSION_NUMBER 7 		/* 7 is the default */
+
 /***********************************************************************
  * Types
  */
@@ -168,7 +170,7 @@ typedef struct _API_VERSION {
   USHORT  MinorVersion;
   USHORT  Revision;
   USHORT  Reserved;
-} API_VERSION, *PAPI_VERSION;
+} API_VERSION, *LPAPI_VERSION;
 
 typedef struct _IMAGE_DEBUG_INFORMATION {
   LIST_ENTRY List;
@@ -240,7 +242,7 @@ typedef struct _STACKFRAME {
   BOOL    Virtual;
   DWORD     Reserved[3];
   KDHELP  KdHelp;
-} STACKFRAME, *PSTACKFRAME, *LPSTACKFRAME;
+} STACKFRAME, *LPSTACKFRAME;
 
 typedef struct _IMAGEHLP_SYMBOL {
   DWORD SizeOfStruct;
@@ -414,11 +416,11 @@ PVOID WINAPI ImageRvaToVa(
 BOOL WINAPI ImageUnload(
   PLOADED_IMAGE LoadedImage
 );
-PAPI_VERSION WINAPI ImagehlpApiVersion(
+LPAPI_VERSION WINAPI ImagehlpApiVersion(
   void
 );
-PAPI_VERSION WINAPI ImagehlpApiVersionEx(
-  PAPI_VERSION AppVersion
+LPAPI_VERSION WINAPI ImagehlpApiVersionEx(
+  LPAPI_VERSION AppVersion
 );
 BOOL WINAPI MakeSureDirectoryPathExists(
   LPCSTR DirPath
@@ -462,7 +464,7 @@ BOOL WINAPI SplitSymbols(
 );
 BOOL WINAPI StackWalk(
   DWORD MachineType, HANDLE hProcess, HANDLE hThread,
-  PSTACKFRAME StackFrame, PVOID ContextRecord,
+  LPSTACKFRAME StackFrame, PVOID ContextRecord,
   PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine,
   PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine,
   PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine,