diff --git a/llvm/lib/Target/Hexagon/HexagonLoopAlign.cpp b/llvm/lib/Target/Hexagon/HexagonLoopAlign.cpp
index 8ebead8a41c90..4a9006935917c 100644
--- a/llvm/lib/Target/Hexagon/HexagonLoopAlign.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonLoopAlign.cpp
@@ -9,13 +9,13 @@
 // number of instructions, set the prefLoopAlignment to 32 bytes (5).
 //===----------------------------------------------------------------------===//
 
-#define DEBUG_TYPE "hexagon-loop-align"
-
 #include "HexagonTargetMachine.h"
 #include "llvm/CodeGen/MachineBlockFrequencyInfo.h"
 #include "llvm/CodeGen/MachineBranchProbabilityInfo.h"
 #include "llvm/Support/Debug.h"
 
+#define DEBUG_TYPE "hexagon-loop-align"
+
 using namespace llvm;
 
 static cl::opt<bool>
diff --git a/llvm/lib/Target/Lanai/Disassembler/LanaiDisassembler.cpp b/llvm/lib/Target/Lanai/Disassembler/LanaiDisassembler.cpp
index e9fecef4ac5b9..2720e1d9a6a64 100644
--- a/llvm/lib/Target/Lanai/Disassembler/LanaiDisassembler.cpp
+++ b/llvm/lib/Target/Lanai/Disassembler/LanaiDisassembler.cpp
@@ -20,8 +20,11 @@
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/MC/TargetRegistry.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Support/MathExtras.h"
 
+#define DEBUG_TYPE "lanai-disassembler"
+
 using namespace llvm;
 
 typedef MCDisassembler::DecodeStatus DecodeStatus;
diff --git a/llvm/lib/Target/Lanai/Disassembler/LanaiDisassembler.h b/llvm/lib/Target/Lanai/Disassembler/LanaiDisassembler.h
index 8aa28417896dc..04aeb3f27a3da 100644
--- a/llvm/lib/Target/Lanai/Disassembler/LanaiDisassembler.h
+++ b/llvm/lib/Target/Lanai/Disassembler/LanaiDisassembler.h
@@ -15,8 +15,6 @@
 
 #include "llvm/MC/MCDisassembler/MCDisassembler.h"
 
-#define DEBUG_TYPE "lanai-disassembler"
-
 namespace llvm {
 
 class LanaiDisassembler : public MCDisassembler {