diff --git a/include/llvm/ADT/hash_map.h.in b/include/llvm/ADT/hash_map.h.in
index 088fe93808c..3dcda5e9784 100644
--- a/include/llvm/ADT/hash_map.h.in
+++ b/include/llvm/ADT/hash_map.h.in
@@ -14,8 +14,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_ADT_HASH_MAP
-#define LLVM_ADT_HASH_MAP
+#ifndef LLVM_ADT_HASH_MAP_H
+#define LLVM_ADT_HASH_MAP_H
 
 // Compiler Support Matrix
 //
@@ -147,4 +147,4 @@ using HASH_NAMESPACE::hash;
 
 #include "llvm/ADT/HashExtras.h"
 
-#endif
+#endif // LLVM_ADT_HASH_MAP_H
diff --git a/include/llvm/ADT/hash_set.h.in b/include/llvm/ADT/hash_set.h.in
index 85493297490..5c4d1053834 100644
--- a/include/llvm/ADT/hash_set.h.in
+++ b/include/llvm/ADT/hash_set.h.in
@@ -15,8 +15,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_ADT_HASH_SET
-#define LLVM_ADT_HASH_SET
+#ifndef LLVM_ADT_HASH_SET_H
+#define LLVM_ADT_HASH_SET_H
 
 // Compiler Support Matrix
 //
@@ -108,4 +108,4 @@ using HASH_NAMESPACE::hash_set;
 
 #include "llvm/ADT/HashExtras.h"
 
-#endif
+#endif // LLVM_ADT_HASH_SET_H
diff --git a/include/llvm/ADT/ilist.h b/include/llvm/ADT/ilist.h
index d4bcb5b9040..016e9fd15fa 100644
--- a/include/llvm/ADT/ilist.h
+++ b/include/llvm/ADT/ilist.h
@@ -35,8 +35,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_ADT_ILIST
-#define LLVM_ADT_ILIST
+#ifndef LLVM_ADT_ILIST_H
+#define LLVM_ADT_ILIST_H
 
 #include "llvm/ADT/iterator.h"
 #include <cassert>
@@ -631,4 +631,4 @@ namespace std {
   }
 }  // End 'std' extensions...
 
-#endif
+#endif // LLVM_ADT_ILIST_H
diff --git a/include/llvm/ADT/iterator.h.in b/include/llvm/ADT/iterator.h.in
index 86d4be34d41..c5de277214c 100644
--- a/include/llvm/ADT/iterator.h.in
+++ b/include/llvm/ADT/iterator.h.in
@@ -25,8 +25,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_ADT_ITERATOR
-#define LLVM_ADT_ITERATOR
+#ifndef LLVM_ADT_ITERATOR_H
+#define LLVM_ADT_ITERATOR_H
 
 #include <iterator>
 
@@ -73,4 +73,4 @@ struct forward_iterator
 using std::forward_iterator;
 #endif
 
-#endif
+#endif // LLVM_ADT_ITERATOR_H