diff --git a/polly/include/polly/BlockGenerators.h b/polly/include/polly/CodeGen/BlockGenerators.h
similarity index 100%
rename from polly/include/polly/BlockGenerators.h
rename to polly/include/polly/CodeGen/BlockGenerators.h
diff --git a/polly/include/polly/CodeGeneration.h b/polly/include/polly/CodeGen/CodeGeneration.h
similarity index 100%
rename from polly/include/polly/CodeGeneration.h
rename to polly/include/polly/CodeGen/CodeGeneration.h
diff --git a/polly/include/polly/LoopGenerators.h b/polly/include/polly/CodeGen/LoopGenerators.h
similarity index 100%
rename from polly/include/polly/LoopGenerators.h
rename to polly/include/polly/CodeGen/LoopGenerators.h
diff --git a/polly/lib/CodeGen/BlockGenerators.cpp b/polly/lib/CodeGen/BlockGenerators.cpp
index 889462f3bec2..95b8279cf929 100644
--- a/polly/lib/CodeGen/BlockGenerators.cpp
+++ b/polly/lib/CodeGen/BlockGenerators.cpp
@@ -14,8 +14,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "polly/ScopInfo.h"
-#include "polly/BlockGenerators.h"
-#include "polly/CodeGeneration.h"
+#include "polly/CodeGen/BlockGenerators.h"
 #include "polly/Support/GICHelper.h"
 
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
diff --git a/polly/lib/CodeGen/CodeGeneration.cpp b/polly/lib/CodeGen/CodeGeneration.cpp
index b91d0203dc11..4f46c9580a1a 100644
--- a/polly/lib/CodeGen/CodeGeneration.cpp
+++ b/polly/lib/CodeGen/CodeGeneration.cpp
@@ -23,13 +23,13 @@
 #define DEBUG_TYPE "polly-codegen"
 
 #include "polly/Cloog.h"
-#include "polly/CodeGeneration.h"
 #include "polly/Dependences.h"
 #include "polly/LinkAllPasses.h"
 #include "polly/ScopInfo.h"
 #include "polly/TempScopInfo.h"
-#include "polly/BlockGenerators.h"
-#include "polly/LoopGenerators.h"
+#include "polly/CodeGen/CodeGeneration.h"
+#include "polly/CodeGen/BlockGenerators.h"
+#include "polly/CodeGen/LoopGenerators.h"
 #include "polly/Support/GICHelper.h"
 
 #include "llvm/Module.h"
diff --git a/polly/lib/CodeGen/LoopGenerators.cpp b/polly/lib/CodeGen/LoopGenerators.cpp
index 583bbe4d25ac..f56ec4197c12 100644
--- a/polly/lib/CodeGen/LoopGenerators.cpp
+++ b/polly/lib/CodeGen/LoopGenerators.cpp
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "polly/LoopGenerators.h"
 #include "polly/ScopDetection.h"
+#include "polly/CodeGen/LoopGenerators.h"
 
 #include "llvm/Module.h"
 #include "llvm/Analysis/Dominators.h"
diff --git a/polly/lib/ScheduleOptimizer.cpp b/polly/lib/ScheduleOptimizer.cpp
index 171ed20e7691..899712e5afc8 100644
--- a/polly/lib/ScheduleOptimizer.cpp
+++ b/polly/lib/ScheduleOptimizer.cpp
@@ -19,7 +19,7 @@
 
 #include "polly/ScheduleOptimizer.h"
 
-#include "polly/CodeGeneration.h"
+#include "polly/CodeGen/CodeGeneration.h"
 #include "polly/Dependences.h"
 #include "polly/LinkAllPasses.h"
 #include "polly/ScopInfo.h"