diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 83be63c393e..67d39beba5b 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-12  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* linux-arm-tdesc.c: Include linux-arm-tdesc.h.
+	* linux-arm-tdesc.h: Include arch/arm.h.
+
 2020-01-12  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* linux-aarch64-low.c (aarch64_write_goto_address): Make static.
diff --git a/gdb/gdbserver/linux-arm-tdesc.c b/gdb/gdbserver/linux-arm-tdesc.c
index 5af1f90070b..2c9fac83cd5 100644
--- a/gdb/gdbserver/linux-arm-tdesc.c
+++ b/gdb/gdbserver/linux-arm-tdesc.c
@@ -16,6 +16,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
+
+#include "linux-arm-tdesc.h"
+
 #include "tdesc.h"
 #include "arch/arm.h"
 #include <inttypes.h>
diff --git a/gdb/gdbserver/linux-arm-tdesc.h b/gdb/gdbserver/linux-arm-tdesc.h
index bc782e13320..5e8c6a3be57 100644
--- a/gdb/gdbserver/linux-arm-tdesc.h
+++ b/gdb/gdbserver/linux-arm-tdesc.h
@@ -18,6 +18,8 @@
 #ifndef GDBSERVER_LINUX_ARM_TDESC_H
 #define GDBSERVER_LINUX_ARM_TDESC_H
 
+#include "arch/arm.h"
+
 /* Return the Arm target description with fp registers FP_TYPE.  */
 
 const target_desc * arm_linux_read_description (arm_fp_type fp_type);