diff --git a/gcc/avoid-store-forwarding.cc b/gcc/avoid-store-forwarding.cc
index 86292ce574a..52235b14dc0 100644
--- a/gcc/avoid-store-forwarding.cc
+++ b/gcc/avoid-store-forwarding.cc
@@ -18,18 +18,17 @@
    along with GCC; see the file COPYING3.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#include "avoid-store-forwarding.h"
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
 #include "backend.h"
 #include "target.h"
 #include "rtl.h"
+#include "avoid-store-forwarding.h"
 #include "alias.h"
 #include "rtlanal.h"
 #include "cfgrtl.h"
 #include "tree-pass.h"
-#include "cselib.h"
 #include "predict.h"
 #include "insn-config.h"
 #include "expmed.h"
diff --git a/gcc/avoid-store-forwarding.h b/gcc/avoid-store-forwarding.h
index 1650d687d54..8f455c6af7d 100644
--- a/gcc/avoid-store-forwarding.h
+++ b/gcc/avoid-store-forwarding.h
@@ -21,12 +21,6 @@
 #ifndef GCC_AVOID_STORE_FORWARDING_H
 #define GCC_AVOID_STORE_FORWARDING_H
 
-#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "backend.h"
-#include "rtl.h"
-
 struct store_fwd_info
 {
   /* The store instruction that is a store forwarding candidate.  */