make include guard naming consistent

22 files changed, 50 insertions, 50 deletions

diff --git a/include/expr/Lexer.h b/include/expr/Lexer.h
index 290d59eb..75dde388 100644
--- a/include/expr/Lexer.h
+++ b/include/expr/Lexer.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_EXPR_LEXER_H
-#define KLEE_EXPR_LEXER_H
+#ifndef KLEE_LEXER_H
+#define KLEE_LEXER_H
 
 #include <string>
 
diff --git a/include/expr/Parser.h b/include/expr/Parser.h
index fa07bae2..20e6047f 100644
--- a/include/expr/Parser.h
+++ b/include/expr/Parser.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_EXPR_PARSER_H
-#define KLEE_EXPR_PARSER_H
+#ifndef KLEE_PARSER_H
+#define KLEE_PARSER_H
 
 #include "klee/Expr.h"
 
diff --git a/include/klee/Config/CompileTimeInfo.h.cmin b/include/klee/Config/CompileTimeInfo.h.cmin
index 6f13537a..aa24b5e5 100644
--- a/include/klee/Config/CompileTimeInfo.h.cmin
+++ b/include/klee/Config/CompileTimeInfo.h.cmin
@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 // @AUTO_GEN_MSG@
-#ifndef KLEE_COMPILE_TIME_INFO_H
-#define KLEE_COMPILE_TIME_INFO_H
+#ifndef KLEE_COMPILETIMEINFO_H
+#define KLEE_COMPILETIMEINFO_H
 
 #define KLEE_BUILD_MODE "@CMAKE_BUILD_TYPE@ (Asserts: @ENABLE_KLEE_ASSERTS@)"
 #define KLEE_BUILD_REVISION "@KLEE_GIT_SHA1HASH@"
diff --git a/include/klee/Config/Version.h b/include/klee/Config/Version.h
index ac889373..a283b8c4 100644
--- a/include/klee/Config/Version.h
+++ b/include/klee/Config/Version.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_CONFIG_VERSION_H
-#define KLEE_CONFIG_VERSION_H
+#ifndef KLEE_VERSION_H
+#define KLEE_VERSION_H
 
 #include "klee/Config/config.h"
 
diff --git a/include/klee/Config/config.h.cmin b/include/klee/Config/config.h.cmin
index 24776bdb..04a8df3b 100644
--- a/include/klee/Config/config.h.cmin
+++ b/include/klee/Config/config.h.cmin
@@ -1,5 +1,5 @@
-#ifndef KLEE_CONFIG_CONFIG_H
-#define KLEE_CONFIG_CONFIG_H
+#ifndef KLEE_CONFIG_H
+#define KLEE_CONFIG_H
 
 /* Enable KLEE DEBUG checks */
 #cmakedefine ENABLE_KLEE_DEBUG @ENABLE_KLEE_DEBUG@
