make endif guard naming consistent

72 files changed, 72 insertions, 77 deletions

diff --git a/include/expr/Lexer.h b/include/expr/Lexer.h
index 75dde388..14ae7f85 100644
--- a/include/expr/Lexer.h
+++ b/include/expr/Lexer.h
@@ -118,4 +118,4 @@ namespace expr {
 }
 }
 
-#endif
+#endif /* KLEE_LEXER_H */
diff --git a/include/expr/Parser.h b/include/expr/Parser.h
index 20e6047f..6a34b8d0 100644
--- a/include/expr/Parser.h
+++ b/include/expr/Parser.h
@@ -234,4 +234,4 @@ namespace expr {
 }
 }
 
-#endif
+#endif /* KLEE_PARSER_H */
diff --git a/include/klee/Common.h b/include/klee/Common.h
index 5f0f0e1d..611b137c 100644
--- a/include/klee/Common.h
+++ b/include/klee/Common.h
@@ -13,6 +13,7 @@
 
 #ifndef KLEE_COMMON_H
 #define KLEE_COMMON_H
+
 #include "klee/Solver.h"
 #include <string>
 
@@ -32,4 +33,3 @@ namespace klee {
 
 
 #endif /* KLEE_COMMON_H */
-
diff --git a/include/klee/Config/CompileTimeInfo.h.cmin b/include/klee/Config/CompileTimeInfo.h.cmin
index aa24b5e5..7714550b 100644
--- a/include/klee/Config/CompileTimeInfo.h.cmin
+++ b/include/klee/Config/CompileTimeInfo.h.cmin
@@ -14,4 +14,4 @@
 #define KLEE_BUILD_MODE "@CMAKE_BUILD_TYPE@ (Asserts: @ENABLE_KLEE_ASSERTS@)"
 #define KLEE_BUILD_REVISION "@KLEE_GIT_SHA1HASH@"
 
-#endif
+#endif /* KLEE_COMPILETIMEINFO_H */
diff --git a/include/klee/Config/Version.h b/include/klee/Config/Version.h
index a283b8c4..0e7b75e3 100644
--- a/include/klee/Config/Version.h
+++ b/include/klee/Config/Version.h
@@ -27,4 +27,4 @@
 #  define KLEE_LLVM_GOIF_TERMINATOR , NULL
 #endif
 
-#endif
+#endif /* KLEE_VERSION_H */
diff --git a/include/klee/Config/config.h.cmin b/include/klee/Config/config.h.cmin
index 04a8df3b..4c25c075 100644
--- a/include/klee/Config/config.h.cmin
+++ b/include/klee/Config/config.h.cmin
@@ -107,4 +107,4 @@ macro for that. That would simplify the C++ code.  */
 /* Install directory for KLEE runtime */
 #define KLEE_INSTALL_RUNTIME_DIR "@KLEE_INSTALL_RUNTIME_DIR@"
 
-#endif
+#endif /* KLEE_CONFIG_H */
diff --git a/include/klee/ExecutionState.h b/include/klee/ExecutionState.h
index 066ba539..e2c6bffe 100644
--- a/include/klee/ExecutionState.h
+++ b/include/klee/ExecutionState.h
@@ -174,4 +174,4 @@ public:
 };
 }
 
-#endif
+#endif /* KLEE_EXECUTIONSTATE_H */
diff --git a/include/klee/Expr.h b/include/klee/Expr.h
index cdc8474a..d4e4f7fa 100644
--- a/include/klee/Expr.h
+++ b/include/klee/Expr.h
@@ -1171,4 +1171,4 @@ inline bool Expr::isFalse() const {
 
 } // End klee namespace
 
-#endif
+#endif /* KLEE_EXPR_H */
diff --git a/include/klee/ExprBuilder.h b/include/klee/ExprBuilder.h
index 0caed07b..4a2c5cf4 100644
--- a/include/klee/ExprBuilder.h
+++ b/include/klee/ExprBuilder.h
@@ -88,4 +88,4 @@ namespace klee {
   ExprBuilder *createSimplifyingExprBuilder(ExprBuilder *Base);
 }
 
-#endif
+#endif /* KLEE_EXPRBUILDER_H */
diff --git a/include/klee/IncompleteSolver.h b/include/klee/IncompleteSolver.h
index 25b6cc68..6511584e 100644
--- a/include/klee/IncompleteSolver.h
+++ b/include/klee/IncompleteSolver.h
@@ -108,4 +108,4 @@ public:
 
 }
 
