diff --git a/polly/include/polly/Cloog.h b/polly/include/polly/CodeGen/Cloog.h
similarity index 100%
rename from polly/include/polly/Cloog.h
rename to polly/include/polly/CodeGen/Cloog.h
diff --git a/polly/lib/CodeGen/Cloog.cpp b/polly/lib/CodeGen/Cloog.cpp
index e4cd24bcb069..51e4154e8900 100644
--- a/polly/lib/CodeGen/Cloog.cpp
+++ b/polly/lib/CodeGen/Cloog.cpp
@@ -22,7 +22,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "polly/Cloog.h"
+#include "polly/CodeGen/Cloog.h"
 #ifdef CLOOG_FOUND
 #include "polly/LinkAllPasses.h"
 #include "polly/ScopInfo.h"
diff --git a/polly/lib/CodeGen/CodeGeneration.cpp b/polly/lib/CodeGen/CodeGeneration.cpp
index 6476dcd03a41..13aa4d76950f 100644
--- a/polly/lib/CodeGen/CodeGeneration.cpp
+++ b/polly/lib/CodeGen/CodeGeneration.cpp
@@ -20,7 +20,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "polly/Cloog.h"
+#include "polly/CodeGen/Cloog.h"
 #ifdef CLOOG_FOUND
 
 #define DEBUG_TYPE "polly-codegen"
diff --git a/polly/lib/IndependentBlocks.cpp b/polly/lib/IndependentBlocks.cpp
index 6f1893c1813f..8de9762fb8ad 100644
--- a/polly/lib/IndependentBlocks.cpp
+++ b/polly/lib/IndependentBlocks.cpp
@@ -14,7 +14,7 @@
 #include "polly/LinkAllPasses.h"
 #include "polly/ScopDetection.h"
 #include "polly/Support/ScopHelper.h"
-#include "polly/Cloog.h"
+#include "polly/CodeGen/Cloog.h"
 
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/RegionInfo.h"
diff --git a/polly/lib/RegisterPasses.cpp b/polly/lib/RegisterPasses.cpp
index b83e9af6ca08..410700cc1348 100644
--- a/polly/lib/RegisterPasses.cpp
+++ b/polly/lib/RegisterPasses.cpp
@@ -13,7 +13,7 @@
 #include "polly/RegisterPasses.h"
 #include "polly/LinkAllPasses.h"
 
-#include "polly/Cloog.h"
+#include "polly/CodeGen/Cloog.h"
 #include "polly/Dependences.h"
 #include "polly/ScopDetection.h"
 #include "polly/ScopInfo.h"