diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f41e1adf0bd..837c874a544 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-21  Oleg Endo  <olegendo@gcc.gnu.org>
+
+	PR target/80870
+	* config/sh/rx/rx.c (config/sh/sh_optimize_sett_clrt.cc):
+	Use INCLUDE_ALGORITHM and INCLUDE_VECTOR instead of direct includes.
+
 2018-01-20  Richard Sandiford  <richard.sandiford@linaro.org>
 
 	PR tree-optimization/83940
diff --git a/gcc/config/sh/sh_optimize_sett_clrt.cc b/gcc/config/sh/sh_optimize_sett_clrt.cc
index 3349d6cfd56..1c112703c1b 100644
--- a/gcc/config/sh/sh_optimize_sett_clrt.cc
+++ b/gcc/config/sh/sh_optimize_sett_clrt.cc
@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3.  If not see
 #define IN_TARGET_CODE 1
 
 #include "config.h"
+#define INCLUDE_ALGORITHM
+#define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
 #include "backend.h"
@@ -29,9 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "cfgrtl.h"
 #include "tree-pass.h"
 
-#include <vector>
-#include <algorithm>
-
 /*
 This pass tries to eliminate unnecessary sett or clrt instructions in cases
 where the ccreg value is already known to be the same as the constant set