-#endif
+#endif /* KLEE_INCOMPLETESOLVER_H */
diff --git a/include/klee/Internal/ADT/ImmutableMap.h b/include/klee/Internal/ADT/ImmutableMap.h
index cd0990ae..a7a18a89 100644
--- a/include/klee/Internal/ADT/ImmutableMap.h
+++ b/include/klee/Internal/ADT/ImmutableMap.h
@@ -101,4 +101,4 @@ namespace klee {
 
 }
 
-#endif
+#endif /* KLEE_IMMUTABLEMAP_H */
diff --git a/include/klee/Internal/ADT/ImmutableSet.h b/include/klee/Internal/ADT/ImmutableSet.h
index 3c27ede0..1618e559 100644
--- a/include/klee/Internal/ADT/ImmutableSet.h
+++ b/include/klee/Internal/ADT/ImmutableSet.h
@@ -98,4 +98,4 @@ namespace klee {
 
 }
 
-#endif
+#endif /* KLEE_IMMUTABLESET_H */
diff --git a/include/klee/Internal/ADT/ImmutableTree.h b/include/klee/Internal/ADT/ImmutableTree.h
index 7ea81832..ada3c211 100644
--- a/include/klee/Internal/ADT/ImmutableTree.h
+++ b/include/klee/Internal/ADT/ImmutableTree.h
@@ -617,4 +617,4 @@ namespace klee {
 
 }
 
-#endif
+#endif /* KLEE_IMMUTABLETREE_H */
diff --git a/include/klee/Internal/ADT/KTest.h b/include/klee/Internal/ADT/KTest.h
index b77ffac5..5b5c45ef 100644
--- a/include/klee/Internal/ADT/KTest.h
+++ b/include/klee/Internal/ADT/KTest.h
@@ -10,7 +10,6 @@
 #ifndef KLEE_KTEST_H
 #define KLEE_KTEST_H
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -59,4 +58,4 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* KLEE_KTEST_H */
diff --git a/include/klee/Internal/ADT/MapOfSets.h b/include/klee/Internal/ADT/MapOfSets.h
index fe635f07..b30934d8 100644
--- a/include/klee/Internal/ADT/MapOfSets.h
+++ b/include/klee/Internal/ADT/MapOfSets.h
@@ -381,4 +381,4 @@ namespace klee {
 
 }
 
-#endif
+#endif /* KLEE_MAPOFSETS_H */
diff --git a/include/klee/Internal/ADT/RNG.h b/include/klee/Internal/ADT/RNG.h
index 1da1befa..5ea375b5 100644
--- a/include/klee/Internal/ADT/RNG.h
+++ b/include/klee/Internal/ADT/RNG.h
@@ -47,4 +47,4 @@ namespace klee {
   };
 }
 
-#endif
+#endif /* KLEE_RNG_H */
diff --git a/include/klee/Internal/ADT/TreeStream.h b/include/klee/Internal/ADT/TreeStream.h
index 0b8b17dc..32c856c9 100644
--- a/include/klee/Internal/ADT/TreeStream.h
+++ b/include/klee/Internal/ADT/TreeStream.h
@@ -73,4 +73,4 @@ namespace klee {
   };
 }
 
-#endif
+#endif /* KLEE_TREESTREAM_H */
diff --git a/include/klee/Internal/Module/Cell.h b/include/klee/Internal/Module/Cell.h
index f54cd6eb..691c1c89 100644
--- a/include/klee/Internal/Module/Cell.h
+++ b/include/klee/Internal/Module/Cell.h
@@ -20,4 +20,4 @@ namespace klee {
   };
 }
 
-#endif
+#endif /* KLEE_CELL_H */
diff --git a/include/klee/Internal/Module/InstructionInfoTable.h b/include/klee/Internal/Module/InstructionInfoTable.h
index ebf04b5b..e3684802 100644
--- a/include/klee/Internal/Module/InstructionInfoTable.h
+++ b/include/klee/Internal/Module/InstructionInfoTable.h
@@ -74,4 +74,4 @@ namespace klee {
 
 }
 
-#endif
+#endif /* KLEE_INSTRUCTIONINFOTABLE_H */
diff --git a/include/klee/Internal/Module/KInstIterator.h b/include/klee/Internal/Module/KInstIterator.h
index 736c4b4d..e5bd37f8 100644
--- a/include/klee/Internal/Module/KInstIterator.h
+++ b/include/klee/Internal/Module/KInstIterator.h
@@ -39,4 +39,4 @@ namespace klee {
   };
 } // End klee namespace
 
