diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in
index 2e712952725..79841972fd0 100644
--- a/programs/winhlp32/Makefile.in
+++ b/programs/winhlp32/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = winhlp32.exe
 IMPORTS   = user32 gdi32
 DELAYIMPORTS = shell32 comctl32 comdlg32
diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c
index 3ade6c1d5d0..73c4f4a27af 100644
--- a/programs/winhlp32/hlpfile.c
+++ b/programs/winhlp32/hlpfile.c
@@ -250,7 +250,7 @@ static void HLPFILE_Uncompress2(HLPFILE* hlpfile, const BYTE *ptr, const BYTE *e
 
             if (newptr + (phend - phptr) > newend)
             {
-                WINE_FIXME("buffer overflow %p > %p for %lu bytes\n",
+                WINE_FIXME("buffer overflow %p > %p for %Iu bytes\n",
                            newptr, newend, (SIZE_T)(phend - phptr));
                 return;
             }
@@ -356,7 +356,7 @@ static void HLPFILE_UncompressRLE(const BYTE* src, const BYTE* end, BYTE* dst, u
         dst += ch;
     }
     if (dst != sdst)
-        WINE_WARN("Buffer X-flow: d(%lu) instead of d(%u)\n",
+        WINE_WARN("Buffer X-flow: d(%Iu) instead of d(%u)\n",
                   (SIZE_T)(dst - (sdst - dstsz)), dstsz);
 }
 
@@ -373,7 +373,7 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relativ
 
     if (!hlpfile) return 0;
 
-    WINE_TRACE("<%s>[%x]\n", debugstr_a(hlpfile->lpszPath), offset);
+    WINE_TRACE("<%s>[%lx]\n", debugstr_a(hlpfile->lpszPath), offset);
 
     if (offset == 0xFFFFFFFF) return NULL;
     page = NULL;
@@ -387,7 +387,7 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relativ
         }
     }
     if (!found)
-        WINE_ERR("Page of offset %u not found in file %s\n",
+        WINE_ERR("Page of offset %lu not found in file %s\n",
                  offset, debugstr_a(hlpfile->lpszPath));
     return found;
 }
@@ -424,7 +424,7 @@ static int comp_PageByHash(void *p, const void *key,
     LONG lTest = (INT)GET_UINT(p, 0);
 
     *next = (char *)p+(leaf?8:6);
-    WINE_TRACE("Comparing '%d' with '%d'\n", lKey, lTest);
+    WINE_TRACE("Comparing '%ld' with '%ld'\n", lKey, lTest);
     if (lTest < lKey) return -1;
     if (lTest > lKey) return 1;
     return 0;
@@ -441,7 +441,7 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative)
     if (!hlpfile) return NULL;
     if (!lHash) return HLPFILE_Contents(hlpfile, relative);
 
-    WINE_TRACE("<%s>[%x]\n", debugstr_a(hlpfile->lpszPath), lHash);
+    WINE_TRACE("<%s>[%lx]\n", debugstr_a(hlpfile->lpszPath), lHash);
 
     /* For win 3.0 files hash values are really page numbers */
     if (hlpfile->version <= 16)
@@ -453,7 +453,7 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative)
     ptr = HLPFILE_BPTreeSearch(hlpfile->Context, LongToPtr(lHash), comp_PageByHash);
     if (!ptr)
     {
-        WINE_ERR("Page of hash %x not found in file %s\n", lHash, debugstr_a(hlpfile->lpszPath));
+        WINE_ERR("Page of hash %lx not found in file %s\n", lHash, debugstr_a(hlpfile->lpszPath));
         return NULL;
     }
 
@@ -470,7 +470,7 @@ HLPFILE_PAGE *HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap, ULONG* relative)
 
     if (!hlpfile) return 0;
 
-    WINE_TRACE("<%s>[%x]\n", debugstr_a(hlpfile->lpszPath), lMap);
+    WINE_TRACE("<%s>[%lx]\n", debugstr_a(hlpfile->lpszPath), lMap);
 
     for (i = 0; i < hlpfile->wMapLen; i++)
     {
@@ -478,7 +478,7 @@ HLPFILE_PAGE *HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap, ULONG* relative)
             return HLPFILE_PageByOffset(hlpfile, hlpfile->Map[i].offset, relative);
     }
 
