diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in
index c6ec3cdf8da..7315af76b38 100644
--- a/dlls/imagehlp/Makefile.in
+++ b/dlls/imagehlp/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DWINE_NO_LONG_AS_INT
+EXTRADEFS = -D_IMAGEHLP_SOURCE_
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c
index 48649d545ff..aa87e679184 100644
--- a/dlls/imagehlp/access.c
+++ b/dlls/imagehlp/access.c
@@ -174,7 +174,7 @@ BOOL WINAPI MapAndLoad(
     hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL)))
     {
       DWORD dwLastError = GetLastError();
-      WARN("CreateFileMapping: Error = %ld\n", dwLastError);
+      WARN("CreateFileMapping: Error = %d\n", dwLastError);
       SetLastError(dwLastError);
       goto Error;
     }
@@ -185,7 +185,7 @@ BOOL WINAPI MapAndLoad(
     hFileMapping, FILE_MAP_READ, 0, 0, 0)))
     {
       DWORD dwLastError = GetLastError();
-      WARN("MapViewOfFile: Error = %ld\n", dwLastError);
+      WARN("MapViewOfFile: Error = %d\n", dwLastError);
       SetLastError(dwLastError);
       goto Error;
     }
diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c
index b69e4f08626..25720e63d9a 100644
--- a/dlls/imagehlp/integrity.c
+++ b/dlls/imagehlp/integrity.c
@@ -79,7 +79,7 @@ static BOOL IMAGEHLP_GetSecurityDirOffset( HANDLE handle,
     sd = &nt_hdr.OptionalHeader.
                     DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY];
 
-    TRACE("size = %lx addr = %lx\n", sd->Size, sd->VirtualAddress);
+    TRACE("size = %x addr = %x\n", sd->Size, sd->VirtualAddress);
     *pdwSize = sd->Size;
     *pdwOfs = sd->VirtualAddress;
 
@@ -134,7 +134,7 @@ static BOOL IMAGEHLP_GetCertificateOffset( HANDLE handle, DWORD num,
     *pdwOfs = sd_VirtualAddr + offset;
     *pdwSize = len;
 
-    TRACE("len = %lx addr = %lx\n", len, sd_VirtualAddr + offset);
+    TRACE("len = %x addr = %x\n", len, sd_VirtualAddr + offset);
 
     return TRUE;
 }
@@ -166,7 +166,7 @@ BOOL WINAPI ImageEnumerateCertificates(
     const size_t cert_hdr_size = sizeof hdr - sizeof hdr.bCertificate;
     BOOL r;
 
-    TRACE("%p %hd %p %p %ld\n",
+    TRACE("%p %hd %p %p %d\n",
            handle, TypeFilter, CertificateCount, Indices, IndexCount);
 
     if( Indices )
@@ -194,7 +194,7 @@ BOOL WINAPI ImageEnumerateCertificates(
         if( count != cert_hdr_size )
             return FALSE;
 
-        TRACE("Size = %08lx  id = %08hx\n",
+        TRACE("Size = %08x  id = %08hx\n",
                hdr.dwLength, hdr.wCertificateType );
 
         /* check the certificate is not too big or too small */
@@ -227,7 +227,7 @@ BOOL WINAPI ImageGetCertificateData(
 {
     DWORD r, offset, ofs, size, count;
 
-    TRACE("%p %ld %p %p\n", handle, Index, Certificate, RequiredLength);
+    TRACE("%p %d %p %p\n", handle, Index, Certificate, RequiredLength);
 
     if( !IMAGEHLP_GetCertificateOffset( handle, Index, &ofs, &size ) )
         return FALSE;
@@ -271,7 +271,7 @@ BOOL WINAPI ImageGetCertificateHeader(
     DWORD r, offset, ofs, size, count;
     const size_t cert_hdr_size = sizeof *pCert - sizeof pCert->bCertificate;
 
-    TRACE("%p %ld %p\n", handle, index, pCert);
+    TRACE("%p %d %p\n", handle, index, pCert);
 
     if( !IMAGEHLP_GetCertificateOffset( handle, index, &ofs, &size ) )
         return FALSE;
@@ -301,7 +301,7 @@ BOOL WINAPI ImageGetDigestStream(
   HANDLE FileHandle, DWORD DigestLevel,
   DIGEST_FUNCTION DigestFunction, DIGEST_HANDLE DigestHandle)
 {
-  FIXME("(%p, %ld, %p, %p): stub\n",
+  FIXME("(%p, %d, %p, %p): stub\n",
     FileHandle, DigestLevel, DigestFunction, DigestHandle
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -313,7 +313,7 @@ BOOL WINAPI ImageGetDigestStream(
  */
 BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index)
 {
-  FIXME("(%p, %ld): stub\n", FileHandle, Index);
+  FIXME("(%p, %d): stub\n", FileHandle, Index);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
 }
diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c
index 035c6ef1072..a858ad93fe7 100644
--- a/dlls/imagehlp/modify.c
+++ b/dlls/imagehlp/modify.c
@@ -49,7 +49,7 @@ BOOL WINAPI BindImageEx(
   DWORD Flags, LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath,
   PIMAGEHLP_STATUS_ROUTINE StatusRoutine)
 {
-  FIXME("(%ld, %s, %s, %s, %p): stub\n",
+  FIXME("(%d, %s, %s, %s, %p): stub\n",
     Flags, debugstr_a(ImageName), debugstr_a(DllPath),
     debugstr_a(SymbolPath), StatusRoutine
   );
@@ -95,7 +95,7 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile(
   DWORD CalcSum;
   DWORD HdrSum;
 
-  FIXME("(%p, %ld, %p, %p): stub\n",
+  FIXME("(%p, %d, %p, %p): stub\n",
     BaseAddress, FileLength, HeaderSum, CheckSum
   );
 
@@ -278,7 +278,7 @@ BOOL WINAPI ReBaseImage(
   ULONG *NewImageBase, ULONG TimeStamp)
 {
   FIXME(
-    "(%s, %s, %d, %d, %d, %ld, %p, %p, %p, %p, %ld): stub\n",
+    "(%s, %s, %d, %d, %d, %d, %p, %p, %p, %p, %d): stub\n",
       debugstr_a(CurrentImageName),debugstr_a(SymbolPath), fReBase,
       fRebaseSysfileOk, fGoingDown, CheckImageSize, OldImageSize,
       OldImageBase, NewImageSize, NewImageBase, TimeStamp
@@ -316,7 +316,7 @@ BOOL WINAPI SplitSymbols(
   LPSTR ImageName, LPSTR SymbolsPath,
   LPSTR SymbolFilePath, DWORD Flags)
 {
-  FIXME("(%s, %s, %s, %ld): stub\n",
+  FIXME("(%s, %s, %s, %d): stub\n",
     debugstr_a(ImageName), debugstr_a(SymbolsPath),
     debugstr_a(SymbolFilePath), Flags
   );
@@ -346,7 +346,7 @@ BOOL WINAPI UpdateDebugInfoFileEx(
   LPSTR ImageFileName, LPSTR SymbolPath, LPSTR DebugFilePath,
   PIMAGE_NT_HEADERS NtHeaders, DWORD OldChecksum)
 {
-  FIXME("(%s, %s, %s, %p, %ld): stub\n",
+  FIXME("(%s, %s, %s, %p, %d): stub\n",
     debugstr_a(ImageFileName), debugstr_a(SymbolPath),
     debugstr_a(DebugFilePath), NtHeaders, OldChecksum
   );