-#endif
+#endif /* KLEE_KINSTITERATOR_H */
diff --git a/include/klee/Internal/Module/KInstruction.h b/include/klee/Internal/Module/KInstruction.h
index 31720430..d641b4e3 100644
--- a/include/klee/Internal/Module/KInstruction.h
+++ b/include/klee/Internal/Module/KInstruction.h
@@ -61,5 +61,4 @@ namespace klee {
   };
 }
 
-#endif
-
+#endif /* KLEE_KINSTRUCTION_H */
diff --git a/include/klee/Internal/Module/KModule.h b/include/klee/Internal/Module/KModule.h
index db50f06e..89606e2e 100644
--- a/include/klee/Internal/Module/KModule.h
+++ b/include/klee/Internal/Module/KModule.h
@@ -150,4 +150,4 @@ namespace klee {
   };
 } // End klee namespace
 
-#endif
+#endif /* KLEE_KMODULE_H */
diff --git a/include/klee/Internal/Support/Debug.h b/include/klee/Internal/Support/Debug.h
index 4510a889..0fe7906a 100644
--- a/include/klee/Internal/Support/Debug.h
+++ b/include/klee/Internal/Support/Debug.h
@@ -24,4 +24,4 @@
 #endif
 #define KLEE_DEBUG(X) KLEE_DEBUG_WITH_TYPE(DEBUG_TYPE, X)
 
-#endif
+#endif /* KLEE_DEBUG_H */
diff --git a/include/klee/Internal/Support/IntEvaluation.h b/include/klee/Internal/Support/IntEvaluation.h
index e6692ecf..27a8daf0 100644
--- a/include/klee/Internal/Support/IntEvaluation.h
+++ b/include/klee/Internal/Support/IntEvaluation.h
@@ -161,4 +161,4 @@ inline uint64_t sge(uint64_t l, uint64_t r, unsigned inWidth) {
 } // end namespace ints
 } // end namespace klee
 
-#endif 
+#endif /* KLEE_INTEVALUATION_H */
diff --git a/include/klee/Internal/Support/ModuleUtil.h b/include/klee/Internal/Support/ModuleUtil.h
index 1f114014..e80fc673 100644
--- a/include/klee/Internal/Support/ModuleUtil.h
+++ b/include/klee/Internal/Support/ModuleUtil.h
@@ -67,4 +67,4 @@ bool loadFile(const std::string &libraryName, llvm::LLVMContext &context,
               std::string &errorMsg);
 }
 
-#endif
+#endif /* KLEE_MODULEUTIL_H */
diff --git a/include/klee/Internal/Support/PrintVersion.h b/include/klee/Internal/Support/PrintVersion.h
index 65d008c7..750eb133 100644
--- a/include/klee/Internal/Support/PrintVersion.h
+++ b/include/klee/Internal/Support/PrintVersion.h
@@ -22,4 +22,4 @@ namespace klee {
 #endif
 }
 
-#endif
+#endif /* KLEE_PRINTVERSION_H */
diff --git a/include/klee/Internal/Support/Timer.h b/include/klee/Internal/Support/Timer.h
index 4cbd3f68..65079a06 100644
--- a/include/klee/Internal/Support/Timer.h
+++ b/include/klee/Internal/Support/Timer.h
@@ -24,5 +24,4 @@ namespace klee {
   };
 }
 
-#endif
-
+#endif /* KLEE_TIMER_H */
diff --git a/include/klee/Internal/System/MemoryUsage.h b/include/klee/Internal/System/MemoryUsage.h
index 98b1fa3e..c3cf3c74 100644
--- a/include/klee/Internal/System/MemoryUsage.h
+++ b/include/klee/Internal/System/MemoryUsage.h
@@ -18,4 +18,4 @@ namespace klee {
   }
 }
 
-#endif
+#endif /* KLEE_MEMORYUSAGE_H */
diff --git a/include/klee/Internal/System/Time.h b/include/klee/Internal/System/Time.h
index 050f7a66..2ebebdfd 100644
--- a/include/klee/Internal/System/Time.h
+++ b/include/klee/Internal/System/Time.h
@@ -117,4 +117,4 @@ namespace klee {
   } // time
 } // klee
 
