diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index d871dbf3424..9d56d0dac36 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-13  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* Makefile.in (%-ipa.o: ../common/%.c): New rule.
+	(print-utils-ipa.o: ../common/print-utils.c): Remove.
+	(rsp-low-ipa.o: ../common/rsp-low.c): Remove.
+	(errors-ipa.o: ../common/errors.c): Remove.
+	(format-ipa.o: ../common/format.c): Remove.
+	(common-utils-ipa.o: ../common/common-utils.c): Remove.
+
 2017-03-13  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* Makefile.in (%-ipa.o: %.c): New rule.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 20486112a6c..87dbad14f04 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -544,12 +544,6 @@ IPAGENT_COMPILE = $(COMPILE.pre) $(IPAGENT_CFLAGS) $(COMPILE.post)
 ax-ipa.o: ax.c
 	$(IPAGENT_COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
 	$(POSTCOMPILE)
-format-ipa.o: ../common/format.c
-	$(IPAGENT_COMPILE) $<
-	$(POSTCOMPILE)
-common-utils-ipa.o: ../common/common-utils.c
-	$(IPAGENT_COMPILE) $<
-	$(POSTCOMPILE)
 linux-i386-ipa.o: linux-i386-ipa.c
 	$(IPAGENT_COMPILE) $<
 	$(POSTCOMPILE)
@@ -565,15 +559,7 @@ linux-s390-ipa.o: linux-s390-ipa.c
 linux-ppc-ipa.o: linux-ppc-ipa.c
 	$(IPAGENT_COMPILE) $<
 	$(POSTCOMPILE)
-print-utils-ipa.o: ../common/print-utils.c
-	$(IPAGENT_COMPILE) $<
-	$(POSTCOMPILE)
-rsp-low-ipa.o: ../common/rsp-low.c
-	$(IPAGENT_COMPILE) $<
-	$(POSTCOMPILE)
-errors-ipa.o: ../common/errors.c
-	$(IPAGENT_COMPILE) $<
-	$(POSTCOMPILE)
+
 
 ax.o: ax.c
 	$(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
@@ -585,6 +571,10 @@ ax.o: ax.c
 	$(IPAGENT_COMPILE) $<
 	$(POSTCOMPILE)
 
+%-ipa.o: ../common/%.c
+	$(IPAGENT_COMPILE) $<
+	$(POSTCOMPILE)
+
 # Rules for objects that go in the gdbserver binary.
 
 %.o: %.c