diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in
index 839880bfa78..addcd242d8a 100644
--- a/dlls/mscms/Makefile.in
+++ b/dlls/mscms/Makefile.in
@@ -6,7 +6,6 @@ MODULE    = mscms.dll
 IMPORTLIB = libmscms.$(IMPLIBEXT)
 IMPORTS   = kernel32 ntdll
 EXTRALIBS = @LCMSLIBS@
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	handle.c \
diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c
index 3c22de77e85..df449b1d935 100644
--- a/dlls/mscms/mscms_main.c
+++ b/dlls/mscms/mscms_main.c
@@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mscms);
 
 BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 {
-    TRACE( "(%p, %ld, %p)\n", hinst, reason, reserved );
+    TRACE( "(%p, %d, %p)\n", hinst, reason, reserved );
 
     switch (reason)
     {
diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h
index e443a90d356..201b4978b88 100644
--- a/dlls/mscms/mscms_priv.h
+++ b/dlls/mscms/mscms_priv.h
@@ -52,18 +52,6 @@
 #include <lcms.h>
 #endif
 
-/*  Funny thing is lcms.h defines DWORD as an 'unsigned int' whereas Wine
- *  defines it as an 'unsigned long'. To avoid compiler warnings we use a
- *  preprocessor define for DWORD and LPDWORD to get back Wine's orginal
- *  (typedef) definitions.
- */
-
-#undef DWORD
-#undef LPDWORD
-
-#define DWORD   DWORD
-#define LPDWORD LPDWORD
-
 extern DWORD MSCMS_hprofile2access( HPROFILE );
 extern HPROFILE MSCMS_handle2hprofile( HANDLE file );
 extern HPROFILE MSCMS_cmsprofile2hprofile( cmsHPROFILE cmsprofile );
diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c
index b5761bf55fa..f28f5aeb2cf 100644
--- a/dlls/mscms/profile.c
+++ b/dlls/mscms/profile.c
@@ -171,7 +171,7 @@ BOOL WINAPI GetColorProfileElement( HPROFILE profile, TAGTYPE type, DWORD offset
     DWORD i, count;
     icTag tag;
 
-    TRACE( "( %p, 0x%08lx, %ld, %p, %p, %p )\n", profile, type, offset, size, buffer, ref );
+    TRACE( "( %p, 0x%08x, %d, %p, %p, %p )\n", profile, type, offset, size, buffer, ref );
 
     if (!iccprofile || !size || !ref) return FALSE;
     count = MSCMS_get_tag_count( iccprofile );
@@ -225,7 +225,7 @@ BOOL WINAPI GetColorProfileElementTag( HPROFILE profile, DWORD index, PTAGTYPE t
     DWORD count;
     icTag tag;
 
-    TRACE( "( %p, %ld, %p )\n", profile, index, type );
+    TRACE( "( %p, %d, %p )\n", profile, index, type );
 
     if (!iccprofile || !type) return FALSE;
 
@@ -362,7 +362,7 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile
     BOOL ret = FALSE;
     DWORD sizeW;
 
-    TRACE( "( 0x%08lx, %p, %p )\n", id, profile, size );
+    TRACE( "( 0x%08x, %p, %p )\n", id, profile, size );
 
     if (machine) 
     {
@@ -427,7 +427,7 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi
     WCHAR rgbprofile[MAX_PATH];
     DWORD len = sizeof(rgbprofile);
 
-    TRACE( "( 0x%08lx, %p, %p )\n", id, profile, size );
+    TRACE( "( 0x%08x, %p, %p )\n", id, profile, size );
 
     if (machine) 
     {
@@ -520,15 +520,15 @@ static BOOL MSCMS_match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr )
     }
     if (rec->dwFields & ET_MEDIATYPE)
     {
-        FIXME( "ET_MEDIATYPE: 0x%08lx\n", rec->dwMediaType );
+        FIXME( "ET_MEDIATYPE: 0x%08x\n", rec->dwMediaType );
     }
     if (rec->dwFields & ET_DITHERMODE)
     {
-        FIXME( "ET_DITHERMODE: 0x%08lx\n", rec->dwDitheringMode );
+        FIXME( "ET_DITHERMODE: 0x%08x\n", rec->dwDitheringMode );
     }
     if (rec->dwFields & ET_RESOLUTION)
     {
-        FIXME( "ET_RESOLUTION: 0x%08lx, 0x%08lx\n",
+        FIXME( "ET_RESOLUTION: 0x%08x, 0x%08x\n",
                rec->dwResolution[0], rec->dwResolution[1] );
     }
     if (rec->dwFields & ET_DEVICECLASS)
@@ -567,7 +567,7 @@ static BOOL MSCMS_match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr )
     }
     if (rec->dwFields & ET_PROFILEFLAGS)
     {
-        TRACE( "ET_PROFILEFLAGS: 0x%08lx\n", rec->dwProfileFlags );
+        TRACE( "ET_PROFILEFLAGS: 0x%08x\n", rec->dwProfileFlags );
         if (rec->dwProfileFlags != hdr->phProfileFlags) return FALSE;
     }
     if (rec->dwFields & ET_MANUFACTURER)
@@ -582,14 +582,14 @@ static BOOL MSCMS_match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr )
     }
     if (rec->dwFields & ET_ATTRIBUTES)
     {
-        TRACE( "ET_ATTRIBUTES: 0x%08lx, 0x%08lx\n",
+        TRACE( "ET_ATTRIBUTES: 0x%08x, 0x%08x\n",
                rec->dwAttributes[0], rec->dwAttributes[1] );
         if (rec->dwAttributes[0] != hdr->phAttributes[0] || 
             rec->dwAttributes[1] != hdr->phAttributes[1]) return FALSE;
     }
     if (rec->dwFields & ET_RENDERINGINTENT)
     {
-        TRACE( "ET_RENDERINGINTENT: 0x%08lx\n", rec->dwRenderingIntent );
+        TRACE( "ET_RENDERINGINTENT: 0x%08x\n", rec->dwRenderingIntent );
         if (rec->dwRenderingIntent != hdr->phRenderingIntent) return FALSE;
     }
     if (rec->dwFields & ET_CREATOR)
@@ -949,7 +949,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE profile, TAGTYPE type, PBOOL pres
     DWORD i, count;
     icTag tag;
 
-    TRACE( "( %p, 0x%08lx, %p )\n", profile, type, present );
+    TRACE( "( %p, 0x%08x, %p )\n", profile, type, present );
 
     if (!iccprofile || !present) return FALSE;
 
@@ -1025,7 +1025,7 @@ BOOL WINAPI SetColorProfileElement( HPROFILE profile, TAGTYPE type, DWORD offset
     DWORD i, count, access = MSCMS_hprofile2access( profile );
     icTag tag;
 
-    TRACE( "( %p, 0x%08lx, %ld, %p, %p )\n", profile, type, offset, size, buffer );
+    TRACE( "( %p, 0x%08x, %d, %p, %p )\n", profile, type, offset, size, buffer );
 
     if (!iccprofile || !size || !buffer) return FALSE;
     if (!(access & PROFILE_READWRITE)) return FALSE;
@@ -1145,7 +1145,7 @@ HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing
 {
     HPROFILE handle = NULL;
 
-    TRACE( "( %p, 0x%08lx, 0x%08lx, 0x%08lx )\n", profile, access, sharing, creation );
+    TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation );
 
     if (!profile || !profile->pProfileData) return NULL;
 
@@ -1205,7 +1205,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing
     HANDLE handle = NULL;
     DWORD size;
 
-    TRACE( "( %p, 0x%08lx, 0x%08lx, 0x%08lx )\n", profile, access, sharing, creation );
+    TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation );
 
     if (!profile || !profile->pProfileData) return NULL;
 
diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c
index a2a1282f998..4d7a6d1b2c7 100644
--- a/dlls/mscms/stub.c
+++ b/dlls/mscms/stub.c
@@ -49,7 +49,7 @@ BOOL WINAPI CheckBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT forma
                              DWORD height, DWORD stride, PBYTE result, PBMCALLBACKFN callback,
                              LPARAM data )
 {
-    FIXME( "( %p, %p, 0x%08x, 0x%08lx, 0x%08lx, 0x%08lx, %p, %p, 0x%08lx ) stub\n",
+    FIXME( "( %p, %p, 0x%08x, 0x%08x, 0x%08x, 0x%08x, %p, %p, 0x%08lx ) stub\n",
            transform, srcbits, format, width, height, stride, result, callback, data );
 
     return FALSE;
@@ -58,21 +58,21 @@ BOOL WINAPI CheckBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT forma
 BOOL WINAPI CheckColors( HTRANSFORM transform, PCOLOR colors, DWORD number, COLORTYPE type,
                          PBYTE result )
 {
-    FIXME( "( %p, %p, 0x%08lx, 0x%08x, %p ) stub\n", transform, colors, number, type, result );
+    FIXME( "( %p, %p, 0x%08x, 0x%08x, %p ) stub\n", transform, colors, number, type, result );
 
     return FALSE;
 }
 
 BOOL WINAPI ConvertColorNameToIndex( HPROFILE profile, PCOLOR_NAME name, PDWORD index, DWORD count )
 {
-    FIXME( "( %p, %p, %p, 0x%08lx ) stub\n", profile, name, index, count );
+    FIXME( "( %p, %p, %p, 0x%08x ) stub\n", profile, name, index, count );
 
     return FALSE;
 }
 
 BOOL WINAPI ConvertIndexToColorName( HPROFILE profile, PDWORD index, PCOLOR_NAME name, DWORD count )
 {
-    FIXME( "( %p, %p, %p, 0x%08lx ) stub\n", profile, index, name, count );
+    FIXME( "( %p, %p, %p, 0x%08x ) stub\n", profile, index, name, count );
 
     return FALSE;
 }
@@ -80,7 +80,7 @@ BOOL WINAPI ConvertIndexToColorName( HPROFILE profile, PDWORD index, PCOLOR_NAME
 BOOL WINAPI CreateDeviceLinkProfile( PHPROFILE profiles, DWORD nprofiles, PDWORD intents,
                                      DWORD nintents, DWORD flags, PBYTE *data, DWORD index )
 {
-    FIXME( "( %p, 0x%08lx, %p, 0x%08lx, 0x%08lx, %p, 0x%08lx ) stub\n",
+    FIXME( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x ) stub\n",
            profiles, nprofiles, intents, nintents, flags, data, index );
 
     return FALSE;
@@ -118,7 +118,7 @@ DWORD WINAPI GenerateCopyFilePaths( LPCWSTR printer, LPCWSTR directory, LPBYTE c
                                     DWORD level, LPWSTR sourcedir, LPDWORD sourcedirsize,
                                     LPWSTR targetdir, LPDWORD targetdirsize, DWORD flags )
 {
-    FIXME( "( %s, %s, %p, 0x%08lx, %p, %p, %p, %p, 0x%08lx ) stub\n",
+    FIXME( "( %s, %s, %p, 0x%08x, %p, %p, %p, %p, 0x%08x ) stub\n",
            debugstr_w(printer), debugstr_w(directory), clientinfo, level, sourcedir,
            sourcedirsize, targetdir, targetdirsize, flags );
     return ERROR_SUCCESS;
@@ -126,7 +126,7 @@ DWORD WINAPI GenerateCopyFilePaths( LPCWSTR printer, LPCWSTR directory, LPBYTE c
 
 DWORD WINAPI GetCMMInfo( HTRANSFORM transform, DWORD info )
 {
-    FIXME( "( %p, 0x%08lx ) stub\n", transform, info );
+    FIXME( "( %p, 0x%08x ) stub\n", transform, info );
 
     return 0;
 }
@@ -141,14 +141,14 @@ BOOL WINAPI GetNamedProfileInfo( HPROFILE profile, PNAMED_PROFILE_INFO info )
 BOOL WINAPI GetPS2ColorRenderingDictionary( HPROFILE profile, DWORD intent, PBYTE buffer,
                                             PDWORD size, PBOOL binary )
 {
-    FIXME( "( %p, 0x%08lx, %p, %p, %p ) stub\n", profile, intent, buffer, size, binary );
+    FIXME( "( %p, 0x%08x, %p, %p, %p ) stub\n", profile, intent, buffer, size, binary );
 
     return FALSE;
 }
 
 BOOL WINAPI GetPS2ColorRenderingIntent( HPROFILE profile, DWORD intent, PBYTE buffer, PDWORD size )
 {
-    FIXME( "( %p, 0x%08lx, %p, %p ) stub\n", profile, intent, buffer, size );
+    FIXME( "( %p, 0x%08x, %p, %p ) stub\n", profile, intent, buffer, size );
 
     return FALSE;
 }
@@ -156,68 +156,68 @@ BOOL WINAPI GetPS2ColorRenderingIntent( HPROFILE profile, DWORD intent, PBYTE bu
 BOOL WINAPI GetPS2ColorSpaceArray( HPROFILE profile, DWORD intent, DWORD type, PBYTE buffer,
                                    PDWORD size, PBOOL binary )
 {
-    FIXME( "( %p, 0x%08lx, 0x%08lx, %p, %p, %p ) stub\n", profile, intent, type, buffer, size, binary );
+    FIXME( "( %p, 0x%08x, 0x%08x, %p, %p, %p ) stub\n", profile, intent, type, buffer, size, binary );
 
     return FALSE;
 }
 
 BOOL WINAPI RegisterCMMA( PCSTR machine, DWORD id, PCSTR dll )
 {
-    FIXME( "( %p, 0x%08lx, %p ) stub\n", machine, id, dll );
+    FIXME( "( %p, 0x%08x, %p ) stub\n", machine, id, dll );
 
     return TRUE;
 }
 
 BOOL WINAPI RegisterCMMW( PCWSTR machine, DWORD id, PCWSTR dll )
 {
-    FIXME( "( %p, 0x%08lx, %p ) stub\n", machine, id, dll );
+    FIXME( "( %p, 0x%08x, %p ) stub\n", machine, id, dll );
 
     return TRUE;
 }
 
 BOOL WINAPI SelectCMM( DWORD id )
 {
-    FIXME( "( 0x%08lx ) stub\n", id );
+    FIXME( "( 0x%08x ) stub\n", id );
 
     return TRUE;
 }
 
 BOOL WINAPI SetColorProfileElementReference( HPROFILE profile, TAGTYPE type, TAGTYPE ref )
 {
-    FIXME( "( %p, 0x%08lx, 0x%08lx ) stub\n", profile, type, ref );
+    FIXME( "( %p, 0x%08x, 0x%08x ) stub\n", profile, type, ref );
 
     return TRUE;
 }
 
 BOOL WINAPI SetColorProfileElementSize( HPROFILE profile, TAGTYPE type, DWORD size )
 {
-    FIXME( "( %p, 0x%08lx, 0x%08lx ) stub\n", profile, type, size );
+    FIXME( "( %p, 0x%08x, 0x%08x ) stub\n", profile, type, size );
 
     return FALSE;
 }
 
 BOOL WINAPI SetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile )
 {
-    FIXME( "( 0x%08lx, %p ) stub\n", id, profile );
+    FIXME( "( 0x%08x, %p ) stub\n", id, profile );
     return TRUE;
 }
 
 BOOL WINAPI SetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profile )
 {
-    FIXME( "( 0x%08lx, %p ) stub\n", id, profile );
+    FIXME( "( 0x%08x, %p ) stub\n", id, profile );
     return TRUE;
 }
 
 BOOL WINAPI SpoolerCopyFileEvent( LPWSTR printer, LPWSTR key, DWORD event )
 {
-    FIXME( "( %s, %s, 0x%08lx ) stub\n", debugstr_w(printer), debugstr_w(key), event );
+    FIXME( "( %s, %s, 0x%08x ) stub\n", debugstr_w(printer), debugstr_w(key), event );
     return TRUE;
 }
 
 BOOL WINAPI TranslateColors( HTRANSFORM transform, PCOLOR inputcolors, DWORD number,
                              COLORTYPE input, PCOLOR outputcolors, COLORTYPE output )
 {
-    FIXME( "( %p, %p, 0x%08lx, 0x%08x, %p, 0x%08x ) stub\n", transform, inputcolors,
+    FIXME( "( %p, %p, 0x%08x, 0x%08x, %p, 0x%08x ) stub\n", transform, inputcolors,
            number, input, outputcolors, output );
 
     return FALSE;
@@ -225,14 +225,14 @@ BOOL WINAPI TranslateColors( HTRANSFORM transform, PCOLOR inputcolors, DWORD num
 
 BOOL WINAPI UnregisterCMMA( PCSTR machine, DWORD id )
 {
-    FIXME( "( %p, 0x%08lx ) stub\n", machine, id );
+    FIXME( "( %p, 0x%08x ) stub\n", machine, id );
 
     return TRUE;
 }
 
 BOOL WINAPI UnregisterCMMW( PCWSTR machine, DWORD id )
 {
-    FIXME( "( %p, 0x%08lx ) stub\n", machine, id );
+    FIXME( "( %p, 0x%08x ) stub\n", machine, id );
 
     return TRUE;
 }
diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c
index 57979f3e460..a38b43e2e1f 100644
--- a/dlls/mscms/transform.c
+++ b/dlls/mscms/transform.c
@@ -40,7 +40,7 @@ HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest,
     LOGCOLORSPACEW spaceW;
     DWORD len;
 
-    TRACE( "( %p, %p, %p, 0x%08lx )\n", space, dest, target, flags );
+    TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags );
 
     if (!space || !dest) return FALSE;
 
@@ -62,7 +62,7 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest,
     cmsHPROFILE cmsprofiles[3];
     int intent;
 
-    TRACE( "( %p, %p, %p, 0x%08lx )\n", space, dest, target, flags );
+    TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags );
 
     if (!space || !dest) return FALSE;
 
@@ -97,7 +97,7 @@ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofil
     cmsHTRANSFORM cmstransform;
     DWORD i;
 
-    TRACE( "( %p, 0x%08lx, %p, 0x%08lx, 0x%08lx, 0x%08lx ) stub\n",
+    TRACE( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, 0x%08x ) stub\n",
            profiles, nprofiles, intents, nintents, flags, cmm );
 
     if (!profiles || !intents) return NULL;
@@ -145,7 +145,7 @@ BOOL WINAPI TranslateBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT i
 #ifdef HAVE_LCMS
     cmsHTRANSFORM cmstransform;
 
-    TRACE( "( %p, %p, 0x%08x, 0x%08lx, 0x%08lx, 0x%08lx, %p, 0x%08x, 0x%08lx, %p, 0x%08lx )\n",
+    TRACE( "( %p, %p, 0x%08x, 0x%08x, 0x%08x, 0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x )\n",
            transform, srcbits, input, width, height, inputstride, destbits, output,
            outputstride, callback, data );