-#endif
+#endif /* KLEE_TIME_H */
diff --git a/include/klee/Interpreter.h b/include/klee/Interpreter.h
index a88814c9..de64030d 100644
--- a/include/klee/Interpreter.h
+++ b/include/klee/Interpreter.h
@@ -164,4 +164,4 @@ public:
 
 } // End klee namespace
 
-#endif
+#endif /* KLEE_INTERPRETER_H */
diff --git a/include/klee/OptionCategories.h b/include/klee/OptionCategories.h
index 569ddcb3..4fb7e5cb 100644
--- a/include/klee/OptionCategories.h
+++ b/include/klee/OptionCategories.h
@@ -26,4 +26,4 @@ namespace klee {
   extern llvm::cl::OptionCategory TestGenCat;
 }
 
-#endif
+#endif /* KLEE_OPTIONCATEGORIES_H */
diff --git a/include/klee/Solver.h b/include/klee/Solver.h
index 1aaf555d..476fb732 100644
--- a/include/klee/Solver.h
+++ b/include/klee/Solver.h
@@ -270,4 +270,4 @@ namespace klee {
   Solver *createCoreSolver(CoreSolverType cst);
 }
 
-#endif
+#endif /* KLEE_SOLVER_H */
diff --git a/include/klee/SolverImpl.h b/include/klee/SolverImpl.h
index e1b1f3d2..90d5af24 100644
--- a/include/klee/SolverImpl.h
+++ b/include/klee/SolverImpl.h
@@ -111,4 +111,4 @@ namespace klee {
 
 }
 
-#endif
+#endif /* KLEE_SOLVERIMPL_H */
diff --git a/include/klee/SolverStats.h b/include/klee/SolverStats.h
index 3f68b620..dd39043a 100644
--- a/include/klee/SolverStats.h
+++ b/include/klee/SolverStats.h
@@ -35,4 +35,4 @@ namespace stats {
 }
 }
 
-#endif
+#endif /* KLEE_SOLVERSTATS_H */
diff --git a/include/klee/Statistic.h b/include/klee/Statistic.h
index 6b8fb165..6adefdad 100644
--- a/include/klee/Statistic.h
+++ b/include/klee/Statistic.h
@@ -63,5 +63,4 @@ namespace klee {
   };
 }
 
-#endif
-
+#endif /* KLEE_STATISTIC_H */
diff --git a/include/klee/Statistics.h b/include/klee/Statistics.h
index 20ab2528..158459cc 100644
--- a/include/klee/Statistics.h
+++ b/include/klee/Statistics.h
@@ -151,4 +151,4 @@ namespace klee {
   }
 }
 
-#endif
+#endif /* KLEE_STATISTICS_H */
diff --git a/include/klee/TimerStatIncrementer.h b/include/klee/TimerStatIncrementer.h
index 483d161a..f494b9d1 100644
--- a/include/klee/TimerStatIncrementer.h
+++ b/include/klee/TimerStatIncrementer.h
@@ -30,4 +30,4 @@ namespace klee {
   };
 }
 
-#endif
+#endif /* KLEE_TIMERSTATINCREMENTER_H */
diff --git a/include/klee/util/ArrayExprHash.h b/include/klee/util/ArrayExprHash.h
index 43c391f5..05cb8692 100644
--- a/include/klee/util/ArrayExprHash.h
+++ b/include/klee/util/ArrayExprHash.h
@@ -136,4 +136,4 @@ void ArrayExprHash<T>::hashUpdateNodeExpr(const UpdateNode* un, T& exp)
 #undef unordered_map
 #undef unordered_set
 
-#endif
+#endif /* KLEE_ARRAYEXPRHASH_H */
diff --git a/include/klee/util/BitArray.h b/include/klee/util/BitArray.h
index caa3739e..029e130f 100644
--- a/include/klee/util/BitArray.h
+++ b/include/klee/util/BitArray.h
@@ -39,4 +39,4 @@ public:
 
 } // End klee namespace
 
-#endif
+#endif /* KLEE_BITARRAY_H */
diff --git a/include/klee/util/Bits.h b/include/klee/util/Bits.h
index bd67a501..5f64e244 100644
--- a/include/klee/util/Bits.h
+++ b/include/klee/util/Bits.h
@@ -111,4 +111,4 @@ namespace klee {
   }
 } // End klee namespace
 