-    WINE_ERR("Page of Map %x not found in file %s\n", lMap, debugstr_a(hlpfile->lpszPath));
+    WINE_ERR("Page of Map %lx not found in file %s\n", lMap, debugstr_a(hlpfile->lpszPath));
     return NULL;
 }
 
@@ -990,7 +990,7 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, HLPFILE* file, const BYTE*
     if (bi->bmiHeader.biBitCount > 32) WINE_FIXME("Unknown bit count %u\n", bi->bmiHeader.biBitCount);
     if (bi->bmiHeader.biPlanes != 1) WINE_FIXME("Unsupported planes %u\n", bi->bmiHeader.biPlanes);
     bi->bmiHeader.biSizeImage = (((bi->bmiHeader.biWidth * bi->bmiHeader.biBitCount + 31) & ~31) / 8) * bi->bmiHeader.biHeight;
-    WINE_TRACE("planes=%d bc=%d size=(%d,%d)\n",
+    WINE_TRACE("planes=%d bc=%d size=(%ld,%ld)\n",
                bi->bmiHeader.biPlanes, bi->bmiHeader.biBitCount,
                bi->bmiHeader.biWidth, bi->bmiHeader.biHeight);
 
@@ -1032,14 +1032,14 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, HLPFILE* file, const BYTE*
     if (!HLPFILE_RtfAddControl(rd, "{\\pict")) goto done;
     if (type == 0x06)
     {
-        sprintf(tmp, "\\dibitmap0\\picw%d\\pich%d",
+        sprintf(tmp, "\\dibitmap0\\picw%ld\\pich%ld",
                 bi->bmiHeader.biWidth, bi->bmiHeader.biHeight);
         if (!HLPFILE_RtfAddControl(rd, tmp)) goto done;
         if (!HLPFILE_RtfAddHexBytes(rd, bi, sizeof(*bi) + nc * sizeof(RGBQUAD))) goto done;
     }
     else
     {
-        sprintf(tmp, "\\wbitmap0\\wbmbitspixel%d\\wbmplanes%d\\picw%d\\pich%d",
+        sprintf(tmp, "\\wbitmap0\\wbmbitspixel%d\\wbmplanes%d\\picw%ld\\pich%ld",
                 bi->bmiHeader.biBitCount, bi->bmiHeader.biPlanes,
                 bi->bmiHeader.biWidth, bi->bmiHeader.biHeight);
         if (!HLPFILE_RtfAddControl(rd, tmp)) goto done;
@@ -1088,7 +1088,7 @@ static BOOL     HLPFILE_RtfAddMetaFile(struct RtfData* rd, HLPFILE* file, const
 
     HLPFILE_AddHotSpotLinks(rd, file, beg, hs_size, hs_offset);
 
-    WINE_TRACE("sz=%u csz=%u offs=%u/%u,%u/%u\n",
+    WINE_TRACE("sz=%lu csz=%lu offs=%lu/%lu,%lu/%lu\n",
                size, csize, off, (ULONG)(ptr - beg), hs_size, hs_offset);
 
     bits = HLPFILE_DecompressGfx(beg + off, csize, size, pack, &alloc);
@@ -1206,7 +1206,7 @@ static HLPFILE_LINK*       HLPFILE_AllocLink(struct RtfData* rd, int cookie,
     else
         rd->current_link = link;
 
-    WINE_TRACE("Link[%d] to %s@%08x:%d\n",
+    WINE_TRACE("Link[%d] to %s@%08lx:%d\n",
                link->cookie, debugstr_a(link->string), link->hash, link->window);
     return link;
 }
@@ -1323,7 +1323,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd,
     lastcol = -1;
     for (nc = 0; nc < ncol; /**/)
     {
-        WINE_TRACE("looking for format at offset %lu in column %d\n", (SIZE_T)(format - (buf + 0x15)), nc);
+        WINE_TRACE("looking for format at offset %Iu in column %d\n", (SIZE_T)(format - (buf + 0x15)), nc);
         if (!HLPFILE_RtfAddControl(rd, "\\pard")) goto done;
         if (buf[0x14] == HLP_TABLE)
         {
@@ -1566,7 +1566,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd,
                             rd->char_pos++;
                             break;
                         case 1:
-                            WINE_FIXME("does it work ??? %x<%u>#%u\n",
+                            WINE_FIXME("does it work ??? %x<%lu>#%u\n",
                                        GET_SHORT(format, 0),
                                        size, GET_SHORT(format, 2));
                             HLPFILE_RtfAddGfxByAddr(rd, page->file, format + 2, size - 4);
@@ -2131,7 +2131,7 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile)
                 wi->win_style = WS_OVERLAPPEDWINDOW;
                 wi->sr_color = (flags & 0x0100) ? GET_UINT(ptr, 86) : 0xFFFFFF;
                 wi->nsr_color = (flags & 0x0200) ? GET_UINT(ptr, 90) : 0xFFFFFF;
-                WINE_TRACE("System-Window: flags=%c%c%c%c%c%c%c%c type=%s name=%s caption=%s (%d,%d)x(%d,%d)\n",
+                WINE_TRACE("System-Window: flags=%c%c%c%c%c%c%c%c type=%s name=%s caption=%s (%ld,%ld)x(%ld,%ld)\n",
                            flags & 0x0001 ? 'T' : 't',
                            flags & 0x0002 ? 'N' : 'n',
                            flags & 0x0004 ? 'C' : 'c',
@@ -2604,7 +2604,7 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, const BYTE *buf, const BYTE *end,
             page->browse_fwd = hlpfile->TOMap[page->browse_fwd];
     }
 
-    WINE_TRACE("Added page[%d]: title=%s %08x << %08x >> %08x\n",
+    WINE_TRACE("Added page[%d]: title=%s %08lx << %08x >> %08lx\n",
                page->wNumber, debugstr_a(page->lpszTitle),
                page->browse_bwd, page->offset, page->browse_fwd);
 
@@ -2707,7 +2707,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath)
             offset -= 12;
         }
 
-        WINE_TRACE("ref=%08x => [%u/%u]\n", ref, index, offset);
+        WINE_TRACE("ref=%08lx => [%u/%u]\n", ref, index, offset);
 
         if (index >= hlpfile->topic_maplen) {WINE_WARN("maplen\n"); break;}
         buf = hlpfile->topic_map[index] + offset;
diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c
index 280e6182361..777efbbf74f 100644
--- a/programs/winhlp32/macro.c
+++ b/programs/winhlp32/macro.c
@@ -160,12 +160,12 @@ void CALLBACK MACRO_About(void)
 
 static void CALLBACK MACRO_AddAccelerator(LONG u1, LONG u2, LPCSTR str)
 {
-    WINE_FIXME("(%u, %u, %s)\n", u1, u2, debugstr_a(str));
+    WINE_FIXME("(%lu, %lu, %s)\n", u1, u2, debugstr_a(str));
 }
 
 static void CALLBACK MACRO_ALink(LPCSTR str1, LONG u, LPCSTR str2)
 {
-    WINE_FIXME("(%s, %u, %s)\n", debugstr_a(str1), u, debugstr_a(str2));
+    WINE_FIXME("(%s, %lu, %s)\n", debugstr_a(str1), u, debugstr_a(str2));
 }
 
 void CALLBACK MACRO_Annotate(void)
@@ -330,7 +330,7 @@ static void CALLBACK MACRO_Contents(void)
 
 static void CALLBACK MACRO_ControlPanel(LPCSTR str1, LPCSTR str2, LONG u)
 {
-    WINE_FIXME("(%s, %s, %u)\n", debugstr_a(str1), debugstr_a(str2), u);
+    WINE_FIXME("(%s, %s, %lu)\n", debugstr_a(str1), debugstr_a(str2), u);
 }
 
 void CALLBACK MACRO_CopyDialog(void)
@@ -372,7 +372,7 @@ static void CALLBACK MACRO_ExecFile(LPCSTR pgm, LPCSTR args, LONG cmd_show, LPCS
 {
     HINSTANCE ret;
 
-    WINE_TRACE("(%s, %s, %u, %s)\n",
+    WINE_TRACE("(%s, %s, %lu, %s)\n",
                debugstr_a(pgm), debugstr_a(args), cmd_show, debugstr_a(topic));
 
     ret = ShellExecuteA(Globals.active_win ? Globals.active_win->hMainWnd : NULL, "open",
@@ -386,7 +386,7 @@ static void CALLBACK MACRO_ExecFile(LPCSTR pgm, LPCSTR args, LONG cmd_show, LPCS
 
 static void CALLBACK MACRO_ExecProgram(LPCSTR str, LONG u)
 {
-    WINE_FIXME("(%s, %u)\n", debugstr_a(str), u);
+    WINE_FIXME("(%s, %lu)\n", debugstr_a(str), u);
 }
 
 void CALLBACK MACRO_Exit(void)
@@ -399,17 +399,17 @@ void CALLBACK MACRO_Exit(void)
 
 static void CALLBACK MACRO_ExtAbleItem(LPCSTR str, LONG u)
 {
-    WINE_FIXME("(%s, %u)\n", debugstr_a(str), u);
+    WINE_FIXME("(%s, %lu)\n", debugstr_a(str), u);
 }
 
 static void CALLBACK MACRO_ExtInsertItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4, LONG u1, LONG u2)
 {
-    WINE_FIXME("(%s, %s, %s, %s, %u, %u)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), debugstr_a(str4), u1, u2);
+    WINE_FIXME("(%s, %s, %s, %s, %lu, %lu)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), debugstr_a(str4), u1, u2);
 }
 
 static void CALLBACK MACRO_ExtInsertMenu(LPCSTR str1, LPCSTR str2, LPCSTR str3, LONG u1, LONG u2)
 {
-    WINE_FIXME("(%s, %s, %s, %u, %u)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), u1, u2);
+    WINE_FIXME("(%s, %s, %s, %lu, %lu)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), u1, u2);
 }
 
 static BOOL CALLBACK MACRO_FileExist(LPCSTR str)
@@ -463,7 +463,7 @@ static void CALLBACK MACRO_FocusWindow(LPCSTR lpszWindow)
 
 static void CALLBACK MACRO_Generate(LPCSTR str, LONG w, LONG l)
 {
-    WINE_FIXME("(%s, %x, %x)\n", debugstr_a(str), w, l);
+    WINE_FIXME("(%s, %lx, %lx)\n", debugstr_a(str), w, l);
 }
 
 static void CALLBACK MACRO_GotoMark(LPCSTR str)
@@ -544,12 +544,12 @@ static BOOL CALLBACK MACRO_InitMPrint(void)
 
 static void CALLBACK MACRO_InsertItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4, LONG u)
 {
-    WINE_FIXME("(%s, %s, %s, %s, %u)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), debugstr_a(str4), u);
+    WINE_FIXME("(%s, %s, %s, %s, %lu)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), debugstr_a(str4), u);
 }
 
 static void CALLBACK MACRO_InsertMenu(LPCSTR str1, LPCSTR str2, LONG u)
 {
-    WINE_FIXME("(%s, %s, %u)\n", debugstr_a(str1), debugstr_a(str2), u);
+    WINE_FIXME("(%s, %s, %lu)\n", debugstr_a(str1), debugstr_a(str2), u);
 }
 
 static BOOL CALLBACK MACRO_IsBook(void)
@@ -574,7 +574,7 @@ void CALLBACK MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context
 {
     HLPFILE*    hlpfile;
 
-    WINE_TRACE("(%s, %s, %d)\n", debugstr_a(lpszPath), debugstr_a(lpszWindow), context);
+    WINE_TRACE("(%s, %s, %ld)\n", debugstr_a(lpszPath), debugstr_a(lpszWindow), context);
     if ((hlpfile = WINHELP_LookupHelpFile(lpszPath)))
         /* Some madness: what user calls 'context', hlpfile calls 'map' */
         WINHELP_OpenHelpWindow(HLPFILE_PageByMap, hlpfile, context,
@@ -586,7 +586,7 @@ void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash)
 {
     HLPFILE*    hlpfile;
 
-    WINE_TRACE("(%s, %s, %u)\n", debugstr_a(lpszPath), debugstr_a(lpszWindow), lHash);
+    WINE_TRACE("(%s, %s, %lu)\n", debugstr_a(lpszPath), debugstr_a(lpszWindow), lHash);
     if (!lpszPath || !lpszPath[0])
         hlpfile = MACRO_CurrentWindow()->page->file;
     else
@@ -639,7 +639,7 @@ static void CALLBACK MACRO_JumpKeyword(LPCSTR lpszPath, LPCSTR lpszWindow, LPCST
 
 static void CALLBACK MACRO_KLink(LPCSTR str1, LONG u, LPCSTR str2, LPCSTR str3)
 {
-    WINE_FIXME("(%s, %u, %s, %s)\n", debugstr_a(str1), u, debugstr_a(str2), debugstr_a(str3));
+    WINE_FIXME("(%s, %lu, %s, %s)\n", debugstr_a(str1), u, debugstr_a(str2), debugstr_a(str3));
 }
 
 static void CALLBACK MACRO_Menu(void)
@@ -649,7 +649,7 @@ static void CALLBACK MACRO_Menu(void)
 
 static void CALLBACK MACRO_MPrintHash(LONG u)
 {
-    WINE_FIXME("(%u)\n", u);
+    WINE_FIXME("(%lu)\n", u);
 }
 
 static void CALLBACK MACRO_MPrintID(LPCSTR str)
@@ -679,12 +679,12 @@ static void CALLBACK MACRO_NoShow(void)
 
 void CALLBACK MACRO_PopupContext(LPCSTR str, LONG u)
 {
-    WINE_FIXME("(%s, %u)\n", debugstr_a(str), u);
+    WINE_FIXME("(%s, %lu)\n", debugstr_a(str), u);
 }
 
 static void CALLBACK MACRO_PopupHash(LPCSTR str, LONG u)
 {
-    WINE_FIXME("(%s, %u)\n", debugstr_a(str), u);
+    WINE_FIXME("(%s, %lu)\n", debugstr_a(str), u);
 }
 
 static void CALLBACK MACRO_PopupId(LPCSTR str1, LPCSTR str2)
@@ -694,7 +694,7 @@ static void CALLBACK MACRO_PopupId(LPCSTR str1, LPCSTR str2)
 
 static void CALLBACK MACRO_PositionWindow(LONG i1, LONG i2, LONG u1, LONG u2, LONG u3, LPCSTR str)
 {
-    WINE_FIXME("(%i, %i, %u, %u, %u, %s)\n", i1, i2, u1, u2, u3, debugstr_a(str));
+    WINE_FIXME("(%li, %li, %lu, %lu, %lu, %s)\n", i1, i2, u1, u2, u3, debugstr_a(str));
 }
 
 static void CALLBACK MACRO_Prev(void)
@@ -787,7 +787,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR
             Globals.dlls = dll;
             dll->handler = (WINHELP_LDLLHandler)GetProcAddress(dll->hLib, "LDLLHandler");
             dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG;
-            WINE_TRACE("Got class %x for DLL %s\n", dll->class, debugstr_a(dll_name));
+            WINE_TRACE("Got class %lx for DLL %s\n", dll->class, debugstr_a(dll_name));
             if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0);
             if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (LONG_PTR)&Callbacks, 0);
         }
@@ -812,7 +812,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR
 
 static void CALLBACK MACRO_RemoveAccelerator(LONG u1, LONG u2)
 {
-    WINE_FIXME("(%u, %u)\n", u1, u2);
+    WINE_FIXME("(%lu, %lu)\n", u1, u2);
 }
 
 static void CALLBACK MACRO_ResetMenu(void)
@@ -832,7 +832,7 @@ static void CALLBACK MACRO_Search(void)
 
 void CALLBACK MACRO_SetContents(LPCSTR str, LONG u)
 {
-    WINE_FIXME("(%s, %u)\n", debugstr_a(str), u);
+    WINE_FIXME("(%s, %lu)\n", debugstr_a(str), u);
 }
 
 static void CALLBACK MACRO_SetHelpOnFile(LPCSTR str)
@@ -851,29 +851,29 @@ static void CALLBACK MACRO_SetPopupColor(LONG r, LONG g, LONG b)
 {
     HLPFILE_PAGE*       page = MACRO_CurrentWindow()->page;
 
-    WINE_TRACE("(%x, %x, %x)\n", r, g, b);
+    WINE_TRACE("(%lx, %lx, %lx)\n", r, g, b);
     page->file->has_popup_color = TRUE;
     page->file->popup_color = RGB(r, g, b);
 }
 
 static void CALLBACK MACRO_ShellExecute(LPCSTR str1, LPCSTR str2, LONG u1, LONG u2, LPCSTR str3, LPCSTR str4)
 {
-    WINE_FIXME("(%s, %s, %u, %u, %s, %s)\n", debugstr_a(str1), debugstr_a(str2), u1, u2, debugstr_a(str3), debugstr_a(str4));
+    WINE_FIXME("(%s, %s, %lu, %lu, %s, %s)\n", debugstr_a(str1), debugstr_a(str2), u1, u2, debugstr_a(str3), debugstr_a(str4));
 }
 
 static void CALLBACK MACRO_ShortCut(LPCSTR str1, LPCSTR str2, LONG w, LONG l, LPCSTR str)
 {
-    WINE_FIXME("(%s, %s, %x, %x, %s)\n", debugstr_a(str1), debugstr_a(str2), w, l, debugstr_a(str));
+    WINE_FIXME("(%s, %s, %lx, %lx, %s)\n", debugstr_a(str1), debugstr_a(str2), w, l, debugstr_a(str));
 }
 
 static void CALLBACK MACRO_TCard(LONG u)
 {
-    WINE_FIXME("(%u)\n", u);
+    WINE_FIXME("(%lu)\n", u);
 }
 
 static void CALLBACK MACRO_Test(LONG u)
 {
-    WINE_FIXME("(%u)\n", u);
+    WINE_FIXME("(%lu)\n", u);
 }
 
 static BOOL CALLBACK MACRO_TestALink(LPCSTR str)
diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index a98a76003ba..73db4b58876 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -356,7 +356,7 @@ static LRESULT  WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam)
 
     if (cds->dwData != 0xA1DE505)
     {
-        WINE_FIXME("Wrong magic number (%08lx)\n", cds->dwData);
+        WINE_FIXME("Wrong magic number (%08Ix)\n", cds->dwData);
         return 0;
     }
 
@@ -366,7 +366,7 @@ static LRESULT  WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam)
     {
         char*   ptr = (wh->ofsFilename) ? (LPSTR)wh + wh->ofsFilename : NULL;
 
-        WINE_TRACE("Got[%u]: cmd=%u data=%08x fn=%s\n",
+        WINE_TRACE("Got[%u]: cmd=%u data=%08lx fn=%s\n",
                    wh->size, wh->command, wh->data, debugstr_a(ptr));
         switch (wh->command)
         {
@@ -1591,7 +1591,7 @@ BOOL WINHELP_CreateIndexWindow(BOOL is_search)
     PropertySheetA(&psHead);
     if (id.jump)
     {
-        WINE_TRACE("got %d as an offset\n", id.offset);
+        WINE_TRACE("got %ld as an offset\n", id.offset);
         WINHELP_OpenHelpWindow(HLPFILE_PageByOffset, id.hlpfile, id.offset,
                                Globals.active_win->info, SW_NORMAL);
     }