9 files changed, 20 insertions, 20 deletions
diff --git a/include/klee/Internal/ADT/ImmutableMap.h b/include/klee/Internal/ADT/ImmutableMap.h
index 3c408246..cd0990ae 100644
--- a/include/klee/Internal/ADT/ImmutableMap.h
+++ b/include/klee/Internal/ADT/ImmutableMap.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_IMMUTABLEMAP_H__
-#define __UTIL_IMMUTABLEMAP_H__
+#ifndef KLEE_IMMUTABLEMAP_H
+#define KLEE_IMMUTABLEMAP_H
 
 #include <functional>
 
diff --git a/include/klee/Internal/ADT/ImmutableSet.h b/include/klee/Internal/ADT/ImmutableSet.h
index e60a1d2a..3c27ede0 100644
--- a/include/klee/Internal/ADT/ImmutableSet.h
+++ b/include/klee/Internal/ADT/ImmutableSet.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_IMMUTABLESET_H__
-#define __UTIL_IMMUTABLESET_H__
+#ifndef KLEE_IMMUTABLESET_H
+#define KLEE_IMMUTABLESET_H
 
 #include <functional>
 
diff --git a/include/klee/Internal/ADT/ImmutableTree.h b/include/klee/Internal/ADT/ImmutableTree.h
index 4e6d530f..7ea81832 100644
--- a/include/klee/Internal/ADT/ImmutableTree.h
+++ b/include/klee/Internal/ADT/ImmutableTree.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_IMMUTABLETREE_H__
-#define __UTIL_IMMUTABLETREE_H__
+#ifndef KLEE_IMMUTABLETREE_H
+#define KLEE_IMMUTABLETREE_H
 
 #include <cassert>
 #include <vector>
diff --git a/include/klee/Internal/ADT/KTest.h b/include/klee/Internal/ADT/KTest.h
index c6586f9e..b77ffac5 100644
--- a/include/klee/Internal/ADT/KTest.h
+++ b/include/klee/Internal/ADT/KTest.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __COMMON_KTEST_H__
-#define __COMMON_KTEST_H__
+#ifndef KLEE_KTEST_H
+#define KLEE_KTEST_H
 
 
 #ifdef __cplusplus
diff --git a/include/klee/Internal/ADT/MapOfSets.h b/include/klee/Internal/ADT/MapOfSets.h
index a5acb059..fe635f07 100644
--- a/include/klee/Internal/ADT/MapOfSets.h
+++ b/include/klee/Internal/ADT/MapOfSets.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_MAPOFSETS_H__
-#define __UTIL_MAPOFSETS_H__
+#ifndef KLEE_MAPOFSETS_H
+#define KLEE_MAPOFSETS_H
 
 #include <cassert>
 #include <vector>
diff --git a/include/klee/Internal/ADT/TreeStream.h b/include/klee/Internal/ADT/TreeStream.h
index 1494aa76..0b8b17dc 100644
--- a/include/klee/Internal/ADT/TreeStream.h
+++ b/include/klee/Internal/ADT/TreeStream.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_TREESTREAM_H__
-#define __UTIL_TREESTREAM_H__
+#ifndef KLEE_TREESTREAM_H
+#define KLEE_TREESTREAM_H
 
 #include <string>
 #include <vector>
diff --git a/include/klee/Internal/Support/ErrorHandling.h b/include/klee/Internal/Support/ErrorHandling.h
index 29451692..1fb29935 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_ERROR_HANDLING_H
+#define KLEE_ERROR_HANDLING_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_ERROR_HANDLING_H */
diff --git a/include/klee/klee.h b/include/klee/klee.h
index 2446fc07..99fe15c7 100644
--- a/include/klee/klee.h
+++ b/include/klee/klee.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===*/
 
-#ifndef __KLEE_H__
-#define __KLEE_H__
+#ifndef KLEE_H
+#define KLEE_H
 
 #include "stdint.h"
 #include "stddef.h"
@@ -156,4 +156,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __KLEE_H__ */
+#endif /* KLEE_H */
diff --git a/include/klee/util/ArrayExprHash.h b/include/klee/util/ArrayExprHash.h
index e353881f..43c391f5 100644
--- a/include/klee/util/ArrayExprHash.h
+++ b/include/klee/util/ArrayExprHash.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_ARRAYEXPRHASH_H__
-#define __UTIL_ARRAYEXPRHASH_H__
+#ifndef KLEE_ARRAYEXPRHASH_H
+#define KLEE_ARRAYEXPRHASH_H
 
 #include "klee/Expr.h"
 #include "klee/TimerStatIncrementer.h"