diff --git a/src/ChangeLog b/src/ChangeLog
index fe12999e455..c393527d39c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
 	* xfns.c (free_frame_menubar, atof): Remove duplicate decls.
 	(x_window): Rename locals to avoid shadowing.
+	(USG): Use the kludged USG macro, to pacify gcc.
 
 	* xterm.c (x_alloc_nearest_color_for_widget): Remove; unused.
 	(x_term_init): Remove local to avoid shadowing.
diff --git a/src/xfns.c b/src/xfns.c
index 3d17f22be63..1489cbf043e 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -83,6 +83,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef USG	/* ####KLUDGE for Solaris 2.2 and up */
 #include <X11/Xos.h>
 #define USG
+#ifdef USG /* Pacify gcc -Wunused-macros.  */
+#endif
 #else
 #include <X11/Xos.h>
 #endif