diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in
index 81c34648ff0..cd4de31dcce 100644
--- a/dlls/atl/Makefile.in
+++ b/dlls/atl/Makefile.in
@@ -6,7 +6,6 @@ MODULE    = atl.dll
 IMPORTLIB = libatl.$(IMPLIBEXT)
 IMPORTS   = ole32 shlwapi user32 advapi32 kernel32
 EXTRALIBS = -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	atl_main.c \
diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c
index fcda0293b28..2fdf901d397 100644
--- a/dlls/atl/atl_main.c
+++ b/dlls/atl/atl_main.c
@@ -43,7 +43,7 @@ HINSTANCE hInst;
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("(0x%p, %ld, %p)\n",hinstDLL,fdwReason,lpvReserved);
+    TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved);
 
     if (fdwReason == DLL_PROCESS_ATTACH) {
         DisableThreadLibraryCalls(hinstDLL);
@@ -143,7 +143,7 @@ HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEA *pM, DWORD dwClsContex
     HRESULT hRes = S_OK;
     int i=0;
 
-    TRACE("(%p %li %li)\n",pM, dwClsContext, dwFlags);
+    TRACE("(%p %i %i)\n",pM, dwClsContext, dwFlags);
 
     if (pM == NULL)
         return E_INVALIDARG;
@@ -222,7 +222,7 @@ HRESULT WINAPI AtlInternalQueryInterface(LPVOID this, const _ATL_INTMAP_ENTRY* p
 
     while (pEntries[i].pFunc != 0)
     {
-        TRACE("Trying entry %i (%p %li %p)\n",i,pEntries[i].piid,
+        TRACE("Trying entry %i (%p %i %p)\n",i,pEntries[i].piid,
               pEntries[i].dw, pEntries[i].pFunc);
 
         if (pEntries[i].piid && IsEqualGUID(iid,pEntries[i].piid))
@@ -244,7 +244,7 @@ HRESULT WINAPI AtlInternalQueryInterface(LPVOID this, const _ATL_INTMAP_ENTRY* p
         }
         i++;
     }
-    TRACE("Done returning (0x%lx)\n",rc);
+    TRACE("Done returning (0x%x)\n",rc);
     return rc;
 }
 
@@ -272,7 +272,7 @@ HRESULT WINAPI AtlAdvise(IUnknown *pUnkCP, IUnknown *pUnk, const IID *iid, LPDWO
  */
 HRESULT WINAPI AtlUnadvise(IUnknown *pUnkCP, const IID *iid, DWORD dw)
 {
-    FIXME("%p %p %ld\n", pUnkCP, iid, dw);
+    FIXME("%p %p %d\n", pUnkCP, iid, dw);
     return S_OK;
 }
 
diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c
index 9770e914e9a..0a62aad1226 100644
--- a/dlls/atl/registrar.c
+++ b/dlls/atl/registrar.c
@@ -249,7 +249,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO
                     SHDeleteKeyW(parent_key, buf->str);
                 lres = RegCreateKeyW(parent_key, buf->str, &hkey);
                 if(lres != ERROR_SUCCESS) {
-                    WARN("Could not create(open) key: %08lx\n", lres);
+                    WARN("Could not create(open) key: %08x\n", lres);
                     hres = HRESULT_FROM_WIN32(lres);
                     break;
                 }
@@ -258,7 +258,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO
             strbuf_write(buf->str, &name, -1);
             lres = RegOpenKeyW(parent_key, buf->str, &hkey);
               if(lres != ERROR_SUCCESS)
-                WARN("Could not open key %s: %08lx\n", debugstr_w(name.str), lres);
+                WARN("Could not open key %s: %08x\n", debugstr_w(name.str), lres);
         }
 
         if(key_type != DO_DELETE && *iter == '=') {
@@ -280,7 +280,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO
                     lres = RegSetValueExW(hkey, name.len ? name.str :  NULL, 0, REG_SZ, (PBYTE)buf->str,
                             (lstrlenW(buf->str)+1)*sizeof(WCHAR));
                     if(lres != ERROR_SUCCESS) {
-                        WARN("Could set value of key: %08lx\n", lres);
+                        WARN("Could set value of key: %08x\n", lres);
                         hres = HRESULT_FROM_WIN32(lres);
                         break;
                     }
@@ -296,7 +296,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO
                     lres = RegSetValueExW(hkey, name.len ? name.str :  NULL, 0, REG_DWORD,
                             (PBYTE)&dw, sizeof(dw));
                     if(lres != ERROR_SUCCESS) {
-                        WARN("Could set value of key: %08lx\n", lres);
+                        WARN("Could set value of key: %08x\n", lres);
                         hres = HRESULT_FROM_WIN32(lres);
                         break;
                     }
@@ -390,7 +390,7 @@ static HRESULT do_process_root_key(LPCOLESTR data, BOOL do_register)
         }
         hres = do_process_key(&iter, root_keys[i].key, &buf, do_register);
         if(FAILED(hres)) {
-            WARN("Processing key failed: %08lx\n", hres);
+            WARN("Processing key failed: %08x\n", hres);
             break;
         }
         hres = get_word(&iter, &buf);
@@ -520,7 +520,7 @@ static ULONG WINAPI Registrar_AddRef(IRegistrar *iface)
 {
     Registrar *This = (Registrar*)iface;
     ULONG ref = InterlockedIncrement(&This->ref);
-    TRACE("(%p) ->%ld\n", This, ref);
+    TRACE("(%p) ->%d\n", This, ref);
     return ref;
 }
 
@@ -529,7 +529,7 @@ static ULONG WINAPI Registrar_Release(IRegistrar *iface)
     Registrar *This = (Registrar*)iface;
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ->%ld\n", This, ref);
+    TRACE("(%p) ->%d\n", This, ref);
     if(!ref) {
         IRegistrar_ClearReplacements(iface);
         HeapFree(GetProcessHeap(), 0, This);
@@ -839,6 +839,6 @@ HRESULT WINAPI DllUnregisterServer(void)
  */
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-    TRACE("dll_count = %lu\n", dll_count);
+    TRACE("dll_count = %u\n", dll_count);
     return dll_count ? S_FALSE : S_OK;
 }