Index: llvm/include/llvm/Analysis/BuiltinGCs.h
===================================================================
--- llvm/include/llvm/Analysis/BuiltinGCs.h
+++ llvm/include/llvm/Analysis/BuiltinGCs.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CODEGEN_BUILTINGCS_H
-#define LLVM_CODEGEN_BUILTINGCS_H
+#ifndef LLVM_ANALYSIS_BUILTINGCS_H
+#define LLVM_ANALYSIS_BUILTINGCS_H
 
 namespace llvm {
 
@@ -29,4 +29,4 @@
 void linkErlangGCPrinter();
 }
 
-#endif
+#endif // LLVM_ANALYSIS_BUILTINGCS_H
Index: llvm/include/llvm/Analysis/GCStrategy.h
===================================================================
--- llvm/include/llvm/Analysis/GCStrategy.h
+++ llvm/include/llvm/Analysis/GCStrategy.h
@@ -46,8 +46,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CODEGEN_GCSTRATEGY_H
-#define LLVM_CODEGEN_GCSTRATEGY_H
+#ifndef LLVM_ANALYSIS_GCSTRATEGY_H
+#define LLVM_ANALYSIS_GCSTRATEGY_H
 
 #include "llvm/ADT/None.h"
 #include "llvm/ADT/Optional.h"
@@ -133,4 +133,4 @@
 
 } // end namespace llvm
 
-#endif // LLVM_CODEGEN_GCSTRATEGY_H
+#endif // LLVM_ANALYSIS_GCSTRATEGY_H
Index: llvm/include/llvm/CodeGen/GCMetadata.h
===================================================================
--- llvm/include/llvm/CodeGen/GCMetadata.h
+++ llvm/include/llvm/CodeGen/GCMetadata.h
@@ -36,7 +36,7 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/CodeGen/GCStrategy.h"
+#include "llvm/Analysis/GCStrategy.h"
 #include "llvm/IR/DebugLoc.h"
 #include "llvm/Pass.h"
 #include <algorithm>
Index: llvm/include/llvm/CodeGen/LinkAllAsmWriterComponents.h
===================================================================
--- llvm/include/llvm/CodeGen/LinkAllAsmWriterComponents.h
+++ llvm/include/llvm/CodeGen/LinkAllAsmWriterComponents.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_CODEGEN_LINKALLASMWRITERCOMPONENTS_H
 #define LLVM_CODEGEN_LINKALLASMWRITERCOMPONENTS_H
 
