diff --git a/controls/listbox.c b/controls/listbox.c
index f4d04e995ca..759373d786b 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -1554,7 +1554,7 @@ static LRESULT LISTBOX_InsertString( WND *wnd, LB_DESCR *descr, INT index,
         return ret;
     }
 
-    TRACE("[%04x]: added item %d '%s'\n",
+    TRACE("[%04x]: added item %d %s\n",
           wnd->hwndSelf, index, HAS_STRINGS(descr) ? debugstr_w(new_str) : "" );
     return index;
 }
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index 9642df77b32..3a7d60a1bd6 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -174,7 +174,7 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile*iface,PAVISTREAM*avis,AVI
 	FIXME("\tfccHandler '%s'\n",fcc);
 	FIXME("\tdwFlags 0x%08lx\n",asi->dwFlags);
 	FIXME("\tdwCaps 0x%08lx\n",asi->dwCaps);
-	FIXME("\tname '%s'\n",debugstr_w(asi->szName));
+	FIXME("\tname %s\n",debugstr_w(asi->szName));
 
 	istream->curframe = 0;
 	*avis = (PAVISTREAM)istream;
@@ -470,7 +470,7 @@ HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM *ppsCompressed,PAVISTREAM ppsS
 		return AVIERR_UNSUPPORTED;
 
 	ICGetInfo(as->hic,&(as->icinfo),sizeof(ICINFO));
