7 files changed, 10 insertions, 10 deletions
diff --git a/llvm/include/llvm/Support/MDBuilder.h b/llvm/include/llvm/MDBuilder.h
index 855e58d699d..add6f2e2f96 100644
--- a/llvm/include/llvm/Support/MDBuilder.h
+++ b/llvm/include/llvm/MDBuilder.h
@@ -1,4 +1,4 @@
-//===---- llvm/Support/MDBuilder.h - Builder for LLVM metadata --*- C++ -*-===//
+//===---- llvm/MDBuilder.h - Builder for LLVM metadata ----------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Transforms/Utils/LowerExpectIntrinsic.cpp b/llvm/lib/Transforms/Utils/LowerExpectIntrinsic.cpp
index f96581393df..02bdcda3919 100644
--- a/llvm/lib/Transforms/Utils/LowerExpectIntrinsic.cpp
+++ b/llvm/lib/Transforms/Utils/LowerExpectIntrinsic.cpp
@@ -12,19 +12,19 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "lower-expect-intrinsic"
+#include "llvm/BasicBlock.h"
 #include "llvm/Constants.h"
 #include "llvm/Function.h"
-#include "llvm/BasicBlock.h"
-#include "llvm/LLVMContext.h"
 #include "llvm/Instructions.h"
 #include "llvm/Intrinsics.h"
+#include "llvm/LLVMContext.h"
+#include "llvm/MDBuilder.h"
 #include "llvm/Metadata.h"
 #include "llvm/Pass.h"
+#include "llvm/ADT/Statistic.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
-#include "llvm/Support/MDBuilder.h"
-#include "llvm/ADT/Statistic.h"
 #include <vector>
 
 using namespace llvm;
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
index 70c0f244f68..500a732c930 100644
--- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -20,6 +20,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/IntrinsicInst.h"
 #include "llvm/LLVMContext.h"
+#include "llvm/MDBuilder.h"
 #include "llvm/Metadata.h"
 #include "llvm/Operator.h"
 #include "llvm/Type.h"
@@ -35,7 +36,6 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ConstantRange.h"
 #include "llvm/Support/Debug.h"
-#include "llvm/Support/MDBuilder.h"
 #include "llvm/Support/NoFolder.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetData.h"
diff --git a/llvm/unittests/Support/CMakeLists.txt b/llvm/unittests/Support/CMakeLists.txt
index 6053994d0c7..674da35dce8 100644
--- a/llvm/unittests/Support/CMakeLists.txt
+++ b/llvm/unittests/Support/CMakeLists.txt
@@ -17,7 +17,6 @@ add_llvm_unittest(SupportTests
   LeakDetectorTest.cpp
   ManagedStatic.cpp
   MathExtrasTest.cpp
-  MDBuilderTest.cpp
   Path.cpp
   raw_ostream_test.cpp
   RegexTest.cpp
diff --git a/llvm/unittests/VMCore/CMakeLists.txt b/llvm/unittests/VMCore/CMakeLists.txt
index 5a87605b27d..79ee22c186d 100644
--- a/llvm/unittests/VMCore/CMakeLists.txt
+++ b/llvm/unittests/VMCore/CMakeLists.txt
@@ -8,6 +8,7 @@ set(VMCoreSources
   ConstantsTest.cpp
   DominatorTreeTest.cpp
   InstructionsTest.cpp
+  MDBuilderTest.cpp
   MetadataTest.cpp
   PassManagerTest.cpp
   ValueMapTest.cpp
diff --git a/llvm/unittests/VMCore/InstructionsTest.cpp b/llvm/unittests/VMCore/InstructionsTest.cpp
index a8902d932e5..72cdc8b9942 100644
--- a/llvm/unittests/VMCore/InstructionsTest.cpp
+++ b/llvm/unittests/VMCore/InstructionsTest.cpp
@@ -13,10 +13,10 @@
 #include "llvm/IRBuilder.h"
 #include "llvm/Instructions.h"
 #include "llvm/LLVMContext.h"
+#include "llvm/MDBuilder.h"
 #include "llvm/Operator.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Analysis/ValueTracking.h"
-#include "llvm/Support/MDBuilder.h"
 #include "llvm/Target/TargetData.h"
 #include "gtest/gtest.h"
 
diff --git a/llvm/unittests/Support/MDBuilderTest.cpp b/llvm/unittests/VMCore/MDBuilderTest.cpp
index af3f4348ffe..847039b8376 100644
--- a/llvm/unittests/Support/MDBuilderTest.cpp
+++ b/llvm/unittests/VMCore/MDBuilderTest.cpp
@@ -1,4 +1,4 @@
-//===- llvm/unittests/Support/MDBuilderTest.cpp - MDBuilder unit tests ----===//
+//===- llvm/unittests/MDBuilderTest.cpp - MDBuilder unit tests ------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/IRBuilder.h"
+#include "llvm/MDBuilder.h"
 #include "llvm/Operator.h"
-#include "llvm/Support/MDBuilder.h"
 
 #include "gtest/gtest.h"