diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b62ed4c02b..40a765a3ed 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-12  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* linux-aarch32-tdesc.c: Include linux-aarch32-tdesc.h.
+	* linux-aarch64-tdesc.c: Include linux-aarch64-tdesc.h.
+
 2020-01-10  Pedro Alves  <palves@redhat.com>
 
 	* fork-child.c (post_fork_inferior): Pass target down to
diff --git a/gdb/gdbserver/linux-aarch32-tdesc.c b/gdb/gdbserver/linux-aarch32-tdesc.c
index 98d9ac8fd9..b0dffe27e7 100644
--- a/gdb/gdbserver/linux-aarch32-tdesc.c
+++ b/gdb/gdbserver/linux-aarch32-tdesc.c
@@ -16,6 +16,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
+
+#include "linux-aarch32-tdesc.h"
+
 #include "tdesc.h"
 #include "arch/aarch32.h"
 #include <inttypes.h>
diff --git a/gdb/gdbserver/linux-aarch64-tdesc.c b/gdb/gdbserver/linux-aarch64-tdesc.c
index 85fe4143d6..897fbb43bd 100644
--- a/gdb/gdbserver/linux-aarch64-tdesc.c
+++ b/gdb/gdbserver/linux-aarch64-tdesc.c
@@ -18,6 +18,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
+
+#include "linux-aarch64-tdesc.h"
+
 #include "tdesc.h"
 #include "arch/aarch64.h"
 #include "linux-aarch32-low.h"