diff --git a/graphite-blocking.c b/graphite-blocking.c
index dd3f03b..4557c9d 100644
--- a/graphite-blocking.c
+++ b/graphite-blocking.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 
 #ifdef HAVE_isl
+#include <isl/constraint.h>
 #include <isl/set.h>
 #include <isl/map.h>
 #include <isl/union_map.h>
diff --git a/graphite-dependences.c b/graphite-dependences.c
index daac777..45a85d9 100644
--- a/graphite-dependences.c
+++ b/graphite-dependences.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 
 #ifdef HAVE_isl
+#include <isl/constraint.h>
 #include <isl/set.h>
 #include <isl/map.h>
 #include <isl/union_map.h>
diff --git a/graphite-interchange.c b/graphite-interchange.c
index 4c1f908..374f944 100644
--- a/graphite-interchange.c
+++ b/graphite-interchange.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 
 #ifdef HAVE_isl
+#include <isl/constraint.h>
 #include <isl/aff.h>
 #include <isl/set.h>
 #include <isl/map.h>
diff --git a/graphite-isl-ast-to-gimple.c b/graphite-isl-ast-to-gimple.c
index 218c8c6..53adb6b 100644
--- a/graphite-isl-ast-to-gimple.c
+++ b/graphite-isl-ast-to-gimple.c
@@ -21,7 +21,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 
 #ifdef HAVE_isl
+#include <isl/constraint.h>
 #include <isl/set.h>
+#include <isl/union_set.h>
 #include <isl/map.h>
 #include <isl/union_map.h>
 #include <isl/ast_build.h>
diff --git a/graphite-optimize-isl.c b/graphite-optimize-isl.c
index f4506a2..f23c60f 100644
--- a/graphite-optimize-isl.c
+++ b/graphite-optimize-isl.c
@@ -21,7 +21,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 
 #ifdef HAVE_isl
+#include <isl/constraint.h>
 #include <isl/set.h>
+#include <isl/union_set.h>
 #include <isl/map.h>
 #include <isl/union_map.h>
 #include <isl/schedule.h>
diff --git a/graphite-poly.c b/graphite-poly.c
index a277a4f..1f8c60f 100644
--- a/graphite-poly.c
+++ b/graphite-poly.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 
 #ifdef HAVE_isl
+#include <isl/constraint.h>
 #include <isl/set.h>
 #include <isl/map.h>
 #include <isl/union_map.h>
diff --git a/graphite-scop-detection.c b/graphite-scop-detection.c
index 64e8c17..700f911 100644
--- a/graphite-scop-detection.c
+++ b/graphite-scop-detection.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 
 #ifdef HAVE_isl
+#include <isl/constraint.h>
 #include <isl/set.h>
 #include <isl/map.h>
 #include <isl/union_map.h>
diff --git a/graphite-sese-to-poly.c b/graphite-sese-to-poly.c
index e51db85..fc3c558 100644
--- a/graphite-sese-to-poly.c
+++ b/graphite-sese-to-poly.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 
 #ifdef HAVE_isl
+#include <isl/constraint.h>
 #include <isl/set.h>
 #include <isl/map.h>
 #include <isl/union_map.h>
diff --git a/graphite.c b/graphite.c
index c8f0617..a0cf455 100644
--- a/graphite.c
+++ b/graphite.c
@@ -35,6 +35,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 
 #ifdef HAVE_isl
+#include <isl/constraint.h>
 #include <isl/set.h>
 #include <isl/map.h>
 #include <isl/options.h>