diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index 0421d8ca1a7..19b3c08985d 100644
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -25,7 +25,7 @@
 #include "llvm/Tools/DataTypes.h"
 #include "llvm/Instruction.h"
 #include "llvm/Support/Unique.h"
-#include "llvm/Codegen/TargetMachine.h"
+#include "llvm/CodeGen/TargetMachine.h"
 
 
 //************************* Opaque Declarations ****************************/
diff --git a/include/llvm/CodeGen/Sparc.h b/include/llvm/CodeGen/Sparc.h
index 8c3fbffbf49..f623bc26994 100644
--- a/include/llvm/CodeGen/Sparc.h
+++ b/include/llvm/CodeGen/Sparc.h
@@ -16,8 +16,8 @@
 
 //*************************** User Include Files ***************************/
 
-#include "llvm/Codegen/TargetMachine.h"
-#include "llvm/Codegen/MachineInstr.h"
+#include "llvm/CodeGen/TargetMachine.h"
+#include "llvm/CodeGen/MachineInstr.h"
 
 
 //************************* Opaque Declarations ****************************/
diff --git a/include/llvm/DerivedTypes.h b/include/llvm/DerivedTypes.h
index b5eba111475..a28210ba954 100644
--- a/include/llvm/DerivedTypes.h
+++ b/include/llvm/DerivedTypes.h
@@ -12,7 +12,7 @@
 #define LLVM_DERIVED_TYPES_H
 
 #include "llvm/Type.h"
-#include "llvm/Codegen/TargetMachine.h"
+#include "llvm/CodeGen/TargetMachine.h"
 #include "vector"
 
 class TargetMachine;
diff --git a/include/llvm/LLC/CompileContext.h b/include/llvm/LLC/CompileContext.h
index 88e35d6ff37..91a448b62d0 100644
--- a/include/llvm/LLC/CompileContext.h
+++ b/include/llvm/LLC/CompileContext.h
@@ -19,7 +19,7 @@
 
 //*************************** User Include Files ***************************/
 
-#include "llvm/Codegen/Sparc.h"
+#include "llvm/CodeGen/Sparc.h"
 #include "llvm/LLC/LLCOptions.h"
 
 //************************** Forward Declarations **************************/
diff --git a/lib/CodeGen/InstrSelection/InstrForest.cpp b/lib/CodeGen/InstrSelection/InstrForest.cpp
index 8ea293129c2..557d6efe432 100644
--- a/lib/CodeGen/InstrSelection/InstrForest.cpp
+++ b/lib/CodeGen/InstrSelection/InstrForest.cpp
@@ -44,8 +44,8 @@
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Tools/CommandLine.h"
 #include "llvm/LLC/CompileContext.h"
-#include "llvm/Codegen/MachineInstr.h"
-#include "llvm/Codegen/InstrForest.h"
+#include "llvm/CodeGen/MachineInstr.h"
+#include "llvm/CodeGen/InstrForest.h"
 
 //************************ Class Implementations **************************/
 
diff --git a/lib/CodeGen/InstrSelection/InstrSelection.cpp b/lib/CodeGen/InstrSelection/InstrSelection.cpp
index 0d7dc7e898e..9c955eba2d7 100644
--- a/lib/CodeGen/InstrSelection/InstrSelection.cpp
+++ b/lib/CodeGen/InstrSelection/InstrSelection.cpp
@@ -26,9 +26,9 @@
 #include "llvm/iMemory.h"
 #include "llvm/Instruction.h"
 #include "llvm/LLC/CompileContext.h"
-#include "llvm/Codegen/InstrForest.h"
-#include "llvm/Codegen/MachineInstr.h"
-#include "llvm/Codegen/InstrSelection.h"
+#include "llvm/CodeGen/InstrForest.h"
+#include "llvm/CodeGen/MachineInstr.h"
+#include "llvm/CodeGen/InstrSelection.h"
 
 
 //************************* Forward Declarations ***************************/
diff --git a/lib/CodeGen/MachineInstr.cpp b/lib/CodeGen/MachineInstr.cpp
index 1b6f25ae77f..e8897bf2e96 100644
--- a/lib/CodeGen/MachineInstr.cpp
+++ b/lib/CodeGen/MachineInstr.cpp
@@ -26,8 +26,8 @@
 #include "llvm/ConstPoolVals.h"
 #include "llvm/Value.h"
 #include "llvm/Instruction.h"
-#include "llvm/Codegen/InstrForest.h"
-#include "llvm/Codegen/MachineInstr.h"
+#include "llvm/CodeGen/InstrForest.h"
+#include "llvm/CodeGen/MachineInstr.h"
 
 //************************ Class Implementations **************************/
 
diff --git a/lib/CodeGen/TargetMachine/Sparc/Sparc.cpp b/lib/CodeGen/TargetMachine/Sparc/Sparc.cpp
index 08e12ff99a3..c687da73d88 100644
--- a/lib/CodeGen/TargetMachine/Sparc/Sparc.cpp
+++ b/lib/CodeGen/TargetMachine/Sparc/Sparc.cpp
@@ -15,7 +15,7 @@
 //*************************** User Include Files ***************************/
 
 #include "llvm/DerivedTypes.h"