-#endif
+#endif /* KLEE_BITS_H */
diff --git a/include/klee/util/ExprEvaluator.h b/include/klee/util/ExprEvaluator.h
index 313ac0a5..ed366f77 100644
--- a/include/klee/util/ExprEvaluator.h
+++ b/include/klee/util/ExprEvaluator.h
@@ -39,4 +39,4 @@ namespace klee {
   };
 }
 
-#endif
+#endif /* KLEE_EXPREVALUATOR_H */
diff --git a/include/klee/util/ExprHashMap.h b/include/klee/util/ExprHashMap.h
index 88086e7c..6477b7c9 100644
--- a/include/klee/util/ExprHashMap.h
+++ b/include/klee/util/ExprHashMap.h
@@ -59,4 +59,4 @@ namespace klee {
 #undef unordered_map
 #undef unordered_set
 
-#endif
+#endif /* KLEE_EXPRHASHMAP_H */
diff --git a/include/klee/util/ExprPPrinter.h b/include/klee/util/ExprPPrinter.h
index 622b0e80..f2537750 100644
--- a/include/klee/util/ExprPPrinter.h
+++ b/include/klee/util/ExprPPrinter.h
@@ -75,4 +75,4 @@ namespace klee {
 
 }
 
-#endif
+#endif /* KLEE_EXPRPPRINTER_H */
diff --git a/include/klee/util/ExprRangeEvaluator.h b/include/klee/util/ExprRangeEvaluator.h
index fea30b5b..b3011827 100644
--- a/include/klee/util/ExprRangeEvaluator.h
+++ b/include/klee/util/ExprRangeEvaluator.h
@@ -282,4 +282,4 @@ T ExprRangeEvaluator<T>::evaluate(const ref<Expr> &e) {
 
 }
 
-#endif
+#endif /* KLEE_EXPRRANGEEVALUATOR_H */
diff --git a/include/klee/util/ExprSMTLIBPrinter.h b/include/klee/util/ExprSMTLIBPrinter.h
index e90a49f1..cf5df1c5 100644
--- a/include/klee/util/ExprSMTLIBPrinter.h
+++ b/include/klee/util/ExprSMTLIBPrinter.h
@@ -383,4 +383,4 @@ private:
 };
 }
 
-#endif
+#endif /* KLEE_EXPRSMTLIBPRINTER_H */
diff --git a/include/klee/util/ExprUtil.h b/include/klee/util/ExprUtil.h
index 0860d0a5..88db15f0 100644
--- a/include/klee/util/ExprUtil.h
+++ b/include/klee/util/ExprUtil.h
@@ -48,4 +48,4 @@ namespace klee {
   };
 }
 
-#endif
+#endif /* KLEE_EXPRUTIL_H */
diff --git a/include/klee/util/ExprVisitor.h b/include/klee/util/ExprVisitor.h
index 1fae4505..03d4d77d 100644
--- a/include/klee/util/ExprVisitor.h
+++ b/include/klee/util/ExprVisitor.h
@@ -95,4 +95,4 @@ namespace klee {
 
 }
 
-#endif
+#endif /* KLEE_EXPRVISITOR_H */
diff --git a/include/klee/util/GetElementPtrTypeIterator.h b/include/klee/util/GetElementPtrTypeIterator.h
index b46d80cb..dfef1cfd 100644
--- a/include/klee/util/GetElementPtrTypeIterator.h
+++ b/include/klee/util/GetElementPtrTypeIterator.h
@@ -151,4 +151,4 @@ class generic_gep_type_iterator
   }
 } // end namespace klee
 
-#endif
+#endif /* KLEE_GETELEMENTPTRTYPEITERATOR_H */
diff --git a/lib/Core/AddressSpace.h b/lib/Core/AddressSpace.h
index 2554a5b1..d8ba6f36 100644
--- a/lib/Core/AddressSpace.h
+++ b/lib/Core/AddressSpace.h
@@ -148,4 +148,4 @@ namespace klee {
   };
 } // End klee namespace
 
-#endif
+#endif /* KLEE_ADDRESSSPACE_H */
diff --git a/lib/Core/CallPathManager.h b/lib/Core/CallPathManager.h
index a39bc387..d78c8d8f 100644
--- a/lib/Core/CallPathManager.h
+++ b/lib/Core/CallPathManager.h
@@ -83,4 +83,4 @@ namespace klee {
   };
 }
 
