summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/Support/Alloca.h6
-rw-r--r--include/Support/BitSetVector.h4
-rw-r--r--include/Support/CommandLine.h4
-rw-r--r--include/Support/DataTypes.h6
-rw-r--r--include/Support/DepthFirstIterator.h4
-rw-r--r--include/Support/EquivalenceClasses.h4
-rw-r--r--include/Support/GraphTraits.h4
-rw-r--r--include/Support/HashExtras.h4
-rw-r--r--include/Support/LeakDetector.h4
-rw-r--r--include/Support/MathExtras.h4
-rw-r--r--include/Support/NonCopyable.h4
-rw-r--r--include/Support/PostOrderIterator.h4
-rw-r--r--include/Support/SCCIterator.h4
-rw-r--r--include/Support/STLExtras.h4
-rw-r--r--include/Support/SetOperations.h4
-rw-r--r--include/Support/StringExtras.h4
-rw-r--r--include/Support/Tree.h4
-rw-r--r--include/Support/TypeInfo.h4
-rw-r--r--include/Support/hash_map4
-rw-r--r--include/Support/hash_set4
-rw-r--r--include/Support/ilist4
-rw-r--r--include/Support/iterator4
-rw-r--r--include/Support/slist4
-rw-r--r--include/llvm/ADT/BitSetVector.h4
-rw-r--r--include/llvm/ADT/DepthFirstIterator.h4
-rw-r--r--include/llvm/ADT/EquivalenceClasses.h4
-rw-r--r--include/llvm/ADT/GraphTraits.h4
-rw-r--r--include/llvm/ADT/HashExtras.h4
-rw-r--r--include/llvm/ADT/PostOrderIterator.h4
-rw-r--r--include/llvm/ADT/SCCIterator.h4
-rw-r--r--include/llvm/ADT/STLExtras.h4
-rw-r--r--include/llvm/ADT/SetOperations.h4
-rw-r--r--include/llvm/ADT/StringExtras.h4
-rw-r--r--include/llvm/ADT/Tree.h4
-rw-r--r--include/llvm/ADT/ilist4
-rw-r--r--include/llvm/Support/CommandLine.h4
-rw-r--r--include/llvm/Support/LeakDetector.h4
-rw-r--r--include/llvm/Support/MathExtras.h4
-rw-r--r--include/llvm/Support/TypeInfo.h4
39 files changed, 80 insertions, 80 deletions
diff --git a/include/Support/Alloca.h b/include/Support/Alloca.h
index 3c163ed0d6..a56e874c75 100644
--- a/include/Support/Alloca.h
+++ b/include/Support/Alloca.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_ALLOCA_H
-#define LLVM_SUPPORT_ALLOCA_H
+#ifndef SUPPORT_ALLOCA_H
+#define SUPPORT_ALLOCA_H
// TODO: Determine HAVE_ALLOCA_H based on autoconf results.
// The following method is too brittle.
@@ -27,4 +27,4 @@
#include <alloca.h>
#endif
-#endif /* LLVM_SUPPORT_ALLOCA_H */
+#endif /* SUPPORT_ALLOCA_H */
diff --git a/include/Support/BitSetVector.h b/include/Support/BitSetVector.h
index 6ce56be4d0..2200df746f 100644
--- a/include/Support/BitSetVector.h
+++ b/include/Support/BitSetVector.h
@@ -23,8 +23,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_BITVECTORSET_H
-#define LLVM_SUPPORT_BITVECTORSET_H
+#ifndef SUPPORT_BITSETVECTOR_H
+#define SUPPORT_BITSETVECTOR_H
#include <bitset>
#include <vector>
diff --git a/include/Support/CommandLine.h b/include/Support/CommandLine.h
index b524c977f7..728bb14678 100644
--- a/include/Support/CommandLine.h
+++ b/include/Support/CommandLine.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_COMMANDLINE_H
-#define LLVM_SUPPORT_COMMANDLINE_H
+#ifndef SUPPORT_COMMANDLINE_H
+#define SUPPORT_COMMANDLINE_H
#include <string>
#include <vector>
diff --git a/include/Support/DataTypes.h b/include/Support/DataTypes.h
index 8a8952fb4e..80543c6140 100644
--- a/include/Support/DataTypes.h
+++ b/include/Support/DataTypes.h
@@ -16,8 +16,8 @@
// TODO: This file sucks. Not only does it not work, but this stuff should be
// autoconfiscated anyways. Major FIXME
-#ifndef LLVM_SUPPORT_DATATYPES_H
-#define LLVM_SUPPORT_DATATYPES_H
+#ifndef SUPPORT_DATATYPES_H
+#define SUPPORT_DATATYPES_H
#define __STDC_LIMIT_MACROS 1
#include <inttypes.h>
@@ -82,4 +82,4 @@
#error "include/Support/DataTypes.h could not determine endianness!"
#endif
-#endif /* LLVM_SUPPORT_DATATYPES_H */
+#endif /* SUPPORT_DATATYPES_H */
diff --git a/include/Support/DepthFirstIterator.h b/include/Support/DepthFirstIterator.h
index 7ae4b9dc6f..b4a1b2969f 100644
--- a/include/Support/DepthFirstIterator.h
+++ b/include/Support/DepthFirstIterator.h
@@ -5,8 +5,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_DEPTH_FIRST_ITERATOR_H
-#define LLVM_SUPPORT_DEPTH_FIRST_ITERATOR_H
+#ifndef SUPPORT_DEPTHFIRSTITERATOR_H
+#define SUPPORT_DEPTHFIRSTITERATOR_H
#include "Support/GraphTraits.h"
#include "Support/iterator"
diff --git a/include/Support/EquivalenceClasses.h b/include/Support/EquivalenceClasses.h
index 47da34b62c..96cfc87a72 100644
--- a/include/Support/EquivalenceClasses.h
+++ b/include/Support/EquivalenceClasses.h
@@ -8,8 +8,8 @@
//
//===------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_EQUIVALENCE_CLASSES_H
-#define LLVM_SUPPORT_EQUIVALENCE_CLASSES_H
+#ifndef SUPPORT_EQUIVALENCECLASSES_H
+#define SUPPORT_EQUIVALENCECLASSES_H
#include <map>
#include <vector>
diff --git a/include/Support/GraphTraits.h b/include/Support/GraphTraits.h
index 754e38fa7f..15c285da17 100644
--- a/include/Support/GraphTraits.h
+++ b/include/Support/GraphTraits.h
@@ -8,8 +8,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_GRAPH_TRAITS_H
-#define LLVM_SUPPORT_GRAPH_TRAITS_H
+#ifndef SUPPORT_GRAPHTRAITS_H
+#define SUPPORT_GRAPHTRAITS_H
// GraphTraits - This class should be specialized by different graph types...
// which is why the default version is empty.
diff --git a/include/Support/HashExtras.h b/include/Support/HashExtras.h
index 68a49eac9e..f644cbd22b 100644
--- a/include/Support/HashExtras.h
+++ b/include/Support/HashExtras.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_HASHEXTRAS_H
-#define LLVM_SUPPORT_HASHEXTRAS_H
+#ifndef SUPPORT_HASHEXTRAS_H
+#define SUPPORT_HASHEXTRAS_H
#include <string>
#include "Support/hash_map"
diff --git a/include/Support/LeakDetector.h b/include/Support/LeakDetector.h
index dadbac1efa..4c682be500 100644
--- a/include/Support/LeakDetector.h
+++ b/include/Support/LeakDetector.h
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef SUPPORT_LEAK_DETECTOR_H
-#define SUPPORT_LEAK_DETECTOR_H
+#ifndef SUPPORT_LEAKDETECTOR_H
+#define SUPPORT_LEAKDETECTOR_H
#include <string>
class Value;
diff --git a/include/Support/MathExtras.h b/include/Support/MathExtras.h
index d73394149b..bfb88552bf 100644
--- a/include/Support/MathExtras.h
+++ b/include/Support/MathExtras.h
@@ -4,8 +4,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef SUPPORT_MATH_EXTRAS_H
-#define SUPPORT_MATH_EXTRAS_H
+#ifndef SUPPORT_MATHEXTRAS_H
+#define SUPPORT_MATHEXTRAS_H
#include "Support/DataTypes.h"
diff --git a/include/Support/NonCopyable.h b/include/Support/NonCopyable.h
index 82f3c1a760..f13b7ce9da 100644
--- a/include/Support/NonCopyable.h
+++ b/include/Support/NonCopyable.h
@@ -9,8 +9,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_NONCOPYABLE_H
-#define LLVM_SUPPORT_NONCOPYABLE_H
+#ifndef SUPPORT_NONCOPYABLE_H
+#define SUPPORT_NONCOPYABLE_H
class NonCopyable {
// Disable the copy constructor and the assignment operator
diff --git a/include/Support/PostOrderIterator.h b/include/Support/PostOrderIterator.h
index 4c19e7ac36..084d38fd9d 100644
--- a/include/Support/PostOrderIterator.h
+++ b/include/Support/PostOrderIterator.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_POSTORDER_ITERATOR_H
-#define LLVM_SUPPORT_POSTORDER_ITERATOR_H
+#ifndef SUPPORT_POSTORDERITERATOR_H
+#define SUPPORT_POSTORDERITERATOR_H
#include "Support/GraphTraits.h"
#include "Support/iterator"
diff --git a/include/Support/SCCIterator.h b/include/Support/SCCIterator.h
index ed660d64c7..b7037701e0 100644
--- a/include/Support/SCCIterator.h
+++ b/include/Support/SCCIterator.h
@@ -11,8 +11,8 @@
// (NOTE: This requires some simple wrappers and is not supported yet.)
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_TARJANSCC_ITERATOR_H
-#define LLVM_SUPPORT_TARJANSCC_ITERATOR_H
+#ifndef SUPPORT_TARJANSCCITERATOR_H
+#define SUPPORT_TARJANSCCITERATOR_H
#include "Support/GraphTraits.h"
#include <Support/Statistic.h>
diff --git a/include/Support/STLExtras.h b/include/Support/STLExtras.h
index b2fde43637..348c4e17aa 100644
--- a/include/Support/STLExtras.h
+++ b/include/Support/STLExtras.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_STL_EXTRAS_H
-#define LLVM_SUPPORT_STL_EXTRAS_H
+#ifndef SUPPORT_STLEXTRAS_H
+#define SUPPORT_STLEXTRAS_H
#include <functional>
#include "Support/iterator"
diff --git a/include/Support/SetOperations.h b/include/Support/SetOperations.h
index d79d386380..3a5e6f2bd4 100644
--- a/include/Support/SetOperations.h
+++ b/include/Support/SetOperations.h
@@ -5,8 +5,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_SET_OPERATIONS_H
-#define LLVM_SUPPORT_SET_OPERATIONS_H
+#ifndef SUPPORT_SETOPERATIONS_H
+#define SUPPORT_SETOPERATIONS_H
// set_union(A, B) - Compute A := A u B, return whether A changed.
//
diff --git a/include/Support/StringExtras.h b/include/Support/StringExtras.h
index 529d86caa2..924f6c35f8 100644
--- a/include/Support/StringExtras.h
+++ b/include/Support/StringExtras.h
@@ -4,8 +4,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef SUPPORT_STRING_EXTRAS_H
-#define SUPPORT_STRING_EXTRAS_H
+#ifndef SUPPORT_STRINGEXTRAS_H
+#define SUPPORT_STRINGEXTRAS_H
#include "Support/DataTypes.h"
#include <string>
diff --git a/include/Support/Tree.h b/include/Support/Tree.h
index 544e57e526..9979caaf31 100644
--- a/include/Support/Tree.h
+++ b/include/Support/Tree.h
@@ -5,8 +5,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_TREE_H
-#define LLVM_SUPPORT_TREE_H
+#ifndef SUPPORT_TREE_H
+#define SUPPORT_TREE_H
#include <vector>
diff --git a/include/Support/TypeInfo.h b/include/Support/TypeInfo.h
index 29f4e22a99..9884f65e69 100644
--- a/include/Support/TypeInfo.h
+++ b/include/Support/TypeInfo.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_TYPEINFO_H
-#define LLVM_SUPPORT_TYPEINFO_H
+#ifndef SUPPORT_TYPEINFO_H
+#define SUPPORT_TYPEINFO_H
#include <typeinfo>
diff --git a/include/Support/hash_map b/include/Support/hash_map
index dc905da410..3c50e4b13f 100644
--- a/include/Support/hash_map
+++ b/include/Support/hash_map
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef SUPPORT_HASHMAP_H
-#define SUPPORT_HASHMAP_H
+#ifndef SUPPORT_HASH_MAP
+#define SUPPORT_HASH_MAP
// Compiler Support Matrix
//
diff --git a/include/Support/hash_set b/include/Support/hash_set
index 4bd91ab241..72c20ce235 100644
--- a/include/Support/hash_set
+++ b/include/Support/hash_set
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef SUPPORT_HASHSET_H
-#define SUPPORT_HASHSET_H
+#ifndef SUPPORT_HASH_SET
+#define SUPPORT_HASH_SET
// Compiler Support Matrix
//
diff --git a/include/Support/ilist b/include/Support/ilist
index 1d868f8a4a..ce906ba559 100644
--- a/include/Support/ilist
+++ b/include/Support/ilist
@@ -28,8 +28,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef INCLUDED_SUPPORT_ILIST
-#define INCLUDED_SUPPORT_ILIST
+#ifndef SUPPORT_ILIST
+#define SUPPORT_ILIST
#include <assert.h>
#include <algorithm>
diff --git a/include/Support/iterator b/include/Support/iterator
index 46cf967936..444f5ab152 100644
--- a/include/Support/iterator
+++ b/include/Support/iterator
@@ -16,8 +16,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef SUPPORT_ITERATOR_H
-#define SUPPORT_ITERATOR_H
+#ifndef SUPPORT_ITERATOR
+#define SUPPORT_ITERATOR
#include <iterator>
diff --git a/include/Support/slist b/include/Support/slist
index 4f723df761..71670e6af2 100644
--- a/include/Support/slist
+++ b/include/Support/slist
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef SUPPORT_SLIST_H
-#define SUPPORT_SLIST_H
+#ifndef SUPPORT_SLIST
+#define SUPPORT_SLIST
// Compiler Support Matrix
//
diff --git a/include/llvm/ADT/BitSetVector.h b/include/llvm/ADT/BitSetVector.h
index 6ce56be4d0..2200df746f 100644
--- a/include/llvm/ADT/BitSetVector.h
+++ b/include/llvm/ADT/BitSetVector.h
@@ -23,8 +23,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_BITVECTORSET_H
-#define LLVM_SUPPORT_BITVECTORSET_H
+#ifndef SUPPORT_BITSETVECTOR_H
+#define SUPPORT_BITSETVECTOR_H
#include <bitset>
#include <vector>
diff --git a/include/llvm/ADT/DepthFirstIterator.h b/include/llvm/ADT/DepthFirstIterator.h
index 7ae4b9dc6f..b4a1b2969f 100644
--- a/include/llvm/ADT/DepthFirstIterator.h
+++ b/include/llvm/ADT/DepthFirstIterator.h
@@ -5,8 +5,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_DEPTH_FIRST_ITERATOR_H
-#define LLVM_SUPPORT_DEPTH_FIRST_ITERATOR_H
+#ifndef SUPPORT_DEPTHFIRSTITERATOR_H
+#define SUPPORT_DEPTHFIRSTITERATOR_H
#include "Support/GraphTraits.h"
#include "Support/iterator"
diff --git a/include/llvm/ADT/EquivalenceClasses.h b/include/llvm/ADT/EquivalenceClasses.h
index 47da34b62c..96cfc87a72 100644
--- a/include/llvm/ADT/EquivalenceClasses.h
+++ b/include/llvm/ADT/EquivalenceClasses.h
@@ -8,8 +8,8 @@
//
//===------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_EQUIVALENCE_CLASSES_H
-#define LLVM_SUPPORT_EQUIVALENCE_CLASSES_H
+#ifndef SUPPORT_EQUIVALENCECLASSES_H
+#define SUPPORT_EQUIVALENCECLASSES_H
#include <map>
#include <vector>
diff --git a/include/llvm/ADT/GraphTraits.h b/include/llvm/ADT/GraphTraits.h
index 754e38fa7f..15c285da17 100644
--- a/include/llvm/ADT/GraphTraits.h
+++ b/include/llvm/ADT/GraphTraits.h
@@ -8,8 +8,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_GRAPH_TRAITS_H
-#define LLVM_SUPPORT_GRAPH_TRAITS_H
+#ifndef SUPPORT_GRAPHTRAITS_H
+#define SUPPORT_GRAPHTRAITS_H
// GraphTraits - This class should be specialized by different graph types...
// which is why the default version is empty.
diff --git a/include/llvm/ADT/HashExtras.h b/include/llvm/ADT/HashExtras.h
index 68a49eac9e..f644cbd22b 100644
--- a/include/llvm/ADT/HashExtras.h
+++ b/include/llvm/ADT/HashExtras.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_HASHEXTRAS_H
-#define LLVM_SUPPORT_HASHEXTRAS_H
+#ifndef SUPPORT_HASHEXTRAS_H
+#define SUPPORT_HASHEXTRAS_H
#include <string>
#include "Support/hash_map"
diff --git a/include/llvm/ADT/PostOrderIterator.h b/include/llvm/ADT/PostOrderIterator.h
index 4c19e7ac36..084d38fd9d 100644
--- a/include/llvm/ADT/PostOrderIterator.h
+++ b/include/llvm/ADT/PostOrderIterator.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_POSTORDER_ITERATOR_H
-#define LLVM_SUPPORT_POSTORDER_ITERATOR_H
+#ifndef SUPPORT_POSTORDERITERATOR_H
+#define SUPPORT_POSTORDERITERATOR_H
#include "Support/GraphTraits.h"
#include "Support/iterator"
diff --git a/include/llvm/ADT/SCCIterator.h b/include/llvm/ADT/SCCIterator.h
index ed660d64c7..b7037701e0 100644
--- a/include/llvm/ADT/SCCIterator.h
+++ b/include/llvm/ADT/SCCIterator.h
@@ -11,8 +11,8 @@
// (NOTE: This requires some simple wrappers and is not supported yet.)
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_TARJANSCC_ITERATOR_H
-#define LLVM_SUPPORT_TARJANSCC_ITERATOR_H
+#ifndef SUPPORT_TARJANSCCITERATOR_H
+#define SUPPORT_TARJANSCCITERATOR_H
#include "Support/GraphTraits.h"
#include <Support/Statistic.h>
diff --git a/include/llvm/ADT/STLExtras.h b/include/llvm/ADT/STLExtras.h
index b2fde43637..348c4e17aa 100644
--- a/include/llvm/ADT/STLExtras.h
+++ b/include/llvm/ADT/STLExtras.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_STL_EXTRAS_H
-#define LLVM_SUPPORT_STL_EXTRAS_H
+#ifndef SUPPORT_STLEXTRAS_H
+#define SUPPORT_STLEXTRAS_H
#include <functional>
#include "Support/iterator"
diff --git a/include/llvm/ADT/SetOperations.h b/include/llvm/ADT/SetOperations.h
index d79d386380..3a5e6f2bd4 100644
--- a/include/llvm/ADT/SetOperations.h
+++ b/include/llvm/ADT/SetOperations.h
@@ -5,8 +5,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_SET_OPERATIONS_H
-#define LLVM_SUPPORT_SET_OPERATIONS_H
+#ifndef SUPPORT_SETOPERATIONS_H
+#define SUPPORT_SETOPERATIONS_H
// set_union(A, B) - Compute A := A u B, return whether A changed.
//
diff --git a/include/llvm/ADT/StringExtras.h b/include/llvm/ADT/StringExtras.h
index 529d86caa2..924f6c35f8 100644
--- a/include/llvm/ADT/StringExtras.h
+++ b/include/llvm/ADT/StringExtras.h
@@ -4,8 +4,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef SUPPORT_STRING_EXTRAS_H
-#define SUPPORT_STRING_EXTRAS_H
+#ifndef SUPPORT_STRINGEXTRAS_H
+#define SUPPORT_STRINGEXTRAS_H
#include "Support/DataTypes.h"
#include <string>
diff --git a/include/llvm/ADT/Tree.h b/include/llvm/ADT/Tree.h
index 544e57e526..9979caaf31 100644
--- a/include/llvm/ADT/Tree.h
+++ b/include/llvm/ADT/Tree.h
@@ -5,8 +5,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_TREE_H
-#define LLVM_SUPPORT_TREE_H
+#ifndef SUPPORT_TREE_H
+#define SUPPORT_TREE_H
#include <vector>
diff --git a/include/llvm/ADT/ilist b/include/llvm/ADT/ilist
index 1d868f8a4a..ce906ba559 100644
--- a/include/llvm/ADT/ilist
+++ b/include/llvm/ADT/ilist
@@ -28,8 +28,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef INCLUDED_SUPPORT_ILIST
-#define INCLUDED_SUPPORT_ILIST
+#ifndef SUPPORT_ILIST
+#define SUPPORT_ILIST
#include <assert.h>
#include <algorithm>
diff --git a/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h
index b524c977f7..728bb14678 100644
--- a/include/llvm/Support/CommandLine.h
+++ b/include/llvm/Support/CommandLine.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_COMMANDLINE_H
-#define LLVM_SUPPORT_COMMANDLINE_H
+#ifndef SUPPORT_COMMANDLINE_H
+#define SUPPORT_COMMANDLINE_H
#include <string>
#include <vector>
diff --git a/include/llvm/Support/LeakDetector.h b/include/llvm/Support/LeakDetector.h
index dadbac1efa..4c682be500 100644
--- a/include/llvm/Support/LeakDetector.h
+++ b/include/llvm/Support/LeakDetector.h
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef SUPPORT_LEAK_DETECTOR_H
-#define SUPPORT_LEAK_DETECTOR_H
+#ifndef SUPPORT_LEAKDETECTOR_H
+#define SUPPORT_LEAKDETECTOR_H
#include <string>
class Value;
diff --git a/include/llvm/Support/MathExtras.h b/include/llvm/Support/MathExtras.h
index d73394149b..bfb88552bf 100644
--- a/include/llvm/Support/MathExtras.h
+++ b/include/llvm/Support/MathExtras.h
@@ -4,8 +4,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef SUPPORT_MATH_EXTRAS_H
-#define SUPPORT_MATH_EXTRAS_H
+#ifndef SUPPORT_MATHEXTRAS_H
+#define SUPPORT_MATHEXTRAS_H
#include "Support/DataTypes.h"
diff --git a/include/llvm/Support/TypeInfo.h b/include/llvm/Support/TypeInfo.h
index 29f4e22a99..9884f65e69 100644
--- a/include/llvm/Support/TypeInfo.h
+++ b/include/llvm/Support/TypeInfo.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_TYPEINFO_H
-#define LLVM_SUPPORT_TYPEINFO_H
+#ifndef SUPPORT_TYPEINFO_H
+#define SUPPORT_TYPEINFO_H
#include <typeinfo>