-	FIXME("Opened compressor: '%s' '%s'\n",debugstr_w(as->icinfo.szName),debugstr_w(as->icinfo.szDescription));
+	FIXME("Opened compressor: %s %s\n",debugstr_w(as->icinfo.szName),debugstr_w(as->icinfo.szDescription));
 	as->iscompressing = TRUE;
 	memcpy(&(as->aco),aco,sizeof(*aco));
 	if (as->icinfo.dwFlags & VIDCF_COMPRESSFRAMES) {
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index 6935334531e..03b72d70b07 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -738,7 +738,7 @@ STATUSBAR_SetTextW (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM
     nPart = ((INT) wParam) & 0x00ff;
     style = ((INT) wParam) & 0xff00;
 
-    TRACE("part %d -> '%s' with style %04x\n", nPart, debugstr_w(text), style);
+    TRACE("part %d -> %s with style %04x\n", nPart, debugstr_w(text), style);
     if ((infoPtr->simple) || (infoPtr->parts==NULL) || (nPart==255))
 	part = &infoPtr->part0;
     else
diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index 45c3a56d221..5614d53a578 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -2271,7 +2271,7 @@ TAB_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
   TAB_SetItemBounds(hwnd);
   TAB_InvalidateTabArea(hwnd, infoPtr);
   
-  TRACE("[%04x]: added item %d '%s'\n",
+  TRACE("[%04x]: added item %d %s\n",
 	hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
 
   return iItem;
@@ -2340,7 +2340,7 @@ TAB_InsertItemW (HWND hwnd, WPARAM wParam, LPARAM lParam)
   TAB_SetItemBounds(hwnd);
   TAB_InvalidateTabArea(hwnd, infoPtr);
   
-  TRACE("[%04x]: added item %d '%s'\n",
+  TRACE("[%04x]: added item %d %s\n",
 	hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
 
   return iItem;
diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c
index 44eb8cc498d..c6f75a356ae 100644
--- a/dlls/commdlg/filedlg.c
+++ b/dlls/commdlg/filedlg.c
@@ -573,7 +573,7 @@ static LONG FILEDLG_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
   SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0);    
   lstrcpynW(tmpstr, FILEDLG_GetFileType(ofn->lpstrCustomFilter,
 	     (LPWSTR)ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE);
-  TRACE("nFilterIndex = %ld, SetText of edt1 to '%s'\n", 
+  TRACE("nFilterIndex = %ld, SetText of edt1 to %s\n", 
   			ofn->nFilterIndex, debugstr_w(tmpstr));
   SetDlgItemTextW( hWnd, edt1, tmpstr );
   /* get drive list */
@@ -1318,7 +1318,7 @@ BOOL WINAPI GetFileName31W(
         FILEDLG_DestroyPrivate(lfs);
     }
 
-    TRACE("return lpstrFile='%s' !\n", debugstr_w(lpofn->lpstrFile));
+    TRACE("return lpstrFile=%s !\n", debugstr_w(lpofn->lpstrFile));
     return bRet;
 }
 
diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c
index 71d30d037cb..661ae3cbc12 100644
--- a/dlls/msvcrt/data.c
+++ b/dlls/msvcrt/data.c
@@ -154,7 +154,7 @@ void msvcrt_init_args(void)
      We will free it at the end of processing. */
   cmdline = _strdup(MSVCRT__acmdln);
 
-  TRACE("got '%s', wide = '%s'\n", cmdline, debugstr_w(wcmdline));
+  TRACE("got '%s', wide = %s\n", cmdline, debugstr_w(wcmdline));
 
   version = GetVersion();
   MSVCRT__osver       = version >> 16;
diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c
index 2d2d2b21b3d..8dc0ad31694 100644
--- a/dlls/msvcrt/dir.c
+++ b/dlls/msvcrt/dir.c
@@ -325,7 +325,7 @@ WCHAR* _wgetdcwd(int drive, WCHAR * buf, int size)
       return NULL; /* buf too small */
     }
 
-    TRACE(":returning '%s'\n", debugstr_w(dir));
+    TRACE(":returning %s\n", debugstr_w(dir));
     if (!buf)
       return _wcsdup(dir); /* allocate */
     strcpyW(buf,dir);
@@ -414,7 +414,7 @@ void _wsplitpath(const WCHAR *inpath, WCHAR *drv, WCHAR *dir,
   WCHAR ch, *ptr, *p;
   WCHAR pathbuff[MAX_PATH],*path=pathbuff;
 
-  TRACE(":splitting path '%s'\n",debugstr_w(path));
+  TRACE(":splitting path %s\n",debugstr_w(path));
   /* FIXME: Should be an strncpyW or something */
   strcpyW(pathbuff, inpath);
 
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 00d2c026aeb..b2480d686d1 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -215,7 +215,7 @@ HRESULT WINAPI LoadTypeLib16(
     LPOLESTR szFile, /* [in] Name of file to load from */
     ITypeLib** pptLib) /* [out] Pointer to pointer to loaded type library */
 {
-    FIXME("('%s',%p): stub\n",debugstr_w((LPWSTR)szFile),pptLib);
+    FIXME("(%s,%p): stub\n",debugstr_w((LPWSTR)szFile),pptLib);
 
     if (pptLib!=0)
       *pptLib=0;
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index a14c6e570bb..99d87fe890d 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -64,7 +64,7 @@ DWORD WINAPI ParseFieldA(
  */
 DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR dst, DWORD len) 
 {
-	FIXME("('%s',0x%08lx,%p,%ld) stub.\n",
+	FIXME("(%s,0x%08lx,%p,%ld) stub\n",
 	  debugstr_w(src), nField, dst, len);
 	return FALSE;
 }
diff --git a/dlls/wineps/font.c b/dlls/wineps/font.c
index 2852dc34ea7..b89605f0ec7 100644
--- a/dlls/wineps/font.c
+++ b/dlls/wineps/font.c
@@ -30,7 +30,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
     char FaceName[LF_FACESIZE];
 
 
-    TRACE("FaceName = '%s' Height = %ld Italic = %d Weight = %ld\n",
+    TRACE("FaceName = %s Height = %ld Italic = %d Weight = %ld\n",
 	  debugstr_w(lf->lfFaceName), lf->lfHeight, lf->lfItalic,
 	  lf->lfWeight);
 
diff --git a/files/drive.c b/files/drive.c
index 9b0d1699364..8e790e4b0e4 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -1206,7 +1206,7 @@ UINT WINAPI GetDriveTypeA(LPCSTR root) /* [in] String describing drive */
     {
         if ((root[1]) && (root[1] != ':'))
 	{
-	    WARN("invalid root '%s'\n", debugstr_a(root));
+	    WARN("invalid root %s\n", debugstr_a(root));
 	    return DRIVE_NO_ROOT_DIR;
 	}
 	drive = toupper(root[0]) - 'A';
diff --git a/graphics/enhmetafiledrv/init.c b/graphics/enhmetafiledrv/init.c
index 3609bf9068f..b807b3a8e40 100644
--- a/graphics/enhmetafiledrv/init.c
+++ b/graphics/enhmetafiledrv/init.c
@@ -251,7 +251,7 @@ HDC WINAPI CreateEnhMetaFileW(
     HFILE hFile;
     DWORD size = 0, length = 0;
 
-    TRACE("'%s'\n", debugstr_w(filename) );
+    TRACE("%s\n", debugstr_w(filename) );
 
     if (!(dc = DC_AllocDC( &EMFDRV_Funcs ))) return 0;
     dc->header.wMagic = ENHMETAFILE_DC_MAGIC;
diff --git a/graphics/win16drv/font.c b/graphics/win16drv/font.c
index 745153b09f1..e39c9f3462d 100644
--- a/graphics/win16drv/font.c
+++ b/graphics/win16drv/font.c
@@ -80,7 +80,7 @@ HFONT WIN16DRV_FONT_SelectObject( DC * dc, HFONT hfont, FONTOBJ * font)
 
     dc->hFont = hfont;
 
-    TRACE("WIN16DRV_FONT_SelectObject '%s' h=%ld\n",
+    TRACE("WIN16DRV_FONT_SelectObject %s h=%ld\n",
 	  debugstr_w(font->logfont.lfFaceName), font->logfont.lfHeight);
 
 
diff --git a/graphics/x11drv/xfont.c b/graphics/x11drv/xfont.c
index 52d6bb34b70..d58f3ec1f38 100644
--- a/graphics/x11drv/xfont.c
+++ b/graphics/x11drv/xfont.c
@@ -1201,7 +1201,7 @@ static UINT XFONT_GetFontMetric( const fontInfo* pfi,
     ptm->tmDefaultChar = pfi->df.dfDefaultChar;
     ptm->tmBreakChar = pfi->df.dfBreakChar;
  
-    TRACE("Calling Enum proc with FaceName '%s' FullName '%s'\n",
+    TRACE("Calling Enum proc with FaceName %s FullName %s\n",
 	  debugstr_w(pLF->elfLogFont.lfFaceName),
 	  debugstr_w(pLF->elfFullName));
 
diff --git a/objects/font.c b/objects/font.c
index c6e5dd84d6f..da129d05047 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -453,7 +453,7 @@ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf )
 	{
 	    memcpy( &fontPtr->logfont, plf, sizeof(LOGFONTW) );
 
-	    TRACE("(%ld %ld %ld %ld) '%s' %s %s => %04x\n",
+	    TRACE("(%ld %ld %ld %ld) %s %s %s => %04x\n",
                   plf->lfHeight, plf->lfWidth, 
                   plf->lfEscapement, plf->lfOrientation,
                   debugstr_w(plf->lfFaceName),