-#include "llvm/CodeGen/BuiltinGCs.h"
+#include "llvm/Analysis/BuiltinGCs.h"
 #include <cstdlib>
 
 namespace {
Index: llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h
===================================================================
--- llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h
+++ llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_CODEGEN_LINKALLCODEGENCOMPONENTS_H
 #define LLVM_CODEGEN_LINKALLCODEGENCOMPONENTS_H
 
-#include "llvm/CodeGen/BuiltinGCs.h"
+#include "llvm/Analysis/BuiltinGCs.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/CodeGen/SchedulerRegistry.h"
 #include "llvm/Target/TargetMachine.h"
Index: llvm/lib/Analysis/BuiltinGCs.cpp
===================================================================
--- llvm/lib/Analysis/BuiltinGCs.cpp
+++ llvm/lib/Analysis/BuiltinGCs.cpp
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/CodeGen/BuiltinGCs.h"
-#include "llvm/CodeGen/GCStrategy.h"
+#include "llvm/Analysis/BuiltinGCs.h"
+#include "llvm/Analysis/GCStrategy.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/Support/Casting.h"
 
Index: llvm/lib/Analysis/CMakeLists.txt
===================================================================
--- llvm/lib/Analysis/CMakeLists.txt
+++ llvm/lib/Analysis/CMakeLists.txt
@@ -29,6 +29,7 @@
   BlockFrequencyInfo.cpp
   BlockFrequencyInfoImpl.cpp
   BranchProbabilityInfo.cpp
+  BuiltinGCs.cpp
   CFG.cpp
   CFGPrinter.cpp
   CFLAndersAliasAnalysis.cpp
@@ -56,6 +57,7 @@
   DominanceFrontier.cpp
   EHPersonalities.cpp
   FunctionPropertiesAnalysis.cpp
+  GCStrategy.cpp
   GlobalsModRef.cpp
   GuardUtils.cpp
   HeatUtils.cpp
Index: llvm/lib/Analysis/GCStrategy.cpp
===================================================================
--- llvm/lib/Analysis/GCStrategy.cpp
+++ llvm/lib/Analysis/GCStrategy.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/CodeGen/GCStrategy.h"
+#include "llvm/Analysis/GCStrategy.h"
 
 using namespace llvm;
 
Index: llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
===================================================================
--- llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -30,6 +30,7 @@
 #include "llvm/ADT/Triple.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Analysis/ConstantFolding.h"
+#include "llvm/Analysis/GCStrategy.h"
 #include "llvm/Analysis/EHPersonalities.h"
 #include "llvm/Analysis/MemoryLocation.h"
 #include "llvm/Analysis/OptimizationRemarkEmitter.h"
@@ -38,7 +39,6 @@
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/CodeGen/GCMetadata.h"
 #include "llvm/CodeGen/GCMetadataPrinter.h"
-#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/CodeGen/MachineDominators.h"
Index: llvm/lib/CodeGen/AsmPrinter/ErlangGCPrinter.cpp
===================================================================
--- llvm/lib/CodeGen/AsmPrinter/ErlangGCPrinter.cpp
+++ llvm/lib/CodeGen/AsmPrinter/ErlangGCPrinter.cpp
@@ -13,11 +13,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/BinaryFormat/ELF.h"
+#include "llvm/Analysis/BuiltinGCs.h"
 #include "llvm/CodeGen/AsmPrinter.h"
-#include "llvm/CodeGen/BuiltinGCs.h"
 #include "llvm/CodeGen/GCMetadata.h"
 #include "llvm/CodeGen/GCMetadataPrinter.h"
-#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Module.h"
Index: llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
===================================================================
--- llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
+++ llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
@@ -13,8 +13,8 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/Twine.h"
+#include "llvm/Analysis/BuiltinGCs.h"
 #include "llvm/CodeGen/AsmPrinter.h"
-#include "llvm/CodeGen/BuiltinGCs.h"
 #include "llvm/CodeGen/GCMetadata.h"
 #include "llvm/CodeGen/GCMetadataPrinter.h"
 #include "llvm/IR/DataLayout.h"
Index: llvm/lib/CodeGen/CMakeLists.txt
===================================================================
--- llvm/lib/CodeGen/CMakeLists.txt
+++ llvm/lib/CodeGen/CMakeLists.txt
@@ -7,7 +7,6 @@
   BranchFolding.cpp
   BranchRelaxation.cpp
   BreakFalseDeps.cpp
-  BuiltinGCs.cpp
   BasicBlockSections.cpp
   CalcSpillWeights.cpp
   CallingConvLower.cpp
@@ -37,7 +36,6 @@
   GCMetadata.cpp
   GCMetadataPrinter.cpp
   GCRootLowering.cpp
-  GCStrategy.cpp
   GlobalMerge.cpp
   HardwareLoops.cpp
   IfConversion.cpp
Index: llvm/lib/CodeGen/GCMetadata.cpp
===================================================================
--- llvm/lib/CodeGen/GCMetadata.cpp
+++ llvm/lib/CodeGen/GCMetadata.cpp
@@ -13,7 +13,6 @@
 #include "llvm/CodeGen/GCMetadata.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringExtras.h"
-#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/InitializePasses.h"
Index: llvm/lib/CodeGen/GCRootLowering.cpp
===================================================================
--- llvm/lib/CodeGen/GCRootLowering.cpp
+++ llvm/lib/CodeGen/GCRootLowering.cpp
@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/GCMetadata.h"
-#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
Index: llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp
===================================================================
--- llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp
+++ llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp
@@ -19,9 +19,9 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/Statistic.h"
+#include "llvm/Analysis/GCStrategy.h"
 #include "llvm/CodeGen/FunctionLoweringInfo.h"
 #include "llvm/CodeGen/GCMetadata.h"
-#include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/CodeGen/ISDOpcodes.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"