-#endif
+#endif /* KLEE_CALLPATHMANAGER_H */
diff --git a/lib/Core/Context.h b/lib/Core/Context.h
index e8b48363..b2ea83f1 100644
--- a/lib/Core/Context.h
+++ b/lib/Core/Context.h
@@ -43,4 +43,4 @@ namespace klee {
   
 } // End klee namespace
 
-#endif
+#endif /* KLEE_CONTEXT_H */
diff --git a/lib/Core/CoreStats.h b/lib/Core/CoreStats.h
index 09845a89..42e81de7 100644
--- a/lib/Core/CoreStats.h
+++ b/lib/Core/CoreStats.h
@@ -50,4 +50,4 @@ namespace stats {
 }
 }
 
-#endif
+#endif /* KLEE_CORESTATS_H */
diff --git a/lib/Core/Executor.h b/lib/Core/Executor.h
index 66a28ba8..eafdc2f7 100644
--- a/lib/Core/Executor.h
+++ b/lib/Core/Executor.h
@@ -551,4 +551,4 @@ public:
   
 } // End klee namespace
 
-#endif
+#endif /* KLEE_EXECUTOR_H */
diff --git a/lib/Core/ExternalDispatcher.h b/lib/Core/ExternalDispatcher.h
index 7c3a1d79..7730ac4e 100644
--- a/lib/Core/ExternalDispatcher.h
+++ b/lib/Core/ExternalDispatcher.h
@@ -46,4 +46,4 @@ public:
 };
 }
 
-#endif
+#endif /* KLEE_EXTERNALDISPATCHER_H */
diff --git a/lib/Core/ImpliedValue.h b/lib/Core/ImpliedValue.h
index 6bdb6c66..2b323c01 100644
--- a/lib/Core/ImpliedValue.h
+++ b/lib/Core/ImpliedValue.h
@@ -38,4 +38,4 @@ namespace klee {
 
 }
 
-#endif
+#endif /* KLEE_IMPLIEDVALUE_H */
diff --git a/lib/Core/Memory.h b/lib/Core/Memory.h
index 47dd892a..3558c96c 100644
--- a/lib/Core/Memory.h
+++ b/lib/Core/Memory.h
@@ -246,4 +246,4 @@ private:
   
 } // End klee namespace
 
-#endif
+#endif /* KLEE_MEMORY_H */
diff --git a/lib/Core/MemoryManager.h b/lib/Core/MemoryManager.h
index d7233a80..f75c82fb 100644
--- a/lib/Core/MemoryManager.h
+++ b/lib/Core/MemoryManager.h
@@ -56,4 +56,4 @@ public:
 
 } // End klee namespace
 
-#endif
+#endif /* KLEE_MEMORYMANAGER_H */
diff --git a/lib/Core/ObjectHolder.h b/lib/Core/ObjectHolder.h
index abf2c6f0..cd6c6281 100644
--- a/lib/Core/ObjectHolder.h
+++ b/lib/Core/ObjectHolder.h
@@ -29,5 +29,4 @@ namespace klee {
   };
 }
 
-#endif
-
+#endif /* KLEE_OBJECTHOLDER_H */
diff --git a/lib/Core/PTree.h b/lib/Core/PTree.h
index b15987d5..b13b1d67 100644
--- a/lib/Core/PTree.h
+++ b/lib/Core/PTree.h
@@ -47,4 +47,4 @@ namespace klee {
   };
 }
 
-#endif
+#endif /* KLEE_PTREE_H */
diff --git a/lib/Core/Searcher.h b/lib/Core/Searcher.h
index dc0e12a4..c11c6be5 100644
--- a/lib/Core/Searcher.h
+++ b/lib/Core/Searcher.h
@@ -285,4 +285,4 @@ namespace klee {
 
 }
 
-#endif
+#endif /* KLEE_SEARCHER_H */
diff --git a/lib/Core/SeedInfo.h b/lib/Core/SeedInfo.h
index 1820ef23..0d2b6ae0 100644
--- a/lib/Core/SeedInfo.h
+++ b/lib/Core/SeedInfo.h
@@ -46,4 +46,4 @@ namespace klee {
   };
 }
 
-#endif
+#endif /* KLEE_SEEDINFO_H */
diff --git a/lib/Core/SpecialFunctionHandler.h b/lib/Core/SpecialFunctionHandler.h
index e041a3e4..0ad04049 100644
--- a/lib/Core/SpecialFunctionHandler.h
+++ b/lib/Core/SpecialFunctionHandler.h
@@ -146,4 +146,4 @@ namespace klee {
   };
 } // End klee namespace
 
