diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b4d7eb7afa..6f6019c9c0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-26  Simon Marchi  <simon.marchi@efficios.com>
+
+	* aarch32-tdep.c: Include aarch32-tdep.h.
+	* aarch32-tdep.h: Forward-declare struct target_desc.
+
 2019-11-26  Christian Biesinger  <cbiesinger@google.com>
 
 	* linux-nat.c (detach_one_lwp): Call safe_strerror instead of
diff --git a/gdb/aarch32-tdep.c b/gdb/aarch32-tdep.c
index 12d464171c..5b082fccf0 100644
--- a/gdb/aarch32-tdep.c
+++ b/gdb/aarch32-tdep.c
@@ -16,6 +16,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "gdbsupport/common-defs.h"
+
+#include "aarch32-tdep.h"
+
 #include "gdbsupport/common-regcache.h"
 #include "arch/aarch32.h"
 
diff --git a/gdb/aarch32-tdep.h b/gdb/aarch32-tdep.h
index 7fcea0adb9..eb4c70cd1c 100644
--- a/gdb/aarch32-tdep.h
+++ b/gdb/aarch32-tdep.h
@@ -18,6 +18,8 @@
 #ifndef AARCH32_TDEP_H
 #define AARCH32_TDEP_H
 
+struct target_desc;
+
 /* Get the AArch32 target description.  */
 
 const target_desc *aarch32_read_description ();