diff --git a/polly/include/polly/CodeGen/IslExprBuilder.h b/polly/include/polly/CodeGen/IslExprBuilder.h
index beb9ea41ad2c..ce606c1c5e6f 100644
--- a/polly/include/polly/CodeGen/IslExprBuilder.h
+++ b/polly/include/polly/CodeGen/IslExprBuilder.h
@@ -27,7 +27,7 @@ struct isl_id;
 
 namespace llvm {
 // Provide PointerLikeTypeTraits for isl_id.
-template <> class PointerLikeTypeTraits<isl_id *> {
+template <> struct PointerLikeTypeTraits<isl_id *> {
 
 public:
   static inline const void *getAsVoidPointer(isl_id *P) { return (void *)P; }
diff --git a/polly/include/polly/ScopPass.h b/polly/include/polly/ScopPass.h
index 5ac25c22977c..6ade9c89c500 100644
--- a/polly/include/polly/ScopPass.h
+++ b/polly/include/polly/ScopPass.h
@@ -182,7 +182,7 @@ class SPMUpdater {
 public:
   SPMUpdater(SmallPriorityWorklist<Region *, 4> &Worklist,
              ScopAnalysisManager &SAM)
-      : Worklist(Worklist), SAM(SAM), InvalidateCurrentScop(false) {}
+      : InvalidateCurrentScop(false), Worklist(Worklist), SAM(SAM) {}
 
   bool invalidateCurrentScop() const { return InvalidateCurrentScop; }
 
diff --git a/polly/lib/Transform/ForwardOpTree.cpp b/polly/lib/Transform/ForwardOpTree.cpp
index 0b916c594e6d..9e809a3dc674 100644
--- a/polly/lib/Transform/ForwardOpTree.cpp
+++ b/polly/lib/Transform/ForwardOpTree.cpp
@@ -197,7 +197,7 @@ private:
     // (i.e. not: { Dom[0] -> A[0]; Dom[1] -> B[1] }).
     // Look through all spaces until we find one that contains at least the
     // wanted statement instance.s
-    MustKnown.foreach_map([&, this](isl::map Map) -> isl::stat {
+    MustKnown.foreach_map([&](isl::map Map) -> isl::stat {
       // Get the array this is accessing.
       isl::id ArrayId = Map.get_tuple_id(isl::dim::out);
       ScopArrayInfo *SAI = static_cast<ScopArrayInfo *>(ArrayId.get_user());