diff --git a/gdbsupport/agent.cc b/gdbsupport/agent.cc
index 44b6fcdcf5c..92fcf884f73 100644
--- a/gdbsupport/agent.cc
+++ b/gdbsupport/agent.cc
@@ -97,7 +97,7 @@ agent_look_up_symbols (void *arg)
       if (find_minimal_symbol_address (symbol_list[i].name, addrp,
 				       objfile) != 0)
 	{
-	  DEBUG_AGENT ("symbol `%s' not found\n", symbol_list[i].name);
+	  DEBUG_AGENT ("symbol \"%s\" not found\n", symbol_list[i].name);
 	  return -1;
 	}
     }
diff --git a/gdbsupport/event-loop.cc b/gdbsupport/event-loop.cc
index c6e1b5b4634..7ac899dc38d 100644
--- a/gdbsupport/event-loop.cc
+++ b/gdbsupport/event-loop.cc
@@ -521,7 +521,7 @@ handle_file_event (file_handler *file_ptr, int ready_mask)
 	  if (mask & POLLERR)
 	    warning (_("Error detected on fd %d"), file_ptr->fd);
 	  if (mask & POLLNVAL)
-	    warning (_("Invalid or non-`poll'able fd %d"),
+	    warning (_("Invalid or non-\"poll\"able fd %d"),
 		     file_ptr->fd);
 	  file_ptr->error = 1;
 	}
@@ -546,7 +546,7 @@ handle_file_event (file_handler *file_ptr, int ready_mask)
   if (mask != 0)
     {
       event_loop_ui_debug_printf (file_ptr->is_ui,
-				  "invoking fd file handler `%s`",
+				  "invoking fd file handler \"%s\"",
 				  file_ptr->name.c_str ());
       file_ptr->proc (file_ptr->error, file_ptr->client_data);
     }
diff --git a/gdbsupport/format.cc b/gdbsupport/format.cc
index 43995edf453..35e61e43698 100644
--- a/gdbsupport/format.cc
+++ b/gdbsupport/format.cc
@@ -359,10 +359,10 @@ format_pieces::format_pieces (const char **arg, bool gdb_extensions,
 	    break;
 
 	  case '*':
-	    error (_("`*' not supported for precision or width in printf"));
+	    error (_("\"*\" not supported for precision or width in printf"));
 
 	  case 'n':
-	    error (_("Format specifier `n' not supported in printf"));
+	    error (_("Format specifier \"n\" not supported in printf"));
 
 	  case '\0':
 	    error (_("Incomplete format specifier at end of format string"));