-#include "llvm/Codegen/Sparc.h"
+#include "llvm/CodeGen/Sparc.h"
 
 
 //************************ Exported Constants ******************************/
diff --git a/lib/CodeGen/TargetMachine/Sparc/SparcInstrSelection.cpp b/lib/CodeGen/TargetMachine/Sparc/SparcInstrSelection.cpp
index 13384b8edb5..dcc00b53a90 100644
--- a/lib/CodeGen/TargetMachine/Sparc/SparcInstrSelection.cpp
+++ b/lib/CodeGen/TargetMachine/Sparc/SparcInstrSelection.cpp
@@ -29,10 +29,10 @@
 #include "llvm/Method.h"
 #include "llvm/ConstPoolVals.h"
 #include "llvm/LLC/CompileContext.h"
-#include "llvm/Codegen/Sparc.h"
-#include "llvm/Codegen/MachineInstr.h"
-#include "llvm/Codegen/InstrForest.h"
-#include "llvm/Codegen/InstrSelection.h"
+#include "llvm/CodeGen/Sparc.h"
+#include "llvm/CodeGen/MachineInstr.h"
+#include "llvm/CodeGen/InstrForest.h"
+#include "llvm/CodeGen/InstrSelection.h"
 
 
 //******************** Internal Data Declarations ************************/
diff --git a/lib/CodeGen/TargetMachine/TargetMachine.cpp b/lib/CodeGen/TargetMachine/TargetMachine.cpp
index 544f7420624..9b9729c1acf 100644
--- a/lib/CodeGen/TargetMachine/TargetMachine.cpp
+++ b/lib/CodeGen/TargetMachine/TargetMachine.cpp
@@ -15,7 +15,7 @@
 //*************************** User Include Files ***************************/
 
 #include "llvm/DerivedTypes.h"
-#include "llvm/Codegen/TargetMachine.h"
+#include "llvm/CodeGen/TargetMachine.h"
 
 
 //************************* Opaque Declarations ****************************/
diff --git a/lib/Target/SparcV9/InstrSelection/InstrForest.cpp b/lib/Target/SparcV9/InstrSelection/InstrForest.cpp
index 8ea293129c2..557d6efe432 100644
--- a/lib/Target/SparcV9/InstrSelection/InstrForest.cpp
+++ b/lib/Target/SparcV9/InstrSelection/InstrForest.cpp
@@ -44,8 +44,8 @@
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Tools/CommandLine.h"
 #include "llvm/LLC/CompileContext.h"
-#include "llvm/Codegen/MachineInstr.h"
-#include "llvm/Codegen/InstrForest.h"
+#include "llvm/CodeGen/MachineInstr.h"
+#include "llvm/CodeGen/InstrForest.h"
 
 //************************ Class Implementations **************************/
 
diff --git a/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp b/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp
index 0d7dc7e898e..9c955eba2d7 100644
--- a/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp
+++ b/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp
@@ -26,9 +26,9 @@
 #include "llvm/iMemory.h"
 #include "llvm/Instruction.h"
 #include "llvm/LLC/CompileContext.h"
-#include "llvm/Codegen/InstrForest.h"
-#include "llvm/Codegen/MachineInstr.h"
-#include "llvm/Codegen/InstrSelection.h"
+#include "llvm/CodeGen/InstrForest.h"
+#include "llvm/CodeGen/MachineInstr.h"
+#include "llvm/CodeGen/InstrSelection.h"
 
 
 //************************* Forward Declarations ***************************/
diff --git a/lib/VMCore/Instruction.cpp b/lib/VMCore/Instruction.cpp
index 0e73d37978f..ca9469df355 100644
--- a/lib/VMCore/Instruction.cpp
+++ b/lib/VMCore/Instruction.cpp
@@ -8,7 +8,7 @@
 #include "llvm/BasicBlock.h"
 #include "llvm/Method.h"
 #include "llvm/SymbolTable.h"
-#include "llvm/Codegen/MachineInstr.h"
+#include "llvm/CodeGen/MachineInstr.h"
 
 Instruction::Instruction(const Type *ty, unsigned it, const string &Name) 
   : User(ty, Value::InstructionVal, Name), 
diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index c8cefdb992e..6ac3175f2b2 100644
--- a/tools/llc/llc.cpp
+++ b/tools/llc/llc.cpp
@@ -19,8 +19,8 @@
 #include "llvm/Method.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Bytecode/Writer.h"
-#include "llvm/Codegen/InstrForest.h"
-#include "llvm/Codegen/InstrSelection.h"
+#include "llvm/CodeGen/InstrForest.h"
+#include "llvm/CodeGen/InstrSelection.h"
 #include "llvm/LLC/LLCOptions.h"
 #include "llvm/LLC/CompileContext.h"