diff --git a/include/klee/Internal/ADT/RNG.h b/include/klee/Internal/ADT/RNG.h
index b7f4906b..1da1befa 100644
--- a/include/klee/Internal/ADT/RNG.h
+++ b/include/klee/Internal/ADT/RNG.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_UTIL_RNG_H
-#define KLEE_UTIL_RNG_H
+#ifndef KLEE_RNG_H
+#define KLEE_RNG_H
 
 namespace klee {
   class RNG {
diff --git a/include/klee/Internal/Module/InstructionInfoTable.h b/include/klee/Internal/Module/InstructionInfoTable.h
index 4c9c19b1..ebf04b5b 100644
--- a/include/klee/Internal/Module/InstructionInfoTable.h
+++ b/include/klee/Internal/Module/InstructionInfoTable.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_LIB_INSTRUCTIONINFOTABLE_H
-#define KLEE_LIB_INSTRUCTIONINFOTABLE_H
+#ifndef KLEE_INSTRUCTIONINFOTABLE_H
+#define KLEE_INSTRUCTIONINFOTABLE_H
 
 #include <memory>
 #include <string>
diff --git a/include/klee/Internal/Support/Debug.h b/include/klee/Internal/Support/Debug.h
index 59a80409..4510a889 100644
--- a/include/klee/Internal/Support/Debug.h
+++ b/include/klee/Internal/Support/Debug.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_INTERNAL_SUPPORT_DEBUG_H
-#define KLEE_INTERNAL_SUPPORT_DEBUG_H
+#ifndef KLEE_DEBUG_H
+#define KLEE_DEBUG_H
 
 #include "klee/Config/config.h"
 #include "llvm/Support/Debug.h"
diff --git a/include/klee/Internal/Support/ErrorHandling.h b/include/klee/Internal/Support/ErrorHandling.h
index 1fb29935..92762c03 100644
--- a/include/klee/Internal/Support/ErrorHandling.h
+++ b/include/klee/Internal/Support/ErrorHandling.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_ERROR_HANDLING_H
-#define KLEE_ERROR_HANDLING_H
+#ifndef KLEE_ERRORHANDLING_H
+#define KLEE_ERRORHANDLING_H
 
 #ifdef __CYGWIN__
 #ifndef WINDOWS
@@ -48,4 +48,4 @@ void klee_warning_once(const void *id, const char *msg, ...)
     __attribute__((format(printf, 2, 3)));
 }
 
-#endif /* KLEE_ERROR_HANDLING_H */
+#endif /* KLEE_ERRORHANDLING_H */
diff --git a/include/klee/Internal/Support/FloatEvaluation.h b/include/klee/Internal/Support/FloatEvaluation.h
index 62a5c0e7..37392576 100644
--- a/include/klee/Internal/Support/FloatEvaluation.h
+++ b/include/klee/Internal/Support/FloatEvaluation.h
@@ -9,8 +9,8 @@
 
 // FIXME: Ditch this and use APFloat.
 
-#ifndef KLEE_UTIL_FLOATS_H
-#define KLEE_UTIL_FLOATS_H
+#ifndef KLEE_FLOATEVALUATION_H
+#define KLEE_FLOATEVALUATION_H
 
 #include "klee/util/Bits.h"     //bits64::truncateToNBits
 #include "IntEvaluation.h" //ints::sext
@@ -260,4 +260,4 @@ inline uint64_t SignedIntToFP( uint64_t l, unsigned outWidth, unsigned inWidth )
 } // end namespace ints
 } // end namespace klee
 
-#endif //KLEE_UTIL_FLOATS_H
+#endif /* KLEE_FLOATEVALUATION_H */
diff --git a/include/klee/Internal/Support/IntEvaluation.h b/include/klee/Internal/Support/IntEvaluation.h
index ed3ffc23..e6692ecf 100644
--- a/include/klee/Internal/Support/IntEvaluation.h
+++ b/include/klee/Internal/Support/IntEvaluation.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_UTIL_INTEVALUATION_H
-#define KLEE_UTIL_INTEVALUATION_H
+#ifndef KLEE_INTEVALUATION_H
+#define KLEE_INTEVALUATION_H
 
 #include "klee/util/Bits.h"
 
diff --git a/include/klee/Internal/Support/ModuleUtil.h b/include/klee/Internal/Support/ModuleUtil.h
index 5fbfdb76..1f114014 100644
--- a/include/klee/Internal/Support/ModuleUtil.h
+++ b/include/klee/Internal/Support/ModuleUtil.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_MODULE_UTIL_H
-#define KLEE_MODULE_UTIL_H
+#ifndef KLEE_MODULEUTIL_H
+#define KLEE_MODULEUTIL_H
 
 #include "klee/Config/Version.h"
 
diff --git a/include/klee/Internal/Support/PrintVersion.h b/include/klee/Internal/Support/PrintVersion.h
index 87f73a00..65d008c7 100644
--- a/include/klee/Internal/Support/PrintVersion.h
+++ b/include/klee/Internal/Support/PrintVersion.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_PRINT_VERSION_H
-#define KLEE_PRINT_VERSION_H
+#ifndef KLEE_PRINTVERSION_H
+#define KLEE_PRINTVERSION_H
 
 #include "llvm/Support/raw_ostream.h"
 
diff --git a/include/klee/Internal/System/MemoryUsage.h b/include/klee/Internal/System/MemoryUsage.h
index e8e5d769..98b1fa3e 100644
--- a/include/klee/Internal/System/MemoryUsage.h
+++ b/include/klee/Internal/System/MemoryUsage.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_UTIL_MEMORYUSAGE_H
-#define KLEE_UTIL_MEMORYUSAGE_H
+#ifndef KLEE_MEMORYUSAGE_H
+#define KLEE_MEMORYUSAGE_H
 
 #include <cstddef>
 
diff --git a/include/klee/Internal/System/Time.h b/include/klee/Internal/System/Time.h
index f989e929..050f7a66 100644
--- a/include/klee/Internal/System/Time.h
+++ b/include/klee/Internal/System/Time.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_UTIL_TIME_H
-#define KLEE_UTIL_TIME_H
+#ifndef KLEE_TIME_H
+#define KLEE_TIME_H
 
 #include "llvm/Support/raw_ostream.h"
 
