diff --git a/polly/lib/Support/GICHelper.cpp b/polly/lib/Support/GICHelper.cpp
index 58c3ba564db1..82c07cab91d9 100644
--- a/polly/lib/Support/GICHelper.cpp
+++ b/polly/lib/Support/GICHelper.cpp
@@ -200,13 +200,14 @@ std::string polly::getIslCompatibleName(const std::string &Prefix,
 }
 
 #define DEFINE_ISLPTR(TYPE)                                                    \
-  template <> void polly::IslPtr<isl_##TYPE>::dump() const {                   \
+  template <> void IslPtr<isl_##TYPE>::dump() const {                          \
     isl_##TYPE##_dump(Obj);                                                    \
   }                                                                            \
-  template <> void polly::NonowningIslPtr<isl_##TYPE>::dump() const {          \
+  template <> void NonowningIslPtr<isl_##TYPE>::dump() const {                 \
     isl_##TYPE##_dump(Obj);                                                    \
   }
 
+namespace polly {
 DEFINE_ISLPTR(val)
 DEFINE_ISLPTR(space)
 DEFINE_ISLPTR(basic_map)
@@ -220,6 +221,7 @@ DEFINE_ISLPTR(pw_aff)
 // DEFINE_ISLPTR(union_pw_aff) /* There is no isl_union_pw_aff_dump() */
 DEFINE_ISLPTR(multi_union_pw_aff)
 DEFINE_ISLPTR(union_pw_multi_aff)
+}
 
 void polly::foreachElt(NonowningIslPtr<isl_union_map> UMap,
                        const std::function<void(IslPtr<isl_map> Map)> &F) {