-#endif
+#endif /* KLEE_SPECIALFUNCTIONHANDLER_H */
diff --git a/lib/Core/StatsTracker.h b/lib/Core/StatsTracker.h
index 1c4ad6d9..98041464 100644
--- a/lib/Core/StatsTracker.h
+++ b/lib/Core/StatsTracker.h
@@ -105,4 +105,4 @@ namespace klee {
 
 }
 
-#endif
+#endif /* KLEE_STATSTRACKER_H */
diff --git a/lib/Core/TimingSolver.h b/lib/Core/TimingSolver.h
index 08ed0de2..6951a3ad 100644
--- a/lib/Core/TimingSolver.h
+++ b/lib/Core/TimingSolver.h
@@ -70,4 +70,4 @@ namespace klee {
 
 }
 
-#endif
+#endif /* KLEE_TIMINGSOLVER_H */
diff --git a/lib/Core/UserSearcher.h b/lib/Core/UserSearcher.h
index 1c04581d..b0df8239 100644
--- a/lib/Core/UserSearcher.h
+++ b/lib/Core/UserSearcher.h
@@ -22,4 +22,4 @@ namespace klee {
   Searcher *constructUserSearcher(Executor &executor);
 }
 
-#endif
+#endif /* KLEE_USERSEARCHER_H */
diff --git a/lib/Expr/ArrayExprOptimizer.h b/lib/Expr/ArrayExprOptimizer.h
index 25a0c2bb..8f6472a4 100644
--- a/lib/Expr/ArrayExprOptimizer.h
+++ b/lib/Expr/ArrayExprOptimizer.h
@@ -61,4 +61,4 @@ private:
 };
 } // namespace klee
 
-#endif
+#endif /* KLEE_ARRAYEXPROPTIMIZER_H */
diff --git a/lib/Expr/ArrayExprVisitor.h b/lib/Expr/ArrayExprVisitor.h
index 6b79ae8a..bfa75478 100644
--- a/lib/Expr/ArrayExprVisitor.h
+++ b/lib/Expr/ArrayExprVisitor.h
@@ -140,4 +140,4 @@ public:
 };
 } // namespace klee
 
-#endif
+#endif /* KLEE_ARRAYEXPRVISITOR_H */
diff --git a/lib/Expr/AssignmentGenerator.h b/lib/Expr/AssignmentGenerator.h
index fea1168a..3bd940e7 100644
--- a/lib/Expr/AssignmentGenerator.h
+++ b/lib/Expr/AssignmentGenerator.h
@@ -56,4 +56,4 @@ private:
 };
 } // namespace klee
 
-#endif
+#endif /* KLEE_ASSIGNMENTGENERATOR_H */
diff --git a/lib/Module/Passes.h b/lib/Module/Passes.h
index 4fb0cfd7..ae1ce6fd 100644
--- a/lib/Module/Passes.h
+++ b/lib/Module/Passes.h
@@ -206,4 +206,4 @@ public:
 };
 } // namespace klee
 
-#endif
+#endif /* KLEE_PASSES_H */
diff --git a/lib/Solver/ConstantDivision.h b/lib/Solver/ConstantDivision.h
index 3b3a2799..23d61740 100644
--- a/lib/Solver/ConstantDivision.h
+++ b/lib/Solver/ConstantDivision.h
@@ -48,4 +48,4 @@ void ComputeSDivConstants32(int32_t d, int32_t &mprime, int32_t &dsign,
 
 }
 
-#endif
+#endif /* KLEE_CONSTANTDIVISION_H */
diff --git a/lib/Solver/STPBuilder.h b/lib/Solver/STPBuilder.h
index f4b2ffc6..cb163384 100644
--- a/lib/Solver/STPBuilder.h
+++ b/lib/Solver/STPBuilder.h
@@ -128,4 +128,4 @@ public:
 
 }
 
-#endif
+#endif /* KLEE_STPBUILDER_H */
diff --git a/lib/Solver/Z3Builder.h b/lib/Solver/Z3Builder.h
index 7057176e..efbf4f9a 100644
--- a/lib/Solver/Z3Builder.h
+++ b/lib/Solver/Z3Builder.h
@@ -190,4 +190,4 @@ public:
 };
 }
 
-#endif
+#endif /* KLEE_Z3BUILDER_H */