diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a9e276957d2a..cef86bc436fe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2018-09-26  Jeff Law  <law@redhat.com>
+
+	Revert
+	2018-09-26  Alexey Neyman  <stilor@att.net>
+
+	* graphite.h: Include <isl/id.h> and <isl/space.h>; these
+	headers are no longer pulled in by <isl/val.h>.
+
 2018-09-26  Richard Biener  <rguenther@suse.de>
 
 	PR debug/87443
diff --git a/gcc/graphite.h b/gcc/graphite.h
index 8db5700e03f1..be0a22b38942 100644
--- a/gcc/graphite.h
+++ b/gcc/graphite.h
@@ -26,8 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include <isl/options.h>
 #include <isl/ctx.h>
 #include <isl/val.h>
-#include <isl/id.h>
-#include <isl/space.h>
 #include <isl/set.h>
 #include <isl/union_set.h>
 #include <isl/map.h>