diff --git a/include/llvm-c/DisassemblerTypes.h b/include/llvm-c/DisassemblerTypes.h
index 389e5ee454a..ae5c6822759 100644
--- a/include/llvm-c/DisassemblerTypes.h
+++ b/include/llvm-c/DisassemblerTypes.h
@@ -7,8 +7,8 @@
 |*                                                                            *|
 |*===----------------------------------------------------------------------===*/
 
-#ifndef LLVM_DISASSEMBLER_TYPES_H
-#define LLVM_DISASSEMBLER_TYPES_H
+#ifndef LLVM_C_DISASSEMBLERTYPES_H
+#define LLVM_C_DISASSEMBLERTYPES_H
 
 #include "llvm-c/DataTypes.h"
 #ifdef __cplusplus
diff --git a/include/llvm-c/ErrorHandling.h b/include/llvm-c/ErrorHandling.h
index c6f7ff3ed69..5ba099c209c 100644
--- a/include/llvm-c/ErrorHandling.h
+++ b/include/llvm-c/ErrorHandling.h
@@ -11,8 +11,8 @@
 |*                                                                            *|
 \*===----------------------------------------------------------------------===*/
 
-#ifndef LLVM_C_ERROR_HANDLING_H
-#define LLVM_C_ERROR_HANDLING_H
+#ifndef LLVM_C_ERRORHANDLING_H
+#define LLVM_C_ERRORHANDLING_H
 
 #include "llvm-c/ExternC.h"
 
diff --git a/include/llvm-c/ExternC.h b/include/llvm-c/ExternC.h
index 4240f7c31a3..dfa21bdc085 100644
--- a/include/llvm-c/ExternC.h
+++ b/include/llvm-c/ExternC.h
@@ -11,8 +11,8 @@
 |*                                                                            *|
 \*===----------------------------------------------------------------------===*/
 
-#ifndef LLVM_C_EXTERN_C_H
-#define LLVM_C_EXTERN_C_H
+#ifndef LLVM_C_EXTERNC_H
+#define LLVM_C_EXTERNC_H
 
 #ifdef __clang__
 #define LLVM_C_STRICT_PROTOTYPES_BEGIN                                         \
diff --git a/include/llvm/Transforms/Utils/SampleProfileLoaderBaseImpl.h b/include/llvm/Transforms/Utils/SampleProfileLoaderBaseImpl.h
index df27e91b2f3..3d116e01d24 100644
--- a/include/llvm/Transforms/Utils/SampleProfileLoaderBaseImpl.h
+++ b/include/llvm/Transforms/Utils/SampleProfileLoaderBaseImpl.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TRANSFORMS_UTILS_SAMPLEPROFILELOADERIMPL_H
-#define LLVM_TRANSFORMS_UTILS_SAMPLEPROFILELOADERIMPL_H
+#ifndef LLVM_TRANSFORMS_UTILS_SAMPLEPROFILELOADERBASEIMPL_H
+#define LLVM_TRANSFORMS_UTILS_SAMPLEPROFILELOADERBASEIMPL_H
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
@@ -855,4 +855,4 @@ void SampleProfileLoaderBaseImpl::computeDominanceAndLoopInfo(Function &F) {
 #undef DEBUG_TYPE
 
 } // namespace llvm
-#endif // LLVM_TRANSFORMS_UTILS_SAMPLEPROFILELOADERIMPL_H
+#endif // LLVM_TRANSFORMS_UTILS_SAMPLEPROFILELOADERBASEIMPL_H
diff --git a/include/llvm/Transforms/Utils/SampleProfileLoaderBaseUtil.h b/include/llvm/Transforms/Utils/SampleProfileLoaderBaseUtil.h
index ed93133076d..91186cb8cdc 100644
--- a/include/llvm/Transforms/Utils/SampleProfileLoaderBaseUtil.h
+++ b/include/llvm/Transforms/Utils/SampleProfileLoaderBaseUtil.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TRANSFORMS_UTILS_SAMPLEPROFILELOADERUTIL_H
-#define LLVM_TRANSFORMS_UTILS_SAMPLEPROFILELOADERUTIL_H
+#ifndef LLVM_TRANSFORMS_UTILS_SAMPLEPROFILELOADERBASEUTIL_H
+#define LLVM_TRANSFORMS_UTILS_SAMPLEPROFILELOADERBASEUTIL_H
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Analysis/ProfileSummaryInfo.h"
@@ -95,4 +95,4 @@ bool callsiteIsHot(const FunctionSamples *CallsiteFS, ProfileSummaryInfo *PSI,
 } // end of namespace sampleprofutil
 } // end of namespace llvm
 
-#endif // LLVM_TRANSFORMS_UTILS_SAMPLEPROFILELOADERUTIL_H
+#endif // LLVM_TRANSFORMS_UTILS_SAMPLEPROFILELOADERBASEUTIL_H