diff --git a/include/klee/SolverCmdLine.h b/include/klee/SolverCmdLine.h
index 8a0cc534..b453d058 100644
--- a/include/klee/SolverCmdLine.h
+++ b/include/klee/SolverCmdLine.h
@@ -12,8 +12,8 @@
  * that are common to both KLEE and Kleaver.
  */
 
-#ifndef KLEE_SOLVERCOMMANDLINE_H
-#define KLEE_SOLVERCOMMANDLINE_H
+#ifndef KLEE_SOLVERCMDLINE_H
+#define KLEE_SOLVERCMDLINE_H
 
 #include "klee/Config/config.h"
 
@@ -90,4 +90,4 @@ public:
 };
 } // namespace klee
 
-#endif /* KLEE_SOLVERCOMMANDLINE_H */
+#endif /* KLEE_SOLVERCMDLINE_H */
diff --git a/include/klee/util/ArrayCache.h b/include/klee/util/ArrayCache.h
index 56d69df6..bec6e15a 100644
--- a/include/klee/util/ArrayCache.h
+++ b/include/klee/util/ArrayCache.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_ARRAY_CACHE_H
-#define KLEE_ARRAY_CACHE_H
+#ifndef KLEE_ARRAYCACHE_H
+#define KLEE_ARRAYCACHE_H
 
 #include "klee/Expr.h"
 #include "klee/util/ArrayExprHash.h" // For klee::ArrayHashFn
@@ -78,4 +78,4 @@ private:
 
 #undef unordered_set
 
-#endif /* KLEE_ARRAY_CACHE__H */
+#endif /* KLEE_ARRAYCACHE_H */
diff --git a/include/klee/util/Assignment.h b/include/klee/util/Assignment.h
index 55e681de..8d082791 100644
--- a/include/klee/util/Assignment.h
+++ b/include/klee/util/Assignment.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_UTIL_ASSIGNMENT_H
-#define KLEE_UTIL_ASSIGNMENT_H
+#ifndef KLEE_ASSIGNMENT_H
+#define KLEE_ASSIGNMENT_H
 
 #include <map>
 
@@ -98,4 +98,4 @@ namespace klee {
   }
 }
 
-#endif
+#endif /* KLEE_ASSIGNMENT_H */
diff --git a/include/klee/util/BitArray.h b/include/klee/util/BitArray.h
index 6f887600..caa3739e 100644
--- a/include/klee/util/BitArray.h
+++ b/include/klee/util/BitArray.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_UTIL_BITARRAY_H
-#define KLEE_UTIL_BITARRAY_H
+#ifndef KLEE_BITARRAY_H
+#define KLEE_BITARRAY_H
 
 namespace klee {
 
diff --git a/include/klee/util/Bits.h b/include/klee/util/Bits.h
index d56c7c21..bd67a501 100644
--- a/include/klee/util/Bits.h
+++ b/include/klee/util/Bits.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_UTIL_BITS_H
-#define KLEE_UTIL_BITS_H
+#ifndef KLEE_BITS_H
+#define KLEE_BITS_H
 
 #include "klee/Config/Version.h"
 #include "llvm/Support/DataTypes.h"
diff --git a/include/klee/util/GetElementPtrTypeIterator.h b/include/klee/util/GetElementPtrTypeIterator.h
index ce380bc0..b46d80cb 100644
--- a/include/klee/util/GetElementPtrTypeIterator.h
+++ b/include/klee/util/GetElementPtrTypeIterator.h
@@ -15,8 +15,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef KLEE_UTIL_GETELEMENTPTRTYPE_H
-#define KLEE_UTIL_GETELEMENTPTRTYPE_H
+#ifndef KLEE_GETELEMENTPTRTYPEITERATOR_H
+#define KLEE_GETELEMENTPTRTYPEITERATOR_H
 
 #include "llvm/IR/User.h"
 #include "llvm/IR/DerivedTypes.h"
diff --git a/include/klee/util/PrintContext.h b/include/klee/util/PrintContext.h
index a72af033..9deaa207 100644
--- a/include/klee/util/PrintContext.h
+++ b/include/klee/util/PrintContext.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef PRINTCONTEXT_H_
-#define PRINTCONTEXT_H_
+#ifndef KLEE_PRINTCONTEXT_H
+#define KLEE_PRINTCONTEXT_H
 
 #include "klee/Expr.h"
 #include "llvm/Support/raw_ostream.h"
@@ -97,4 +97,4 @@ public:
 };
 
 
-#endif /* PRINTCONTEXT_H_ */
+#endif /* KLEE_PRINTCONTEXT_H */