diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9339949a86f..0afa34476c3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-30  Richard Earnshaw  <rearnsh@arm.com>
+
+	PR target/79260
+	* config.gcc (arm*-*-*): Add arm/arm-flags.h and arm/arm-isa.h to
+	tm_p_file.
+	* arm/arm-protos.h: Don't directly include arm-flags.h and arm-isa.h.
+
 2017-01-30  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/79276
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 03b189497d8..bc389eb45e7 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -571,7 +571,7 @@ x86_64-*-*)
 	tm_file="vxworks-dummy.h ${tm_file}"
 	;;
 arm*-*-*)
-	tm_p_file="${tm_p_file} arm/aarch-common-protos.h"
+	tm_p_file="arm/arm-flags.h arm/arm-isa.h ${tm_p_file} arm/aarch-common-protos.h"
 	tm_file="vxworks-dummy.h ${tm_file}"
 	;;
 mips*-*-* | sh*-*-* | sparc*-*-*)
diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
index 1b162391727..680a1e62364 100644
--- a/gcc/config/arm/arm-protos.h
+++ b/gcc/config/arm/arm-protos.h
@@ -22,8 +22,6 @@
 #ifndef GCC_ARM_PROTOS_H
 #define GCC_ARM_PROTOS_H
 
-#include "arm-flags.h"
-#include "arm-isa.h"
 #include "sbitmap.h"
 
 extern enum unwind_info_type arm_except_unwind_info (struct gcc_options *);