diff --git a/polly/lib/External/isl/include/isl-noexceptions.h b/polly/lib/External/isl/include/isl-noexceptions.h
index 6b352198bcfc..a13e81ec3997 100644
--- a/polly/lib/External/isl/include/isl-noexceptions.h
+++ b/polly/lib/External/isl/include/isl-noexceptions.h
@@ -73,7 +73,7 @@ class val;
 
 class boolean {
 private:
-  friend boolean manage(isl_bool val);
+  friend isl::boolean manage(isl_bool val);
 
   isl_bool val;
 
@@ -102,8 +102,8 @@ public:
   }
 };
 
-inline boolean manage(isl_bool val) {
-  return boolean(val);
+inline isl::boolean manage(isl_bool val) {
+  return isl::boolean(val);
 }
 
 class ctx {
@@ -138,12 +138,12 @@ enum class dim {
 };
 
 // declarations for isl::aff
-inline aff manage(__isl_take isl_aff *ptr);
+inline isl::aff manage(__isl_take isl_aff *ptr);
 
-inline aff give(__isl_take isl_aff *ptr);
+inline isl::aff give(__isl_take isl_aff *ptr);
 
 class aff {
-  friend inline aff manage(__isl_take isl_aff *ptr);
+  friend inline isl::aff manage(__isl_take isl_aff *ptr);
 
   isl_aff *ptr = nullptr;
 
@@ -151,12 +151,12 @@ class aff {
 
 public:
   inline /* implicit */ aff();
-  inline /* implicit */ aff(const aff &obj);
+  inline /* implicit */ aff(const isl::aff &obj);
   inline /* implicit */ aff(std::nullptr_t);
   inline explicit aff(isl::local_space ls);
   inline explicit aff(isl::local_space ls, isl::val val);
-  inline explicit aff(ctx ctx, const std::string &str);
-  inline aff &operator=(aff obj);
+  inline explicit aff(isl::ctx ctx, const std::string &str);
+  inline isl::aff &operator=(isl::aff obj);
   inline ~aff();
   inline __isl_give isl_aff *copy() const &;
   inline __isl_give isl_aff *copy() && = delete;
@@ -175,12 +175,12 @@ public:
 };
 
 // declarations for isl::ast_build
-inline ast_build manage(__isl_take isl_ast_build *ptr);
+inline isl::ast_build manage(__isl_take isl_ast_build *ptr);
 
-inline ast_build give(__isl_take isl_ast_build *ptr);
+inline isl::ast_build give(__isl_take isl_ast_build *ptr);
 
 class ast_build {
-  friend inline ast_build manage(__isl_take isl_ast_build *ptr);
+  friend inline isl::ast_build manage(__isl_take isl_ast_build *ptr);
 
   isl_ast_build *ptr = nullptr;
 
@@ -188,10 +188,10 @@ class ast_build {
 
 public:
   inline /* implicit */ ast_build();
-  inline /* implicit */ ast_build(const ast_build &obj);
+  inline /* implicit */ ast_build(const isl::ast_build &obj);
   inline /* implicit */ ast_build(std::nullptr_t);
-  inline explicit ast_build(ctx ctx);
-  inline ast_build &operator=(ast_build obj);
+  inline explicit ast_build(isl::ctx ctx);
+  inline isl::ast_build &operator=(isl::ast_build obj);
   inline ~ast_build();
   inline __isl_give isl_ast_build *copy() const &;
   inline __isl_give isl_ast_build *copy() && = delete;
@@ -213,12 +213,12 @@ public:
 };
 
 // declarations for isl::ast_expr
-inline ast_expr manage(__isl_take isl_ast_expr *ptr);
+inline isl::ast_expr manage(__isl_take isl_ast_expr *ptr);
 
-inline ast_expr give(__isl_take isl_ast_expr *ptr);
+inline isl::ast_expr give(__isl_take isl_ast_expr *ptr);
 
 class ast_expr {
-  friend inline ast_expr manage(__isl_take isl_ast_expr *ptr);
+  friend inline isl::ast_expr manage(__isl_take isl_ast_expr *ptr);
 
   isl_ast_expr *ptr = nullptr;
 
@@ -226,9 +226,9 @@ class ast_expr {
 
 public:
   inline /* implicit */ ast_expr();
-  inline /* implicit */ ast_expr(const ast_expr &obj);
+  inline /* implicit */ ast_expr(const isl::ast_expr &obj);
   inline /* implicit */ ast_expr(std::nullptr_t);
-  inline ast_expr &operator=(ast_expr obj);
+  inline isl::ast_expr &operator=(isl::ast_expr obj);
   inline ~ast_expr();
   inline __isl_give isl_ast_expr *copy() const &;
   inline __isl_give isl_ast_expr *copy() && = delete;
@@ -244,12 +244,12 @@ public:
 };
 
 // declarations for isl::ast_node
-inline ast_node manage(__isl_take isl_ast_node *ptr);
+inline isl::ast_node manage(__isl_take isl_ast_node *ptr);
 
-inline ast_node give(__isl_take isl_ast_node *ptr);
+inline isl::ast_node give(__isl_take isl_ast_node *ptr);
 
 class ast_node {
-  friend inline ast_node manage(__isl_take isl_ast_node *ptr);
+  friend inline isl::ast_node manage(__isl_take isl_ast_node *ptr);
 
   isl_ast_node *ptr = nullptr;
 
@@ -257,9 +257,9 @@ class ast_node {
 
 public:
   inline /* implicit */ ast_node();
-  inline /* implicit */ ast_node(const ast_node &obj);
+  inline /* implicit */ ast_node(const isl::ast_node &obj);
   inline /* implicit */ ast_node(std::nullptr_t);
-  inline ast_node &operator=(ast_node obj);
+  inline isl::ast_node &operator=(isl::ast_node obj);
   inline ~ast_node();
   inline __isl_give isl_ast_node *copy() const &;
   inline __isl_give isl_ast_node *copy() && = delete;
@@ -275,12 +275,12 @@ public:
 };
 
 // declarations for isl::basic_map
-inline basic_map manage(__isl_take isl_basic_map *ptr);
+inline isl::basic_map manage(__isl_take isl_basic_map *ptr);
 
-inline basic_map give(__isl_take isl_basic_map *ptr);
+inline isl::basic_map give(__isl_take isl_basic_map *ptr);
 
 class basic_map {
-  friend inline basic_map manage(__isl_take isl_basic_map *ptr);
+  friend inline isl::basic_map manage(__isl_take isl_basic_map *ptr);
 
   isl_basic_map *ptr = nullptr;
 
@@ -288,10 +288,10 @@ class basic_map {
 
 public:
   inline /* implicit */ basic_map();
-  inline /* implicit */ basic_map(const basic_map &obj);
+  inline /* implicit */ basic_map(const isl::basic_map &obj);
   inline /* implicit */ basic_map(std::nullptr_t);
-  inline explicit basic_map(ctx ctx, const std::string &str);
-  inline basic_map &operator=(basic_map obj);
+  inline explicit basic_map(isl::ctx ctx, const std::string &str);
+  inline isl::basic_map &operator=(isl::basic_map obj);
   inline ~basic_map();
   inline __isl_give isl_basic_map *copy() const &;
   inline __isl_give isl_basic_map *copy() && = delete;
@@ -330,12 +330,12 @@ public:
 };
 
 // declarations for isl::basic_set
-inline basic_set manage(__isl_take isl_basic_set *ptr);
+inline isl::basic_set manage(__isl_take isl_basic_set *ptr);
 
-inline basic_set give(__isl_take isl_basic_set *ptr);
+inline isl::basic_set give(__isl_take isl_basic_set *ptr);
 
 class basic_set {
-  friend inline basic_set manage(__isl_take isl_basic_set *ptr);
+  friend inline isl::basic_set manage(__isl_take isl_basic_set *ptr);
 
   isl_basic_set *ptr = nullptr;
 
@@ -343,11 +343,11 @@ class basic_set {
 
 public:
   inline /* implicit */ basic_set();
-  inline /* implicit */ basic_set(const basic_set &obj);
+  inline /* implicit */ basic_set(const isl::basic_set &obj);
   inline /* implicit */ basic_set(std::nullptr_t);
-  inline explicit basic_set(ctx ctx, const std::string &str);
+  inline explicit basic_set(isl::ctx ctx, const std::string &str);
   inline /* implicit */ basic_set(isl::point pnt);
-  inline basic_set &operator=(basic_set obj);
+  inline isl::basic_set &operator=(isl::basic_set obj);
   inline ~basic_set();
   inline __isl_give isl_basic_set *copy() const &;
   inline __isl_give isl_basic_set *copy() && = delete;
@@ -380,12 +380,12 @@ public:
 };
 
 // declarations for isl::id
-inline id manage(__isl_take isl_id *ptr);
+inline isl::id manage(__isl_take isl_id *ptr);
 
-inline id give(__isl_take isl_id *ptr);
+inline isl::id give(__isl_take isl_id *ptr);
 
 class id {
-  friend inline id manage(__isl_take isl_id *ptr);
+  friend inline isl::id manage(__isl_take isl_id *ptr);
 
   isl_id *ptr = nullptr;
 
@@ -393,9 +393,9 @@ class id {
 
 public:
   inline /* implicit */ id();
-  inline /* implicit */ id(const id &obj);
+  inline /* implicit */ id(const isl::id &obj);
   inline /* implicit */ id(std::nullptr_t);
-  inline id &operator=(id obj);
+  inline isl::id &operator=(isl::id obj);
   inline ~id();
   inline __isl_give isl_id *copy() const &;
   inline __isl_give isl_id *copy() && = delete;
@@ -410,12 +410,12 @@ public:
 };
 
 // declarations for isl::local_space
-inline local_space manage(__isl_take isl_local_space *ptr);
+inline isl::local_space manage(__isl_take isl_local_space *ptr);
 
-inline local_space give(__isl_take isl_local_space *ptr);
+inline isl::local_space give(__isl_take isl_local_space *ptr);
 
 class local_space {
-  friend inline local_space manage(__isl_take isl_local_space *ptr);
+  friend inline isl::local_space manage(__isl_take isl_local_space *ptr);
 
   isl_local_space *ptr = nullptr;
 
@@ -423,10 +423,10 @@ class local_space {
 
 public:
   inline /* implicit */ local_space();
-  inline /* implicit */ local_space(const local_space &obj);
+  inline /* implicit */ local_space(const isl::local_space &obj);
   inline /* implicit */ local_space(std::nullptr_t);
   inline explicit local_space(isl::space dim);
-  inline local_space &operator=(local_space obj);
+  inline isl::local_space &operator=(isl::local_space obj);
   inline ~local_space();
   inline __isl_give isl_local_space *copy() const &;
   inline __isl_give isl_local_space *copy() && = delete;
@@ -440,12 +440,12 @@ public:
 };
 
 // declarations for isl::map
-inline map manage(__isl_take isl_map *ptr);
+inline isl::map manage(__isl_take isl_map *ptr);
 
-inline map give(__isl_take isl_map *ptr);
+inline isl::map give(__isl_take isl_map *ptr);
 
 class map {
-  friend inline map manage(__isl_take isl_map *ptr);
+  friend inline isl::map manage(__isl_take isl_map *ptr);
 
   isl_map *ptr = nullptr;
 
@@ -453,11 +453,11 @@ class map {
 
 public:
   inline /* implicit */ map();
-  inline /* implicit */ map(const map &obj);
+  inline /* implicit */ map(const isl::map &obj);
   inline /* implicit */ map(std::nullptr_t);
-  inline explicit map(ctx ctx, const std::string &str);
+  inline explicit map(isl::ctx ctx, const std::string &str);
   inline /* implicit */ map(isl::basic_map bmap);
-  inline map &operator=(map obj);
+  inline isl::map &operator=(isl::map obj);
   inline ~map();
   inline __isl_give isl_map *copy() const &;
   inline __isl_give isl_map *copy() && = delete;
@@ -510,12 +510,12 @@ public:
 };
 
 // declarations for isl::multi_aff
-inline multi_aff manage(__isl_take isl_multi_aff *ptr);
+inline isl::multi_aff manage(__isl_take isl_multi_aff *ptr);
 
-inline multi_aff give(__isl_take isl_multi_aff *ptr);
+inline isl::multi_aff give(__isl_take isl_multi_aff *ptr);
 
 class multi_aff {
-  friend inline multi_aff manage(__isl_take isl_multi_aff *ptr);
+  friend inline isl::multi_aff manage(__isl_take isl_multi_aff *ptr);
 
   isl_multi_aff *ptr = nullptr;
 
@@ -523,11 +523,11 @@ class multi_aff {
 
 public:
   inline /* implicit */ multi_aff();
-  inline /* implicit */ multi_aff(const multi_aff &obj);
+  inline /* implicit */ multi_aff(const isl::multi_aff &obj);
   inline /* implicit */ multi_aff(std::nullptr_t);
   inline /* implicit */ multi_aff(isl::aff aff);
-  inline explicit multi_aff(ctx ctx, const std::string &str);
-  inline multi_aff &operator=(multi_aff obj);
+  inline explicit multi_aff(isl::ctx ctx, const std::string &str);
+  inline isl::multi_aff &operator=(isl::multi_aff obj);
   inline ~multi_aff();
   inline __isl_give isl_multi_aff *copy() const &;
   inline __isl_give isl_multi_aff *copy() && = delete;
@@ -548,12 +548,12 @@ public:
 };
 
 // declarations for isl::multi_pw_aff
-inline multi_pw_aff manage(__isl_take isl_multi_pw_aff *ptr);
+inline isl::multi_pw_aff manage(__isl_take isl_multi_pw_aff *ptr);
 
-inline multi_pw_aff give(__isl_take isl_multi_pw_aff *ptr);
+inline isl::multi_pw_aff give(__isl_take isl_multi_pw_aff *ptr);
 
 class multi_pw_aff {
-  friend inline multi_pw_aff manage(__isl_take isl_multi_pw_aff *ptr);
+  friend inline isl::multi_pw_aff manage(__isl_take isl_multi_pw_aff *ptr);
 
   isl_multi_pw_aff *ptr = nullptr;
 
@@ -561,13 +561,13 @@ class multi_pw_aff {
 
 public:
   inline /* implicit */ multi_pw_aff();
-  inline /* implicit */ multi_pw_aff(const multi_pw_aff &obj);
+  inline /* implicit */ multi_pw_aff(const isl::multi_pw_aff &obj);
   inline /* implicit */ multi_pw_aff(std::nullptr_t);
   inline /* implicit */ multi_pw_aff(isl::multi_aff ma);
   inline /* implicit */ multi_pw_aff(isl::pw_aff pa);
   inline /* implicit */ multi_pw_aff(isl::pw_multi_aff pma);
-  inline explicit multi_pw_aff(ctx ctx, const std::string &str);
-  inline multi_pw_aff &operator=(multi_pw_aff obj);
+  inline explicit multi_pw_aff(isl::ctx ctx, const std::string &str);
+  inline isl::multi_pw_aff &operator=(isl::multi_pw_aff obj);
   inline ~multi_pw_aff();
   inline __isl_give isl_multi_pw_aff *copy() const &;
   inline __isl_give isl_multi_pw_aff *copy() && = delete;
@@ -590,12 +590,12 @@ public:
 };
 
 // declarations for isl::multi_union_pw_aff
-inline multi_union_pw_aff manage(__isl_take isl_multi_union_pw_aff *ptr);
+inline isl::multi_union_pw_aff manage(__isl_take isl_multi_union_pw_aff *ptr);
 
-inline multi_union_pw_aff give(__isl_take isl_multi_union_pw_aff *ptr);
+inline isl::multi_union_pw_aff give(__isl_take isl_multi_union_pw_aff *ptr);
 
 class multi_union_pw_aff {
-  friend inline multi_union_pw_aff manage(__isl_take isl_multi_union_pw_aff *ptr);
+  friend inline isl::multi_union_pw_aff manage(__isl_take isl_multi_union_pw_aff *ptr);
 
   isl_multi_union_pw_aff *ptr = nullptr;
 
@@ -603,13 +603,13 @@ class multi_union_pw_aff {
 
 public:
   inline /* implicit */ multi_union_pw_aff();
-  inline /* implicit */ multi_union_pw_aff(const multi_union_pw_aff &obj);
+  inline /* implicit */ multi_union_pw_aff(const isl::multi_union_pw_aff &obj);
   inline /* implicit */ multi_union_pw_aff(std::nullptr_t);
   inline /* implicit */ multi_union_pw_aff(isl::union_pw_aff upa);
   inline /* implicit */ multi_union_pw_aff(isl::multi_pw_aff mpa);
   inline explicit multi_union_pw_aff(isl::union_pw_multi_aff upma);
-  inline explicit multi_union_pw_aff(ctx ctx, const std::string &str);
-  inline multi_union_pw_aff &operator=(multi_union_pw_aff obj);
+  inline explicit multi_union_pw_aff(isl::ctx ctx, const std::string &str);
+  inline isl::multi_union_pw_aff &operator=(isl::multi_union_pw_aff obj);
   inline ~multi_union_pw_aff();
   inline __isl_give isl_multi_union_pw_aff *copy() const &;
   inline __isl_give isl_multi_union_pw_aff *copy() && = delete;
@@ -630,12 +630,12 @@ public:
 };
 
 // declarations for isl::multi_val
-inline multi_val manage(__isl_take isl_multi_val *ptr);
+inline isl::multi_val manage(__isl_take isl_multi_val *ptr);
 
-inline multi_val give(__isl_take isl_multi_val *ptr);
+inline isl::multi_val give(__isl_take isl_multi_val *ptr);
 
 class multi_val {
-  friend inline multi_val manage(__isl_take isl_multi_val *ptr);
+  friend inline isl::multi_val manage(__isl_take isl_multi_val *ptr);
 
   isl_multi_val *ptr = nullptr;
 
@@ -643,9 +643,9 @@ class multi_val {
 
 public:
   inline /* implicit */ multi_val();
-  inline /* implicit */ multi_val(const multi_val &obj);
+  inline /* implicit */ multi_val(const isl::multi_val &obj);
   inline /* implicit */ multi_val(std::nullptr_t);
-  inline multi_val &operator=(multi_val obj);
+  inline isl::multi_val &operator=(isl::multi_val obj);
   inline ~multi_val();
   inline __isl_give isl_multi_val *copy() const &;
   inline __isl_give isl_multi_val *copy() && = delete;
@@ -665,12 +665,12 @@ public:
 };
 
 // declarations for isl::point
-inline point manage(__isl_take isl_point *ptr);
+inline isl::point manage(__isl_take isl_point *ptr);
 
-inline point give(__isl_take isl_point *ptr);
+inline isl::point give(__isl_take isl_point *ptr);
 
 class point {
-  friend inline point manage(__isl_take isl_point *ptr);
+  friend inline isl::point manage(__isl_take isl_point *ptr);
 
   isl_point *ptr = nullptr;
 
@@ -678,10 +678,10 @@ class point {
 
 public:
   inline /* implicit */ point();
-  inline /* implicit */ point(const point &obj);
+  inline /* implicit */ point(const isl::point &obj);
   inline /* implicit */ point(std::nullptr_t);
   inline explicit point(isl::space dim);
-  inline point &operator=(point obj);
+  inline isl::point &operator=(isl::point obj);
   inline ~point();
   inline __isl_give isl_point *copy() const &;
   inline __isl_give isl_point *copy() && = delete;
@@ -696,12 +696,12 @@ public:
 };
 
 // declarations for isl::pw_aff
-inline pw_aff manage(__isl_take isl_pw_aff *ptr);
+inline isl::pw_aff manage(__isl_take isl_pw_aff *ptr);
 
-inline pw_aff give(__isl_take isl_pw_aff *ptr);
+inline isl::pw_aff give(__isl_take isl_pw_aff *ptr);
 
 class pw_aff {
-  friend inline pw_aff manage(__isl_take isl_pw_aff *ptr);
+  friend inline isl::pw_aff manage(__isl_take isl_pw_aff *ptr);
 
   isl_pw_aff *ptr = nullptr;
 
@@ -709,13 +709,13 @@ class pw_aff {
 
 public:
   inline /* implicit */ pw_aff();
-  inline /* implicit */ pw_aff(const pw_aff &obj);
+  inline /* implicit */ pw_aff(const isl::pw_aff &obj);
   inline /* implicit */ pw_aff(std::nullptr_t);
   inline /* implicit */ pw_aff(isl::aff aff);
   inline explicit pw_aff(isl::local_space ls);
   inline explicit pw_aff(isl::set domain, isl::val v);
-  inline explicit pw_aff(ctx ctx, const std::string &str);
-  inline pw_aff &operator=(pw_aff obj);
+  inline explicit pw_aff(isl::ctx ctx, const std::string &str);
+  inline isl::pw_aff &operator=(isl::pw_aff obj);
   inline ~pw_aff();
   inline __isl_give isl_pw_aff *copy() const &;
   inline __isl_give isl_pw_aff *copy() && = delete;
@@ -741,12 +741,12 @@ public:
 };
 
 // declarations for isl::pw_multi_aff
-inline pw_multi_aff manage(__isl_take isl_pw_multi_aff *ptr);
+inline isl::pw_multi_aff manage(__isl_take isl_pw_multi_aff *ptr);
 
-inline pw_multi_aff give(__isl_take isl_pw_multi_aff *ptr);
+inline isl::pw_multi_aff give(__isl_take isl_pw_multi_aff *ptr);
 
 class pw_multi_aff {
-  friend inline pw_multi_aff manage(__isl_take isl_pw_multi_aff *ptr);
+  friend inline isl::pw_multi_aff manage(__isl_take isl_pw_multi_aff *ptr);
 
   isl_pw_multi_aff *ptr = nullptr;
 
@@ -754,12 +754,12 @@ class pw_multi_aff {
 
 public:
   inline /* implicit */ pw_multi_aff();
-  inline /* implicit */ pw_multi_aff(const pw_multi_aff &obj);
+  inline /* implicit */ pw_multi_aff(const isl::pw_multi_aff &obj);
   inline /* implicit */ pw_multi_aff(std::nullptr_t);
-  inline explicit pw_multi_aff(ctx ctx, const std::string &str);
+  inline explicit pw_multi_aff(isl::ctx ctx, const std::string &str);
   inline /* implicit */ pw_multi_aff(isl::multi_aff ma);
   inline /* implicit */ pw_multi_aff(isl::pw_aff pa);
-  inline pw_multi_aff &operator=(pw_multi_aff obj);
+  inline isl::pw_multi_aff &operator=(isl::pw_multi_aff obj);
   inline ~pw_multi_aff();
   inline __isl_give isl_pw_multi_aff *copy() const &;
   inline __isl_give isl_pw_multi_aff *copy() && = delete;
@@ -781,12 +781,12 @@ public:
 };
 
 // declarations for isl::schedule
-inline schedule manage(__isl_take isl_schedule *ptr);
+inline isl::schedule manage(__isl_take isl_schedule *ptr);
 
-inline schedule give(__isl_take isl_schedule *ptr);
+inline isl::schedule give(__isl_take isl_schedule *ptr);
 
 class schedule {
-  friend inline schedule manage(__isl_take isl_schedule *ptr);
+  friend inline isl::schedule manage(__isl_take isl_schedule *ptr);
 
   isl_schedule *ptr = nullptr;
 
@@ -794,10 +794,10 @@ class schedule {
 
 public:
   inline /* implicit */ schedule();
-  inline /* implicit */ schedule(const schedule &obj);
+  inline /* implicit */ schedule(const isl::schedule &obj);
   inline /* implicit */ schedule(std::nullptr_t);
-  inline explicit schedule(ctx ctx, const std::string &str);
-  inline schedule &operator=(schedule obj);
+  inline explicit schedule(isl::ctx ctx, const std::string &str);
+  inline isl::schedule &operator=(isl::schedule obj);
   inline ~schedule();
   inline __isl_give isl_schedule *copy() const &;
   inline __isl_give isl_schedule *copy() && = delete;
@@ -815,12 +815,12 @@ public:
 };
 
 // declarations for isl::schedule_constraints
-inline schedule_constraints manage(__isl_take isl_schedule_constraints *ptr);
+inline isl::schedule_constraints manage(__isl_take isl_schedule_constraints *ptr);
 
-inline schedule_constraints give(__isl_take isl_schedule_constraints *ptr);
+inline isl::schedule_constraints give(__isl_take isl_schedule_constraints *ptr);
 
 class schedule_constraints {
-  friend inline schedule_constraints manage(__isl_take isl_schedule_constraints *ptr);
+  friend inline isl::schedule_constraints manage(__isl_take isl_schedule_constraints *ptr);
 
   isl_schedule_constraints *ptr = nullptr;
 
@@ -828,10 +828,10 @@ class schedule_constraints {
 
 public:
   inline /* implicit */ schedule_constraints();
-  inline /* implicit */ schedule_constraints(const schedule_constraints &obj);
+  inline /* implicit */ schedule_constraints(const isl::schedule_constraints &obj);
   inline /* implicit */ schedule_constraints(std::nullptr_t);
-  inline explicit schedule_constraints(ctx ctx, const std::string &str);
-  inline schedule_constraints &operator=(schedule_constraints obj);
+  inline explicit schedule_constraints(isl::ctx ctx, const std::string &str);
+  inline isl::schedule_constraints &operator=(isl::schedule_constraints obj);
   inline ~schedule_constraints();
   inline __isl_give isl_schedule_constraints *copy() const &;
   inline __isl_give isl_schedule_constraints *copy() && = delete;
@@ -853,12 +853,12 @@ public:
 };
 
 // declarations for isl::schedule_node
-inline schedule_node manage(__isl_take isl_schedule_node *ptr);
+inline isl::schedule_node manage(__isl_take isl_schedule_node *ptr);
 
-inline schedule_node give(__isl_take isl_schedule_node *ptr);
+inline isl::schedule_node give(__isl_take isl_schedule_node *ptr);
 
 class schedule_node {
-  friend inline schedule_node manage(__isl_take isl_schedule_node *ptr);
+  friend inline isl::schedule_node manage(__isl_take isl_schedule_node *ptr);
 
   isl_schedule_node *ptr = nullptr;
 
@@ -866,9 +866,9 @@ class schedule_node {
 
 public:
   inline /* implicit */ schedule_node();
-  inline /* implicit */ schedule_node(const schedule_node &obj);
+  inline /* implicit */ schedule_node(const isl::schedule_node &obj);
   inline /* implicit */ schedule_node(std::nullptr_t);
-  inline schedule_node &operator=(schedule_node obj);
+  inline isl::schedule_node &operator=(isl::schedule_node obj);
   inline ~schedule_node();
   inline __isl_give isl_schedule_node *copy() const &;
   inline __isl_give isl_schedule_node *copy() && = delete;
@@ -891,12 +891,12 @@ public:
 };
 
 // declarations for isl::set
-inline set manage(__isl_take isl_set *ptr);
+inline isl::set manage(__isl_take isl_set *ptr);
 
-inline set give(__isl_take isl_set *ptr);
+inline isl::set give(__isl_take isl_set *ptr);
 
 class set {
-  friend inline set manage(__isl_take isl_set *ptr);
+  friend inline isl::set manage(__isl_take isl_set *ptr);
 
   isl_set *ptr = nullptr;
 
@@ -904,13 +904,13 @@ class set {
 
 public:
   inline /* implicit */ set();
-  inline /* implicit */ set(const set &obj);
+  inline /* implicit */ set(const isl::set &obj);
   inline /* implicit */ set(std::nullptr_t);
   inline explicit set(isl::union_set uset);
-  inline explicit set(ctx ctx, const std::string &str);
+  inline explicit set(isl::ctx ctx, const std::string &str);
   inline /* implicit */ set(isl::basic_set bset);
   inline /* implicit */ set(isl::point pnt);
-  inline set &operator=(set obj);
+  inline isl::set &operator=(isl::set obj);
   inline ~set();
   inline __isl_give isl_set *copy() const &;
   inline __isl_give isl_set *copy() && = delete;
@@ -959,12 +959,12 @@ public:
 };
 
 // declarations for isl::space
-inline space manage(__isl_take isl_space *ptr);
+inline isl::space manage(__isl_take isl_space *ptr);
 
-inline space give(__isl_take isl_space *ptr);
+inline isl::space give(__isl_take isl_space *ptr);
 
 class space {
-  friend inline space manage(__isl_take isl_space *ptr);
+  friend inline isl::space manage(__isl_take isl_space *ptr);
 
   isl_space *ptr = nullptr;
 
@@ -972,11 +972,11 @@ class space {
 
 public:
   inline /* implicit */ space();
-  inline /* implicit */ space(const space &obj);
+  inline /* implicit */ space(const isl::space &obj);
   inline /* implicit */ space(std::nullptr_t);
-  inline explicit space(ctx ctx, unsigned int nparam, unsigned int n_in, unsigned int n_out);
-  inline explicit space(ctx ctx, unsigned int nparam, unsigned int dim);
-  inline space &operator=(space obj);
+  inline explicit space(isl::ctx ctx, unsigned int nparam, unsigned int n_in, unsigned int n_out);
+  inline explicit space(isl::ctx ctx, unsigned int nparam, unsigned int dim);
+  inline isl::space &operator=(isl::space obj);
   inline ~space();
   inline __isl_give isl_space *copy() const &;
   inline __isl_give isl_space *copy() && = delete;
@@ -995,12 +995,12 @@ public:
 };
 
 // declarations for isl::union_access_info
-inline union_access_info manage(__isl_take isl_union_access_info *ptr);
+inline isl::union_access_info manage(__isl_take isl_union_access_info *ptr);
 
-inline union_access_info give(__isl_take isl_union_access_info *ptr);
+inline isl::union_access_info give(__isl_take isl_union_access_info *ptr);
 
 class union_access_info {
-  friend inline union_access_info manage(__isl_take isl_union_access_info *ptr);
+  friend inline isl::union_access_info manage(__isl_take isl_union_access_info *ptr);
 
   isl_union_access_info *ptr = nullptr;
 
@@ -1008,10 +1008,10 @@ class union_access_info {
 
 public:
   inline /* implicit */ union_access_info();
-  inline /* implicit */ union_access_info(const union_access_info &obj);
+  inline /* implicit */ union_access_info(const isl::union_access_info &obj);
   inline /* implicit */ union_access_info(std::nullptr_t);
   inline explicit union_access_info(isl::union_map sink);
-  inline union_access_info &operator=(union_access_info obj);
+  inline isl::union_access_info &operator=(isl::union_access_info obj);
   inline ~union_access_info();
   inline __isl_give isl_union_access_info *copy() const &;
   inline __isl_give isl_union_access_info *copy() && = delete;
@@ -1031,12 +1031,12 @@ public:
 };
 
 // declarations for isl::union_flow
-inline union_flow manage(__isl_take isl_union_flow *ptr);
+inline isl::union_flow manage(__isl_take isl_union_flow *ptr);
 
-inline union_flow give(__isl_take isl_union_flow *ptr);
+inline isl::union_flow give(__isl_take isl_union_flow *ptr);
 
 class union_flow {
-  friend inline union_flow manage(__isl_take isl_union_flow *ptr);
+  friend inline isl::union_flow manage(__isl_take isl_union_flow *ptr);
 
   isl_union_flow *ptr = nullptr;
 
@@ -1044,9 +1044,9 @@ class union_flow {
 
 public:
   inline /* implicit */ union_flow();
-  inline /* implicit */ union_flow(const union_flow &obj);
+  inline /* implicit */ union_flow(const isl::union_flow &obj);
   inline /* implicit */ union_flow(std::nullptr_t);
-  inline union_flow &operator=(union_flow obj);
+  inline isl::union_flow &operator=(isl::union_flow obj);
   inline ~union_flow();
   inline __isl_give isl_union_flow *copy() const &;
   inline __isl_give isl_union_flow *copy() && = delete;
@@ -1067,12 +1067,12 @@ public:
 };
 
 // declarations for isl::union_map
-inline union_map manage(__isl_take isl_union_map *ptr);
+inline isl::union_map manage(__isl_take isl_union_map *ptr);
 
-inline union_map give(__isl_take isl_union_map *ptr);
+inline isl::union_map give(__isl_take isl_union_map *ptr);
 
 class union_map {
-  friend inline union_map manage(__isl_take isl_union_map *ptr);
+  friend inline isl::union_map manage(__isl_take isl_union_map *ptr);
 
   isl_union_map *ptr = nullptr;
 
@@ -1080,13 +1080,13 @@ class union_map {
 
 public:
   inline /* implicit */ union_map();
-  inline /* implicit */ union_map(const union_map &obj);
+  inline /* implicit */ union_map(const isl::union_map &obj);
   inline /* implicit */ union_map(std::nullptr_t);
   inline explicit union_map(isl::union_pw_aff upa);
   inline /* implicit */ union_map(isl::basic_map bmap);
   inline /* implicit */ union_map(isl::map map);
-  inline explicit union_map(ctx ctx, const std::string &str);
-  inline union_map &operator=(union_map obj);
+  inline explicit union_map(isl::ctx ctx, const std::string &str);
+  inline isl::union_map &operator=(isl::union_map obj);
   inline ~union_map();
   inline __isl_give isl_union_map *copy() const &;
   inline __isl_give isl_union_map *copy() && = delete;
@@ -1156,12 +1156,12 @@ public:
 };
 
 // declarations for isl::union_pw_aff
-inline union_pw_aff manage(__isl_take isl_union_pw_aff *ptr);
+inline isl::union_pw_aff manage(__isl_take isl_union_pw_aff *ptr);
 
-inline union_pw_aff give(__isl_take isl_union_pw_aff *ptr);
+inline isl::union_pw_aff give(__isl_take isl_union_pw_aff *ptr);
 
 class union_pw_aff {
-  friend inline union_pw_aff manage(__isl_take isl_union_pw_aff *ptr);
+  friend inline isl::union_pw_aff manage(__isl_take isl_union_pw_aff *ptr);
 
   isl_union_pw_aff *ptr = nullptr;
 
@@ -1169,12 +1169,12 @@ class union_pw_aff {
 
 public:
   inline /* implicit */ union_pw_aff();
-  inline /* implicit */ union_pw_aff(const union_pw_aff &obj);
+  inline /* implicit */ union_pw_aff(const isl::union_pw_aff &obj);
   inline /* implicit */ union_pw_aff(std::nullptr_t);
   inline /* implicit */ union_pw_aff(isl::pw_aff pa);
   inline explicit union_pw_aff(isl::union_set domain, isl::val v);
-  inline explicit union_pw_aff(ctx ctx, const std::string &str);
-  inline union_pw_aff &operator=(union_pw_aff obj);
+  inline explicit union_pw_aff(isl::ctx ctx, const std::string &str);
+  inline isl::union_pw_aff &operator=(isl::union_pw_aff obj);
   inline ~union_pw_aff();
   inline __isl_give isl_union_pw_aff *copy() const &;
   inline __isl_give isl_union_pw_aff *copy() && = delete;
@@ -1196,12 +1196,12 @@ public:
 };
 
 // declarations for isl::union_pw_multi_aff
-inline union_pw_multi_aff manage(__isl_take isl_union_pw_multi_aff *ptr);
+inline isl::union_pw_multi_aff manage(__isl_take isl_union_pw_multi_aff *ptr);
 
-inline union_pw_multi_aff give(__isl_take isl_union_pw_multi_aff *ptr);
+inline isl::union_pw_multi_aff give(__isl_take isl_union_pw_multi_aff *ptr);
 
 class union_pw_multi_aff {
-  friend inline union_pw_multi_aff manage(__isl_take isl_union_pw_multi_aff *ptr);
+  friend inline isl::union_pw_multi_aff manage(__isl_take isl_union_pw_multi_aff *ptr);
 
   isl_union_pw_multi_aff *ptr = nullptr;
 
@@ -1209,14 +1209,14 @@ class union_pw_multi_aff {
 
 public:
   inline /* implicit */ union_pw_multi_aff();
-  inline /* implicit */ union_pw_multi_aff(const union_pw_multi_aff &obj);
+  inline /* implicit */ union_pw_multi_aff(const isl::union_pw_multi_aff &obj);
   inline /* implicit */ union_pw_multi_aff(std::nullptr_t);
   inline /* implicit */ union_pw_multi_aff(isl::pw_multi_aff pma);
   inline explicit union_pw_multi_aff(isl::union_set uset);
   inline explicit union_pw_multi_aff(isl::union_map umap);
-  inline explicit union_pw_multi_aff(ctx ctx, const std::string &str);
+  inline explicit union_pw_multi_aff(isl::ctx ctx, const std::string &str);
   inline /* implicit */ union_pw_multi_aff(isl::union_pw_aff upa);
-  inline union_pw_multi_aff &operator=(union_pw_multi_aff obj);
+  inline isl::union_pw_multi_aff &operator=(isl::union_pw_multi_aff obj);
   inline ~union_pw_multi_aff();
   inline __isl_give isl_union_pw_multi_aff *copy() const &;
   inline __isl_give isl_union_pw_multi_aff *copy() && = delete;
@@ -1235,12 +1235,12 @@ public:
 };
 
 // declarations for isl::union_set
-inline union_set manage(__isl_take isl_union_set *ptr);
+inline isl::union_set manage(__isl_take isl_union_set *ptr);
 
-inline union_set give(__isl_take isl_union_set *ptr);
+inline isl::union_set give(__isl_take isl_union_set *ptr);
 
 class union_set {
-  friend inline union_set manage(__isl_take isl_union_set *ptr);
+  friend inline isl::union_set manage(__isl_take isl_union_set *ptr);
 
   isl_union_set *ptr = nullptr;
 
@@ -1248,13 +1248,13 @@ class union_set {
 
 public:
   inline /* implicit */ union_set();
-  inline /* implicit */ union_set(const union_set &obj);
+  inline /* implicit */ union_set(const isl::union_set &obj);
   inline /* implicit */ union_set(std::nullptr_t);
   inline /* implicit */ union_set(isl::basic_set bset);
   inline /* implicit */ union_set(isl::set set);
   inline /* implicit */ union_set(isl::point pnt);
-  inline explicit union_set(ctx ctx, const std::string &str);
-  inline union_set &operator=(union_set obj);
+  inline explicit union_set(isl::ctx ctx, const std::string &str);
+  inline isl::union_set &operator=(isl::union_set obj);
   inline ~union_set();
   inline __isl_give isl_union_set *copy() const &;
   inline __isl_give isl_union_set *copy() && = delete;
@@ -1292,12 +1292,12 @@ public:
 };
 
 // declarations for isl::val
-inline val manage(__isl_take isl_val *ptr);
+inline isl::val manage(__isl_take isl_val *ptr);
 
-inline val give(__isl_take isl_val *ptr);
+inline isl::val give(__isl_take isl_val *ptr);
 
 class val {
-  friend inline val manage(__isl_take isl_val *ptr);
+  friend inline isl::val manage(__isl_take isl_val *ptr);
 
   isl_val *ptr = nullptr;
 
@@ -1305,11 +1305,11 @@ class val {
 
 public:
   inline /* implicit */ val();
-  inline /* implicit */ val(const val &obj);
+  inline /* implicit */ val(const isl::val &obj);
   inline /* implicit */ val(std::nullptr_t);
-  inline explicit val(ctx ctx, long i);
-  inline explicit val(ctx ctx, const std::string &str);
-  inline val &operator=(val obj);
+  inline explicit val(isl::ctx ctx, long i);
+  inline explicit val(isl::ctx ctx, const std::string &str);
+  inline isl::val &operator=(isl::val obj);
   inline ~val();
   inline __isl_give isl_val *copy() const &;
   inline __isl_give isl_val *copy() && = delete;
@@ -1334,7 +1334,7 @@ public:
   inline isl::val gcd(isl::val v2) const;
   inline isl::boolean ge(const isl::val &v2) const;
   inline isl::boolean gt(const isl::val &v2) const;
-  static inline isl::val infty(ctx ctx);
+  static inline isl::val infty(isl::ctx ctx);
   inline isl::val inv() const;
   inline isl::boolean is_divisible_by(const isl::val &v2) const;
   inline isl::boolean is_infty() const;
@@ -1355,32 +1355,32 @@ public:
   inline isl::val min(isl::val v2) const;
   inline isl::val mod(isl::val v2) const;
   inline isl::val mul(isl::val v2) const;
-  static inline isl::val nan(ctx ctx);
+  static inline isl::val nan(isl::ctx ctx);
   inline isl::boolean ne(const isl::val &v2) const;
   inline isl::val neg() const;
-  static inline isl::val neginfty(ctx ctx);
-  static inline isl::val negone(ctx ctx);
-  static inline isl::val one(ctx ctx);
+  static inline isl::val neginfty(isl::ctx ctx);
+  static inline isl::val negone(isl::ctx ctx);
+  static inline isl::val one(isl::ctx ctx);
   inline int sgn() const;
   inline isl::val sub(isl::val v2) const;
   inline isl::val sub_ui(unsigned long v2) const;
   inline isl::val trunc() const;
-  static inline isl::val zero(ctx ctx);
+  static inline isl::val zero(isl::ctx ctx);
 };
 
 // implementations for isl::aff
-aff manage(__isl_take isl_aff *ptr) {
+isl::aff manage(__isl_take isl_aff *ptr) {
   return aff(ptr);
 }
 
-aff give(__isl_take isl_aff *ptr) {
+isl::aff give(__isl_take isl_aff *ptr) {
   return manage(ptr);
 }
 
 aff::aff()
     : ptr(nullptr) {}
 
-aff::aff(const aff &obj)
+aff::aff(const isl::aff &obj)
     : ptr(obj.copy()) {}
 
 aff::aff(std::nullptr_t)
@@ -1399,12 +1399,12 @@ aff::aff(isl::local_space ls, isl::val val) {
   ptr = res;
 }
 
-aff::aff(ctx ctx, const std::string &str) {
+aff::aff(isl::ctx ctx, const std::string &str) {
   auto res = isl_aff_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
 
-aff &aff::operator=(aff obj) {
+aff &aff::operator=(isl::aff obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -1484,18 +1484,18 @@ isl::aff aff::pullback(isl::multi_aff ma) const {
 }
 
 // implementations for isl::ast_build
-ast_build manage(__isl_take isl_ast_build *ptr) {
+isl::ast_build manage(__isl_take isl_ast_build *ptr) {
   return ast_build(ptr);
 }
 
-ast_build give(__isl_take isl_ast_build *ptr) {
+isl::ast_build give(__isl_take isl_ast_build *ptr) {
   return manage(ptr);
 }
 
 ast_build::ast_build()
     : ptr(nullptr) {}
 
-ast_build::ast_build(const ast_build &obj)
+ast_build::ast_build(const isl::ast_build &obj)
     : ptr(obj.copy()) {}
 
 ast_build::ast_build(std::nullptr_t)
@@ -1504,12 +1504,12 @@ ast_build::ast_build(std::nullptr_t)
 ast_build::ast_build(__isl_take isl_ast_build *ptr)
     : ptr(ptr) {}
 
-ast_build::ast_build(ctx ctx) {
+ast_build::ast_build(isl::ctx ctx) {
   auto res = isl_ast_build_alloc(ctx.release());
   ptr = res;
 }
 
-ast_build &ast_build::operator=(ast_build obj) {
+ast_build &ast_build::operator=(isl::ast_build obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -1594,18 +1594,18 @@ isl::ast_node ast_build::node_from_schedule_map(isl::union_map schedule) const {
 }
 
 // implementations for isl::ast_expr
-ast_expr manage(__isl_take isl_ast_expr *ptr) {
+isl::ast_expr manage(__isl_take isl_ast_expr *ptr) {
   return ast_expr(ptr);
 }
 
-ast_expr give(__isl_take isl_ast_expr *ptr) {
+isl::ast_expr give(__isl_take isl_ast_expr *ptr) {
   return manage(ptr);
 }
 
 ast_expr::ast_expr()
     : ptr(nullptr) {}
 
-ast_expr::ast_expr(const ast_expr &obj)
+ast_expr::ast_expr(const isl::ast_expr &obj)
     : ptr(obj.copy()) {}
 
 ast_expr::ast_expr(std::nullptr_t)
@@ -1614,7 +1614,7 @@ ast_expr::ast_expr(std::nullptr_t)
 ast_expr::ast_expr(__isl_take isl_ast_expr *ptr)
     : ptr(ptr) {}
 
-ast_expr &ast_expr::operator=(ast_expr obj) {
+ast_expr &ast_expr::operator=(isl::ast_expr obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -1681,18 +1681,18 @@ std::string ast_expr::to_C_str() const {
 }
 
 // implementations for isl::ast_node
-ast_node manage(__isl_take isl_ast_node *ptr) {
+isl::ast_node manage(__isl_take isl_ast_node *ptr) {
   return ast_node(ptr);
 }
 
-ast_node give(__isl_take isl_ast_node *ptr) {
+isl::ast_node give(__isl_take isl_ast_node *ptr) {
   return manage(ptr);
 }
 
 ast_node::ast_node()
     : ptr(nullptr) {}
 
-ast_node::ast_node(const ast_node &obj)
+ast_node::ast_node(const isl::ast_node &obj)
     : ptr(obj.copy()) {}
 
 ast_node::ast_node(std::nullptr_t)
@@ -1701,7 +1701,7 @@ ast_node::ast_node(std::nullptr_t)
 ast_node::ast_node(__isl_take isl_ast_node *ptr)
     : ptr(ptr) {}
 
-ast_node &ast_node::operator=(ast_node obj) {
+ast_node &ast_node::operator=(isl::ast_node obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -1768,18 +1768,18 @@ std::string ast_node::to_C_str() const {
 }
 
 // implementations for isl::basic_map
-basic_map manage(__isl_take isl_basic_map *ptr) {
+isl::basic_map manage(__isl_take isl_basic_map *ptr) {
   return basic_map(ptr);
 }
 
-basic_map give(__isl_take isl_basic_map *ptr) {
+isl::basic_map give(__isl_take isl_basic_map *ptr) {
   return manage(ptr);
 }
 
 basic_map::basic_map()
     : ptr(nullptr) {}
 
-basic_map::basic_map(const basic_map &obj)
+basic_map::basic_map(const isl::basic_map &obj)
     : ptr(obj.copy()) {}
 
 basic_map::basic_map(std::nullptr_t)
@@ -1788,12 +1788,12 @@ basic_map::basic_map(std::nullptr_t)
 basic_map::basic_map(__isl_take isl_basic_map *ptr)
     : ptr(ptr) {}
 
-basic_map::basic_map(ctx ctx, const std::string &str) {
+basic_map::basic_map(isl::ctx ctx, const std::string &str) {
   auto res = isl_basic_map_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
 
-basic_map &basic_map::operator=(basic_map obj) {
+basic_map &basic_map::operator=(isl::basic_map obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -1973,18 +1973,18 @@ isl::basic_map basic_map::universe(isl::space dim) {
 }
 
 // implementations for isl::basic_set
-basic_set manage(__isl_take isl_basic_set *ptr) {
+isl::basic_set manage(__isl_take isl_basic_set *ptr) {
   return basic_set(ptr);
 }
 
-basic_set give(__isl_take isl_basic_set *ptr) {
+isl::basic_set give(__isl_take isl_basic_set *ptr) {
   return manage(ptr);
 }
 
 basic_set::basic_set()
     : ptr(nullptr) {}
 
-basic_set::basic_set(const basic_set &obj)
+basic_set::basic_set(const isl::basic_set &obj)
     : ptr(obj.copy()) {}
 
 basic_set::basic_set(std::nullptr_t)
@@ -1993,7 +1993,7 @@ basic_set::basic_set(std::nullptr_t)
 basic_set::basic_set(__isl_take isl_basic_set *ptr)
     : ptr(ptr) {}
 
-basic_set::basic_set(ctx ctx, const std::string &str) {
+basic_set::basic_set(isl::ctx ctx, const std::string &str) {
   auto res = isl_basic_set_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
@@ -2003,7 +2003,7 @@ basic_set::basic_set(isl::point pnt) {
   ptr = res;
 }
 
-basic_set &basic_set::operator=(basic_set obj) {
+basic_set &basic_set::operator=(isl::basic_set obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -2153,18 +2153,18 @@ isl::set basic_set::unite(isl::basic_set bset2) const {
 }
 
 // implementations for isl::id
-id manage(__isl_take isl_id *ptr) {
+isl::id manage(__isl_take isl_id *ptr) {
   return id(ptr);
 }
 
-id give(__isl_take isl_id *ptr) {
+isl::id give(__isl_take isl_id *ptr) {
   return manage(ptr);
 }
 
 id::id()
     : ptr(nullptr) {}
 
-id::id(const id &obj)
+id::id(const isl::id &obj)
     : ptr(obj.copy()) {}
 
 id::id(std::nullptr_t)
@@ -2173,7 +2173,7 @@ id::id(std::nullptr_t)
 id::id(__isl_take isl_id *ptr)
     : ptr(ptr) {}
 
-id &id::operator=(id obj) {
+id &id::operator=(isl::id obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -2233,18 +2233,18 @@ inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
 }
 
 // implementations for isl::local_space
-local_space manage(__isl_take isl_local_space *ptr) {
+isl::local_space manage(__isl_take isl_local_space *ptr) {
   return local_space(ptr);
 }
 
-local_space give(__isl_take isl_local_space *ptr) {
+isl::local_space give(__isl_take isl_local_space *ptr) {
   return manage(ptr);
 }
 
 local_space::local_space()
     : ptr(nullptr) {}
 
-local_space::local_space(const local_space &obj)
+local_space::local_space(const isl::local_space &obj)
     : ptr(obj.copy()) {}
 
 local_space::local_space(std::nullptr_t)
@@ -2258,7 +2258,7 @@ local_space::local_space(isl::space dim) {
   ptr = res;
 }
 
-local_space &local_space::operator=(local_space obj) {
+local_space &local_space::operator=(isl::local_space obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -2303,18 +2303,18 @@ bool local_space::is_null() const {
 }
 
 // implementations for isl::map
-map manage(__isl_take isl_map *ptr) {
+isl::map manage(__isl_take isl_map *ptr) {
   return map(ptr);
 }
 
-map give(__isl_take isl_map *ptr) {
+isl::map give(__isl_take isl_map *ptr) {
   return manage(ptr);
 }
 
 map::map()
     : ptr(nullptr) {}
 
-map::map(const map &obj)
+map::map(const isl::map &obj)
     : ptr(obj.copy()) {}
 
 map::map(std::nullptr_t)
@@ -2323,7 +2323,7 @@ map::map(std::nullptr_t)
 map::map(__isl_take isl_map *ptr)
     : ptr(ptr) {}
 
-map::map(ctx ctx, const std::string &str) {
+map::map(isl::ctx ctx, const std::string &str) {
   auto res = isl_map_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
@@ -2333,7 +2333,7 @@ map::map(isl::basic_map bmap) {
   ptr = res;
 }
 
-map &map::operator=(map obj) {
+map &map::operator=(isl::map obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -2588,18 +2588,18 @@ isl::basic_map map::unshifted_simple_hull() const {
 }
 
 // implementations for isl::multi_aff
-multi_aff manage(__isl_take isl_multi_aff *ptr) {
+isl::multi_aff manage(__isl_take isl_multi_aff *ptr) {
   return multi_aff(ptr);
 }
 
-multi_aff give(__isl_take isl_multi_aff *ptr) {
+isl::multi_aff give(__isl_take isl_multi_aff *ptr) {
   return manage(ptr);
 }
 
 multi_aff::multi_aff()
     : ptr(nullptr) {}
 
-multi_aff::multi_aff(const multi_aff &obj)
+multi_aff::multi_aff(const isl::multi_aff &obj)
     : ptr(obj.copy()) {}
 
 multi_aff::multi_aff(std::nullptr_t)
@@ -2613,12 +2613,12 @@ multi_aff::multi_aff(isl::aff aff) {
   ptr = res;
 }
 
-multi_aff::multi_aff(ctx ctx, const std::string &str) {
+multi_aff::multi_aff(isl::ctx ctx, const std::string &str) {
   auto res = isl_multi_aff_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
 
-multi_aff &multi_aff::operator=(multi_aff obj) {
+multi_aff &multi_aff::operator=(isl::multi_aff obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -2708,18 +2708,18 @@ isl::multi_aff multi_aff::range_product(isl::multi_aff multi2) const {
 }
 
 // implementations for isl::multi_pw_aff
-multi_pw_aff manage(__isl_take isl_multi_pw_aff *ptr) {
+isl::multi_pw_aff manage(__isl_take isl_multi_pw_aff *ptr) {
   return multi_pw_aff(ptr);
 }
 
-multi_pw_aff give(__isl_take isl_multi_pw_aff *ptr) {
+isl::multi_pw_aff give(__isl_take isl_multi_pw_aff *ptr) {
   return manage(ptr);
 }
 
 multi_pw_aff::multi_pw_aff()
     : ptr(nullptr) {}
 
-multi_pw_aff::multi_pw_aff(const multi_pw_aff &obj)
+multi_pw_aff::multi_pw_aff(const isl::multi_pw_aff &obj)
     : ptr(obj.copy()) {}
 
 multi_pw_aff::multi_pw_aff(std::nullptr_t)
@@ -2743,12 +2743,12 @@ multi_pw_aff::multi_pw_aff(isl::pw_multi_aff pma) {
   ptr = res;
 }
 
-multi_pw_aff::multi_pw_aff(ctx ctx, const std::string &str) {
+multi_pw_aff::multi_pw_aff(isl::ctx ctx, const std::string &str) {
   auto res = isl_multi_pw_aff_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
 
-multi_pw_aff &multi_pw_aff::operator=(multi_pw_aff obj) {
+multi_pw_aff &multi_pw_aff::operator=(isl::multi_pw_aff obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -2848,18 +2848,18 @@ isl::multi_pw_aff multi_pw_aff::range_product(isl::multi_pw_aff multi2) const {
 }
 
 // implementations for isl::multi_union_pw_aff
-multi_union_pw_aff manage(__isl_take isl_multi_union_pw_aff *ptr) {
+isl::multi_union_pw_aff manage(__isl_take isl_multi_union_pw_aff *ptr) {
   return multi_union_pw_aff(ptr);
 }
 
-multi_union_pw_aff give(__isl_take isl_multi_union_pw_aff *ptr) {
+isl::multi_union_pw_aff give(__isl_take isl_multi_union_pw_aff *ptr) {
   return manage(ptr);
 }
 
 multi_union_pw_aff::multi_union_pw_aff()
     : ptr(nullptr) {}
 
-multi_union_pw_aff::multi_union_pw_aff(const multi_union_pw_aff &obj)
+multi_union_pw_aff::multi_union_pw_aff(const isl::multi_union_pw_aff &obj)
     : ptr(obj.copy()) {}
 
 multi_union_pw_aff::multi_union_pw_aff(std::nullptr_t)
@@ -2883,12 +2883,12 @@ multi_union_pw_aff::multi_union_pw_aff(isl::union_pw_multi_aff upma) {
   ptr = res;
 }
 
-multi_union_pw_aff::multi_union_pw_aff(ctx ctx, const std::string &str) {
+multi_union_pw_aff::multi_union_pw_aff(isl::ctx ctx, const std::string &str) {
   auto res = isl_multi_union_pw_aff_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
 
-multi_union_pw_aff &multi_union_pw_aff::operator=(multi_union_pw_aff obj) {
+multi_union_pw_aff &multi_union_pw_aff::operator=(isl::multi_union_pw_aff obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -2978,18 +2978,18 @@ isl::multi_union_pw_aff multi_union_pw_aff::union_add(isl::multi_union_pw_aff mu
 }
 
 // implementations for isl::multi_val
-multi_val manage(__isl_take isl_multi_val *ptr) {
+isl::multi_val manage(__isl_take isl_multi_val *ptr) {
   return multi_val(ptr);
 }
 
-multi_val give(__isl_take isl_multi_val *ptr) {
+isl::multi_val give(__isl_take isl_multi_val *ptr) {
   return manage(ptr);
 }
 
 multi_val::multi_val()
     : ptr(nullptr) {}
 
-multi_val::multi_val(const multi_val &obj)
+multi_val::multi_val(const isl::multi_val &obj)
     : ptr(obj.copy()) {}
 
 multi_val::multi_val(std::nullptr_t)
@@ -2998,7 +2998,7 @@ multi_val::multi_val(std::nullptr_t)
 multi_val::multi_val(__isl_take isl_multi_val *ptr)
     : ptr(ptr) {}
 
-multi_val &multi_val::operator=(multi_val obj) {
+multi_val &multi_val::operator=(isl::multi_val obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -3083,18 +3083,18 @@ isl::multi_val multi_val::range_product(isl::multi_val multi2) const {
 }
 
 // implementations for isl::point
-point manage(__isl_take isl_point *ptr) {
+isl::point manage(__isl_take isl_point *ptr) {
   return point(ptr);
 }
 
-point give(__isl_take isl_point *ptr) {
+isl::point give(__isl_take isl_point *ptr) {
   return manage(ptr);
 }
 
 point::point()
     : ptr(nullptr) {}
 
-point::point(const point &obj)
+point::point(const isl::point &obj)
     : ptr(obj.copy()) {}
 
 point::point(std::nullptr_t)
@@ -3108,7 +3108,7 @@ point::point(isl::space dim) {
   ptr = res;
 }
 
-point &point::operator=(point obj) {
+point &point::operator=(isl::point obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -3168,18 +3168,18 @@ inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
 }
 
 // implementations for isl::pw_aff
-pw_aff manage(__isl_take isl_pw_aff *ptr) {
+isl::pw_aff manage(__isl_take isl_pw_aff *ptr) {
   return pw_aff(ptr);
 }
 
-pw_aff give(__isl_take isl_pw_aff *ptr) {
+isl::pw_aff give(__isl_take isl_pw_aff *ptr) {
   return manage(ptr);
 }
 
 pw_aff::pw_aff()
     : ptr(nullptr) {}
 
-pw_aff::pw_aff(const pw_aff &obj)
+pw_aff::pw_aff(const isl::pw_aff &obj)
     : ptr(obj.copy()) {}
 
 pw_aff::pw_aff(std::nullptr_t)
@@ -3203,12 +3203,12 @@ pw_aff::pw_aff(isl::set domain, isl::val v) {
   ptr = res;
 }
 
-pw_aff::pw_aff(ctx ctx, const std::string &str) {
+pw_aff::pw_aff(isl::ctx ctx, const std::string &str) {
   auto res = isl_pw_aff_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
 
-pw_aff &pw_aff::operator=(pw_aff obj) {
+pw_aff &pw_aff::operator=(isl::pw_aff obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -3328,18 +3328,18 @@ isl::pw_aff pw_aff::union_add(isl::pw_aff pwaff2) const {
 }
 
 // implementations for isl::pw_multi_aff
-pw_multi_aff manage(__isl_take isl_pw_multi_aff *ptr) {
+isl::pw_multi_aff manage(__isl_take isl_pw_multi_aff *ptr) {
   return pw_multi_aff(ptr);
 }
 
-pw_multi_aff give(__isl_take isl_pw_multi_aff *ptr) {
+isl::pw_multi_aff give(__isl_take isl_pw_multi_aff *ptr) {
   return manage(ptr);
 }
 
 pw_multi_aff::pw_multi_aff()
     : ptr(nullptr) {}
 
-pw_multi_aff::pw_multi_aff(const pw_multi_aff &obj)
+pw_multi_aff::pw_multi_aff(const isl::pw_multi_aff &obj)
     : ptr(obj.copy()) {}
 
 pw_multi_aff::pw_multi_aff(std::nullptr_t)
@@ -3348,7 +3348,7 @@ pw_multi_aff::pw_multi_aff(std::nullptr_t)
 pw_multi_aff::pw_multi_aff(__isl_take isl_pw_multi_aff *ptr)
     : ptr(ptr) {}
 
-pw_multi_aff::pw_multi_aff(ctx ctx, const std::string &str) {
+pw_multi_aff::pw_multi_aff(isl::ctx ctx, const std::string &str) {
   auto res = isl_pw_multi_aff_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
@@ -3363,7 +3363,7 @@ pw_multi_aff::pw_multi_aff(isl::pw_aff pa) {
   ptr = res;
 }
 
-pw_multi_aff &pw_multi_aff::operator=(pw_multi_aff obj) {
+pw_multi_aff &pw_multi_aff::operator=(isl::pw_multi_aff obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -3458,18 +3458,18 @@ isl::pw_multi_aff pw_multi_aff::union_add(isl::pw_multi_aff pma2) const {
 }
 
 // implementations for isl::schedule
-schedule manage(__isl_take isl_schedule *ptr) {
+isl::schedule manage(__isl_take isl_schedule *ptr) {
   return schedule(ptr);
 }
 
-schedule give(__isl_take isl_schedule *ptr) {
+isl::schedule give(__isl_take isl_schedule *ptr) {
   return manage(ptr);
 }
 
 schedule::schedule()
     : ptr(nullptr) {}
 
-schedule::schedule(const schedule &obj)
+schedule::schedule(const isl::schedule &obj)
     : ptr(obj.copy()) {}
 
 schedule::schedule(std::nullptr_t)
@@ -3478,12 +3478,12 @@ schedule::schedule(std::nullptr_t)
 schedule::schedule(__isl_take isl_schedule *ptr)
     : ptr(ptr) {}
 
-schedule::schedule(ctx ctx, const std::string &str) {
+schedule::schedule(isl::ctx ctx, const std::string &str) {
   auto res = isl_schedule_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
 
-schedule &schedule::operator=(schedule obj) {
+schedule &schedule::operator=(isl::schedule obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -3558,18 +3558,18 @@ isl::schedule schedule::pullback(isl::union_pw_multi_aff upma) const {
 }
 
 // implementations for isl::schedule_constraints
-schedule_constraints manage(__isl_take isl_schedule_constraints *ptr) {
+isl::schedule_constraints manage(__isl_take isl_schedule_constraints *ptr) {
   return schedule_constraints(ptr);
 }
 
-schedule_constraints give(__isl_take isl_schedule_constraints *ptr) {
+isl::schedule_constraints give(__isl_take isl_schedule_constraints *ptr) {
   return manage(ptr);
 }
 
 schedule_constraints::schedule_constraints()
     : ptr(nullptr) {}
 
-schedule_constraints::schedule_constraints(const schedule_constraints &obj)
+schedule_constraints::schedule_constraints(const isl::schedule_constraints &obj)
     : ptr(obj.copy()) {}
 
 schedule_constraints::schedule_constraints(std::nullptr_t)
@@ -3578,12 +3578,12 @@ schedule_constraints::schedule_constraints(std::nullptr_t)
 schedule_constraints::schedule_constraints(__isl_take isl_schedule_constraints *ptr)
     : ptr(ptr) {}
 
-schedule_constraints::schedule_constraints(ctx ctx, const std::string &str) {
+schedule_constraints::schedule_constraints(isl::ctx ctx, const std::string &str) {
   auto res = isl_schedule_constraints_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
 
-schedule_constraints &schedule_constraints::operator=(schedule_constraints obj) {
+schedule_constraints &schedule_constraints::operator=(isl::schedule_constraints obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -3678,18 +3678,18 @@ isl::union_map schedule_constraints::get_validity() const {
 }
 
 // implementations for isl::schedule_node
-schedule_node manage(__isl_take isl_schedule_node *ptr) {
+isl::schedule_node manage(__isl_take isl_schedule_node *ptr) {
   return schedule_node(ptr);
 }
 
-schedule_node give(__isl_take isl_schedule_node *ptr) {
+isl::schedule_node give(__isl_take isl_schedule_node *ptr) {
   return manage(ptr);
 }
 
 schedule_node::schedule_node()
     : ptr(nullptr) {}
 
-schedule_node::schedule_node(const schedule_node &obj)
+schedule_node::schedule_node(const isl::schedule_node &obj)
     : ptr(obj.copy()) {}
 
 schedule_node::schedule_node(std::nullptr_t)
@@ -3698,7 +3698,7 @@ schedule_node::schedule_node(std::nullptr_t)
 schedule_node::schedule_node(__isl_take isl_schedule_node *ptr)
     : ptr(ptr) {}
 
-schedule_node &schedule_node::operator=(schedule_node obj) {
+schedule_node &schedule_node::operator=(isl::schedule_node obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -3798,18 +3798,18 @@ isl::schedule_node schedule_node::parent() const {
 }
 
 // implementations for isl::set
-set manage(__isl_take isl_set *ptr) {
+isl::set manage(__isl_take isl_set *ptr) {
   return set(ptr);
 }
 
-set give(__isl_take isl_set *ptr) {
+isl::set give(__isl_take isl_set *ptr) {
   return manage(ptr);
 }
 
 set::set()
     : ptr(nullptr) {}
 
-set::set(const set &obj)
+set::set(const isl::set &obj)
     : ptr(obj.copy()) {}
 
 set::set(std::nullptr_t)
@@ -3823,7 +3823,7 @@ set::set(isl::union_set uset) {
   ptr = res;
 }
 
-set::set(ctx ctx, const std::string &str) {
+set::set(isl::ctx ctx, const std::string &str) {
   auto res = isl_set_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
@@ -3838,7 +3838,7 @@ set::set(isl::point pnt) {
   ptr = res;
 }
 
-set &set::operator=(set obj) {
+set &set::operator=(isl::set obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -4073,18 +4073,18 @@ isl::basic_set set::unshifted_simple_hull() const {
 }
 
 // implementations for isl::space
-space manage(__isl_take isl_space *ptr) {
+isl::space manage(__isl_take isl_space *ptr) {
   return space(ptr);
 }
 
-space give(__isl_take isl_space *ptr) {
+isl::space give(__isl_take isl_space *ptr) {
   return manage(ptr);
 }
 
 space::space()
     : ptr(nullptr) {}
 
-space::space(const space &obj)
+space::space(const isl::space &obj)
     : ptr(obj.copy()) {}
 
 space::space(std::nullptr_t)
@@ -4093,17 +4093,17 @@ space::space(std::nullptr_t)
 space::space(__isl_take isl_space *ptr)
     : ptr(ptr) {}
 
-space::space(ctx ctx, unsigned int nparam, unsigned int n_in, unsigned int n_out) {
+space::space(isl::ctx ctx, unsigned int nparam, unsigned int n_in, unsigned int n_out) {
   auto res = isl_space_alloc(ctx.release(), nparam, n_in, n_out);
   ptr = res;
 }
 
-space::space(ctx ctx, unsigned int nparam, unsigned int dim) {
+space::space(isl::ctx ctx, unsigned int nparam, unsigned int dim) {
   auto res = isl_space_set_alloc(ctx.release(), nparam, dim);
   ptr = res;
 }
 
-space &space::operator=(space obj) {
+space &space::operator=(isl::space obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -4183,18 +4183,18 @@ isl::space space::set_from_params() const {
 }
 
 // implementations for isl::union_access_info
-union_access_info manage(__isl_take isl_union_access_info *ptr) {
+isl::union_access_info manage(__isl_take isl_union_access_info *ptr) {
   return union_access_info(ptr);
 }
 
-union_access_info give(__isl_take isl_union_access_info *ptr) {
+isl::union_access_info give(__isl_take isl_union_access_info *ptr) {
   return manage(ptr);
 }
 
 union_access_info::union_access_info()
     : ptr(nullptr) {}
 
-union_access_info::union_access_info(const union_access_info &obj)
+union_access_info::union_access_info(const isl::union_access_info &obj)
     : ptr(obj.copy()) {}
 
 union_access_info::union_access_info(std::nullptr_t)
@@ -4208,7 +4208,7 @@ union_access_info::union_access_info(isl::union_map sink) {
   ptr = res;
 }
 
-union_access_info &union_access_info::operator=(union_access_info obj) {
+union_access_info &union_access_info::operator=(isl::union_access_info obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -4293,18 +4293,18 @@ isl::union_access_info union_access_info::set_schedule_map(isl::union_map schedu
 }
 
 // implementations for isl::union_flow
-union_flow manage(__isl_take isl_union_flow *ptr) {
+isl::union_flow manage(__isl_take isl_union_flow *ptr) {
   return union_flow(ptr);
 }
 
-union_flow give(__isl_take isl_union_flow *ptr) {
+isl::union_flow give(__isl_take isl_union_flow *ptr) {
   return manage(ptr);
 }
 
 union_flow::union_flow()
     : ptr(nullptr) {}
 
-union_flow::union_flow(const union_flow &obj)
+union_flow::union_flow(const isl::union_flow &obj)
     : ptr(obj.copy()) {}
 
 union_flow::union_flow(std::nullptr_t)
@@ -4313,7 +4313,7 @@ union_flow::union_flow(std::nullptr_t)
 union_flow::union_flow(__isl_take isl_union_flow *ptr)
     : ptr(ptr) {}
 
-union_flow &union_flow::operator=(union_flow obj) {
+union_flow &union_flow::operator=(isl::union_flow obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -4403,18 +4403,18 @@ isl::union_map union_flow::get_must_no_source() const {
 }
 
 // implementations for isl::union_map
-union_map manage(__isl_take isl_union_map *ptr) {
+isl::union_map manage(__isl_take isl_union_map *ptr) {
   return union_map(ptr);
 }
 
-union_map give(__isl_take isl_union_map *ptr) {
+isl::union_map give(__isl_take isl_union_map *ptr) {
   return manage(ptr);
 }
 
 union_map::union_map()
     : ptr(nullptr) {}
 
-union_map::union_map(const union_map &obj)
+union_map::union_map(const isl::union_map &obj)
     : ptr(obj.copy()) {}
 
 union_map::union_map(std::nullptr_t)
@@ -4438,12 +4438,12 @@ union_map::union_map(isl::map map) {
   ptr = res;
 }
 
-union_map::union_map(ctx ctx, const std::string &str) {
+union_map::union_map(isl::ctx ctx, const std::string &str) {
   auto res = isl_union_map_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
 
-union_map &union_map::operator=(union_map obj) {
+union_map &union_map::operator=(isl::union_map obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -4783,18 +4783,18 @@ isl::union_map union_map::zip() const {
 }
 
 // implementations for isl::union_pw_aff
-union_pw_aff manage(__isl_take isl_union_pw_aff *ptr) {
+isl::union_pw_aff manage(__isl_take isl_union_pw_aff *ptr) {
   return union_pw_aff(ptr);
 }
 
-union_pw_aff give(__isl_take isl_union_pw_aff *ptr) {
+isl::union_pw_aff give(__isl_take isl_union_pw_aff *ptr) {
   return manage(ptr);
 }
 
 union_pw_aff::union_pw_aff()
     : ptr(nullptr) {}
 
-union_pw_aff::union_pw_aff(const union_pw_aff &obj)
+union_pw_aff::union_pw_aff(const isl::union_pw_aff &obj)
     : ptr(obj.copy()) {}
 
 union_pw_aff::union_pw_aff(std::nullptr_t)
@@ -4813,12 +4813,12 @@ union_pw_aff::union_pw_aff(isl::union_set domain, isl::val v) {
   ptr = res;
 }
 
-union_pw_aff::union_pw_aff(ctx ctx, const std::string &str) {
+union_pw_aff::union_pw_aff(isl::ctx ctx, const std::string &str) {
   auto res = isl_union_pw_aff_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
 
-union_pw_aff &union_pw_aff::operator=(union_pw_aff obj) {
+union_pw_aff &union_pw_aff::operator=(isl::union_pw_aff obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -4918,18 +4918,18 @@ isl::union_pw_aff union_pw_aff::union_add(isl::union_pw_aff upa2) const {
 }
 
 // implementations for isl::union_pw_multi_aff
-union_pw_multi_aff manage(__isl_take isl_union_pw_multi_aff *ptr) {
+isl::union_pw_multi_aff manage(__isl_take isl_union_pw_multi_aff *ptr) {
   return union_pw_multi_aff(ptr);
 }
 
-union_pw_multi_aff give(__isl_take isl_union_pw_multi_aff *ptr) {
+isl::union_pw_multi_aff give(__isl_take isl_union_pw_multi_aff *ptr) {
   return manage(ptr);
 }
 
 union_pw_multi_aff::union_pw_multi_aff()
     : ptr(nullptr) {}
 
-union_pw_multi_aff::union_pw_multi_aff(const union_pw_multi_aff &obj)
+union_pw_multi_aff::union_pw_multi_aff(const isl::union_pw_multi_aff &obj)
     : ptr(obj.copy()) {}
 
 union_pw_multi_aff::union_pw_multi_aff(std::nullptr_t)
@@ -4953,7 +4953,7 @@ union_pw_multi_aff::union_pw_multi_aff(isl::union_map umap) {
   ptr = res;
 }
 
-union_pw_multi_aff::union_pw_multi_aff(ctx ctx, const std::string &str) {
+union_pw_multi_aff::union_pw_multi_aff(isl::ctx ctx, const std::string &str) {
   auto res = isl_union_pw_multi_aff_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
@@ -4963,7 +4963,7 @@ union_pw_multi_aff::union_pw_multi_aff(isl::union_pw_aff upa) {
   ptr = res;
 }
 
-union_pw_multi_aff &union_pw_multi_aff::operator=(union_pw_multi_aff obj) {
+union_pw_multi_aff &union_pw_multi_aff::operator=(isl::union_pw_multi_aff obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -5043,18 +5043,18 @@ isl::union_pw_multi_aff union_pw_multi_aff::union_add(isl::union_pw_multi_aff up
 }
 
 // implementations for isl::union_set
-union_set manage(__isl_take isl_union_set *ptr) {
+isl::union_set manage(__isl_take isl_union_set *ptr) {
   return union_set(ptr);
 }
 
-union_set give(__isl_take isl_union_set *ptr) {
+isl::union_set give(__isl_take isl_union_set *ptr) {
   return manage(ptr);
 }
 
 union_set::union_set()
     : ptr(nullptr) {}
 
-union_set::union_set(const union_set &obj)
+union_set::union_set(const isl::union_set &obj)
     : ptr(obj.copy()) {}
 
 union_set::union_set(std::nullptr_t)
@@ -5078,12 +5078,12 @@ union_set::union_set(isl::point pnt) {
   ptr = res;
 }
 
-union_set::union_set(ctx ctx, const std::string &str) {
+union_set::union_set(isl::ctx ctx, const std::string &str) {
   auto res = isl_union_set_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
 
-union_set &union_set::operator=(union_set obj) {
+union_set &union_set::operator=(isl::union_set obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -5268,18 +5268,18 @@ isl::union_map union_set::unwrap() const {
 }
 
 // implementations for isl::val
-val manage(__isl_take isl_val *ptr) {
+isl::val manage(__isl_take isl_val *ptr) {
   return val(ptr);
 }
 
-val give(__isl_take isl_val *ptr) {
+isl::val give(__isl_take isl_val *ptr) {
   return manage(ptr);
 }
 
 val::val()
     : ptr(nullptr) {}
 
-val::val(const val &obj)
+val::val(const isl::val &obj)
     : ptr(obj.copy()) {}
 
 val::val(std::nullptr_t)
@@ -5288,17 +5288,17 @@ val::val(std::nullptr_t)
 val::val(__isl_take isl_val *ptr)
     : ptr(ptr) {}
 
-val::val(ctx ctx, long i) {
+val::val(isl::ctx ctx, long i) {
   auto res = isl_val_int_from_si(ctx.release(), i);
   ptr = res;
 }
 
-val::val(ctx ctx, const std::string &str) {
+val::val(isl::ctx ctx, const std::string &str) {
   auto res = isl_val_read_from_str(ctx.release(), str.c_str());
   ptr = res;
 }
 
-val &val::operator=(val obj) {
+val &val::operator=(isl::val obj) {
   std::swap(this->ptr, obj.ptr);
   return *this;
 }
@@ -5422,7 +5422,7 @@ isl::boolean val::gt(const isl::val &v2) const {
   return res;
 }
 
-isl::val val::infty(ctx ctx) {
+isl::val val::infty(isl::ctx ctx) {
   auto res = isl_val_infty(ctx.release());
   return manage(res);
 }
@@ -5527,7 +5527,7 @@ isl::val val::mul(isl::val v2) const {
   return manage(res);
 }
 
-isl::val val::nan(ctx ctx) {
+isl::val val::nan(isl::ctx ctx) {
   auto res = isl_val_nan(ctx.release());
   return manage(res);
 }
@@ -5542,17 +5542,17 @@ isl::val val::neg() const {
   return manage(res);
 }
 
-isl::val val::neginfty(ctx ctx) {
+isl::val val::neginfty(isl::ctx ctx) {
   auto res = isl_val_neginfty(ctx.release());
   return manage(res);
 }
 
-isl::val val::negone(ctx ctx) {
+isl::val val::negone(isl::ctx ctx) {
   auto res = isl_val_negone(ctx.release());
   return manage(res);
 }
 
-isl::val val::one(ctx ctx) {
+isl::val val::one(isl::ctx ctx) {
   auto res = isl_val_one(ctx.release());
   return manage(res);
 }
@@ -5577,10 +5577,11 @@ isl::val val::trunc() const {
   return manage(res);
 }
 
-isl::val val::zero(ctx ctx) {
+isl::val val::zero(isl::ctx ctx) {
   auto res = isl_val_zero(ctx.release());
   return manage(res);
 }
+
 } // namespace noexceptions
 } // namespace isl