Normalise all include guards.

Change-Id: Ia0ba7c7a3d013038f3c86b4ec5455d8e0a9dccb3
Reviewed-on: https://code-review.googlesource.com/5392
Reviewed-by: Paul Wankadia <junyer@google.com>
diff --git a/re2/filtered_re2.h b/re2/filtered_re2.h
index f4b2be4..1035a12 100644
--- a/re2/filtered_re2.h
+++ b/re2/filtered_re2.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef RE2_FILTERED_RE2_H_
+#define RE2_FILTERED_RE2_H_
+
 // The class FilteredRE2 is used as a wrapper to multiple RE2 regexps.
 // It provides a prefilter mechanism that helps in cutting down the
 // number of regexps that need to be actually searched.
@@ -18,9 +21,6 @@
 // indices of strings that were found in the text to get the actual
 // regexp matches.
 
-#ifndef RE2_FILTERED_RE2_H_
-#define RE2_FILTERED_RE2_H_
-
 #include <vector>
 #include "re2/re2.h"
 
diff --git a/re2/prefilter.h b/re2/prefilter.h
index 531c189..e58efe8 100644
--- a/re2/prefilter.h
+++ b/re2/prefilter.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef RE2_PREFILTER_H_
+#define RE2_PREFILTER_H_
+
 // Prefilter is the class used to extract string guards from regexps.
 // Rather than using Prefilter class directly, use FilteredRE2.
 // See filtered_re2.h
 
-#ifndef RE2_PREFILTER_H_
-#define RE2_PREFILTER_H_
-
 #include "util/util.h"
 
 namespace re2 {
diff --git a/re2/prefilter_tree.h b/re2/prefilter_tree.h
index abea55d..a8ec589 100644
--- a/re2/prefilter_tree.h
+++ b/re2/prefilter_tree.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef RE2_PREFILTER_TREE_H_
+#define RE2_PREFILTER_TREE_H_
+
 // The PrefilterTree class is used to form an AND-OR tree of strings
 // that would trigger each regexp. The 'prefilter' of each regexp is
 // added tp PrefilterTree, and then PrefilterTree is used to find all
@@ -12,9 +15,6 @@
 // favorite engine. PrefilterTree provides a set of strings (called
 // atoms) that the user of this class should use to do the string
 // matching.
-//
-#ifndef RE2_PREFILTER_TREE_H_
-#define RE2_PREFILTER_TREE_H_
 
 #include "util/util.h"
 #include "util/sparse_array.h"
diff --git a/re2/prog.h b/re2/prog.h
index 61467c5..e1c7249 100644
--- a/re2/prog.h
+++ b/re2/prog.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef RE2_PROG_H_
+#define RE2_PROG_H_
+
 // Compiled representation of regular expressions.
 // See regexp.h for the Regexp class, which represents a regular
 // expression symbolically.
 
-#ifndef RE2_PROG_H__
-#define RE2_PROG_H__
-
 #include "util/util.h"
 #include "util/sparse_array.h"
 #include "util/sparse_set.h"
@@ -374,4 +374,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_PROG_H__
+#endif  // RE2_PROG_H_
diff --git a/re2/re2.h b/re2/re2.h
index 4418492..3bc7225 100644
--- a/re2/re2.h
+++ b/re2/re2.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#ifndef RE2_RE2_H
-#define RE2_RE2_H
+#ifndef RE2_RE2_H_
+#define RE2_RE2_H_
 
 // C++ interface to the re2 regular-expression library.
 // RE2 supports Perl-style regular expressions (with extensions like
@@ -937,4 +937,4 @@
 using re2::RE2;
 using re2::LazyRE2;
 
-#endif /* RE2_RE2_H */
+#endif  // RE2_RE2_H_
diff --git a/re2/regexp.h b/re2/regexp.h
index 54720eb..607dc93 100644
--- a/re2/regexp.h
+++ b/re2/regexp.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef RE2_REGEXP_H_
+#define RE2_REGEXP_H_
+
 // --- SPONSORED LINK --------------------------------------------------
 // If you want to use this library for regular expression matching,
 // you should use re2/re2.h, which provides a class RE2 that
@@ -83,9 +86,6 @@
 // form accessible to clients, so that client code can analyze the
 // parsed regular expressions.
 
-#ifndef RE2_REGEXP_H__
-#define RE2_REGEXP_H__
-
 #include "util/util.h"
 #include "re2/stringpiece.h"
 
@@ -630,4 +630,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_REGEXP_H__
+#endif  // RE2_REGEXP_H_
diff --git a/re2/set.h b/re2/set.h
index 5bcdb70..0e6d4b3 100644
--- a/re2/set.h
+++ b/re2/set.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#ifndef RE2_SET_H
-#define RE2_SET_H
+#ifndef RE2_SET_H_
+#define RE2_SET_H_
 
 #include <utility>
 #include <vector>
@@ -52,4 +52,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_SET_H
+#endif  // RE2_SET_H_
diff --git a/re2/stringpiece.h b/re2/stringpiece.h
index 1479d1a..0bf5b0c 100644
--- a/re2/stringpiece.h
+++ b/re2/stringpiece.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef RE2_STRINGPIECE_H_
+#define RE2_STRINGPIECE_H_
+
 // A string-like object that points to a sized piece of memory.
 //
 // Functions or methods may use const StringPiece& parameters to accept either
@@ -16,9 +19,6 @@
 //
 // Arghh!  I wish C++ literals were "string".
 
-#ifndef STRINGS_STRINGPIECE_H__
-#define STRINGS_STRINGPIECE_H__
-
 #include <string.h>
 #include <algorithm>
 #include <cstddef>
@@ -182,4 +182,4 @@
 // allow StringPiece to be logged
 extern std::ostream& operator<<(std::ostream& o, const re2::StringPiece& piece);
 
-#endif  // STRINGS_STRINGPIECE_H__
+#endif  // RE2_STRINGPIECE_H_
diff --git a/re2/testing/exhaustive_tester.h b/re2/testing/exhaustive_tester.h
index 1facb97..a8f39eb 100644
--- a/re2/testing/exhaustive_tester.h
+++ b/re2/testing/exhaustive_tester.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#ifndef RE2_TESTING_EXHAUSTIVE_TESTER_H__
-#define RE2_TESTING_EXHAUSTIVE_TESTER_H__
+#ifndef RE2_TESTING_EXHAUSTIVE_TESTER_H_
+#define RE2_TESTING_EXHAUSTIVE_TESTER_H_
 
 #include <string>
 #include <vector>
@@ -92,4 +92,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_TESTING_EXHAUSTIVE_TESTER_H__
+#endif  // RE2_TESTING_EXHAUSTIVE_TESTER_H_
diff --git a/re2/testing/regexp_generator.h b/re2/testing/regexp_generator.h
index 3ba0d70..06ea4c4 100644
--- a/re2/testing/regexp_generator.h
+++ b/re2/testing/regexp_generator.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef RE2_TESTING_REGEXP_GENERATOR_H_
+#define RE2_TESTING_REGEXP_GENERATOR_H_
+
 // Regular expression generator: generates all possible
 // regular expressions within given parameters (see below for details).
 
-#ifndef RE2_TESTING_REGEXP_GENERATOR_H__
-#define RE2_TESTING_REGEXP_GENERATOR_H__
-
 #include <string>
 #include <vector>
 #include "util/random.h"
@@ -67,4 +67,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_TESTING_REGEXP_GENERATOR_H__
+#endif  // RE2_TESTING_REGEXP_GENERATOR_H_
diff --git a/re2/testing/string_generator.h b/re2/testing/string_generator.h
index 52e5e22..ff5a711 100644
--- a/re2/testing/string_generator.h
+++ b/re2/testing/string_generator.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef RE2_TESTING_STRING_GENERATOR_H_
+#define RE2_TESTING_STRING_GENERATOR_H_
+
 // String generator: generates all possible strings of up to
 // maxlen letters using the set of letters in alpha.
 // Fetch strings using a Java-like Next()/HasNext() interface.
 
-#ifndef RE2_TESTING_STRING_GENERATOR_H__
-#define RE2_TESTING_STRING_GENERATOR_H__
-
 #include <string>
 #include <vector>
 #include "util/util.h"
@@ -55,4 +55,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_TESTING_STRING_GENERATOR_H__
+#endif  // RE2_TESTING_STRING_GENERATOR_H_
diff --git a/re2/testing/tester.h b/re2/testing/tester.h
index e9fae85..07291d2 100644
--- a/re2/testing/tester.h
+++ b/re2/testing/tester.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef RE2_TESTING_TESTER_H_
+#define RE2_TESTING_TESTER_H_
+
 // Comparative tester for regular expression matching.
 // Checks all implementations against each other.
 
-#ifndef RE2_TESTING_TESTER_H__
-#define RE2_TESTING_TESTER_H__
-
 #include "re2/stringpiece.h"
 #include "re2/prog.h"
 #include "re2/regexp.h"
@@ -118,4 +118,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_TESTING_TESTER_H__
+#endif  // RE2_TESTING_TESTER_H_
diff --git a/re2/unicode_casefold.h b/re2/unicode_casefold.h
index 1671140..164ca41 100644
--- a/re2/unicode_casefold.h
+++ b/re2/unicode_casefold.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef RE2_UNICODE_CASEFOLD_H_
+#define RE2_UNICODE_CASEFOLD_H_
+
 // Unicode case folding tables.
 
 // The Unicode case folding tables encode the mapping from one Unicode point
@@ -36,9 +39,6 @@
 // The grouped form also allows for efficient fold range calculations
 // rather than looping one character at a time.
 
-#ifndef RE2_UNICODE_CASEFOLD_H__
-#define RE2_UNICODE_CASEFOLD_H__
-
 #include "util/util.h"
 
 namespace re2 {
@@ -72,4 +72,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_UNICODE_CASEFOLD_H__
+#endif  // RE2_UNICODE_CASEFOLD_H_
diff --git a/re2/unicode_groups.h b/re2/unicode_groups.h
index fc1c253..d61cd83 100644
--- a/re2/unicode_groups.h
+++ b/re2/unicode_groups.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef RE2_UNICODE_GROUPS_H_
+#define RE2_UNICODE_GROUPS_H_
+
 // Unicode character groups.
 
 // The codes get split into ranges of 16-bit codes
@@ -15,9 +18,6 @@
 // to 16.5 kB of data but make the data harder to use;
 // we don't bother.
 
-#ifndef RE2_UNICODE_GROUPS_H__
-#define RE2_UNICODE_GROUPS_H__
-
 #include "util/util.h"
 
 namespace re2 {
@@ -61,4 +61,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_UNICODE_GROUPS_H__
+#endif  // RE2_UNICODE_GROUPS_H_
diff --git a/re2/walker-inl.h b/re2/walker-inl.h
index ab844a1..6a1113a 100644
--- a/re2/walker-inl.h
+++ b/re2/walker-inl.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef RE2_WALKER_INL_H_
+#define RE2_WALKER_INL_H_
+
 // Helper class for traversing Regexps without recursion.
 // Clients should declare their own subclasses that override
 // the PreVisit and PostVisit methods, which are called before
@@ -10,9 +13,6 @@
 // Not quite the Visitor pattern, because (among other things)
 // the Visitor pattern is recursive.
 
-#ifndef RE2_WALKER_INL_H__
-#define RE2_WALKER_INL_H__
-
 #include "re2/regexp.h"
 
 namespace re2 {
@@ -241,4 +241,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_WALKER_INL_H__
+#endif  // RE2_WALKER_INL_H_
diff --git a/util/benchmark.h b/util/benchmark.h
index 31bbd53..694565f 100644
--- a/util/benchmark.h
+++ b/util/benchmark.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#ifndef RE2_UTIL_BENCHMARK_H__
-#define RE2_UTIL_BENCHMARK_H__
+#ifndef UTIL_BENCHMARK_H_
+#define UTIL_BENCHMARK_H_
 
 namespace testing {
 struct Benchmark {
@@ -14,7 +14,7 @@
   int hi;
   int threadlo;
   int threadhi;
-  
+
   void Register();
   Benchmark(const char* name, void (*f)(int)) { Clear(name); fn = f; Register(); }
   Benchmark(const char* name, void (*f)(int, int), int l, int h) { Clear(name); fnr = f; lo = l; hi = h; Register(); }
@@ -38,4 +38,4 @@
 	::testing::Benchmark* _benchmark_##f = \
 	(new ::testing::Benchmark(#f, f, lo, hi))
 
-#endif  // RE2_UTIL_BENCHMARK_H__
+#endif  // UTIL_BENCHMARK_H_
diff --git a/util/bitmap.h b/util/bitmap.h
index 429b06a..8a93d81 100644
--- a/util/bitmap.h
+++ b/util/bitmap.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#ifndef RE2_UTIL_BITMAP_H__
-#define RE2_UTIL_BITMAP_H__
+#ifndef UTIL_BITMAP_H_
+#define UTIL_BITMAP_H_
 
 #ifdef _MSC_VER
 #include <intrin.h>
@@ -89,4 +89,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_UTIL_BITMAP_H__
+#endif  // UTIL_BITMAP_H_
diff --git a/util/flags.h b/util/flags.h
index 98d5c06..1fd5c91 100644
--- a/util/flags.h
+++ b/util/flags.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef UTIL_FLAGS_H_
+#define UTIL_FLAGS_H_
+
 // Simplified version of Google's command line flags.
 // Does not support parsing the command line.
 // If you want to do that, see
 // https://gflags.github.io/gflags/
 
-#ifndef RE2_UTIL_FLAGS_H__
-#define RE2_UTIL_FLAGS_H__
-
 #define DEFINE_flag(type, name, deflt, desc) \
 	namespace re2 { type FLAGS_##name = deflt; }
 
@@ -24,4 +24,4 @@
 #define DECLARE_int32(name) DECLARE_flag(int32, name)
 #define DECLARE_string(name) DECLARE_flag(string, name)
 
-#endif  // RE2_UTIL_FLAGS_H__
+#endif  // UTIL_FLAGS_H_
diff --git a/util/logging.h b/util/logging.h
index feac199..1573b18 100644
--- a/util/logging.h
+++ b/util/logging.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Simplified version of Google's logging.
+#ifndef UTIL_LOGGING_H_
+#define UTIL_LOGGING_H_
 
-#ifndef RE2_UTIL_LOGGING_H__
-#define RE2_UTIL_LOGGING_H__
+// Simplified version of Google's logging.
 
 #include <stdio.h>  /* for fwrite */
 #include <sstream>
@@ -106,4 +106,4 @@
 #pragma warning(pop)
 #endif
 
-#endif  // RE2_UTIL_LOGGING_H__
+#endif  // UTIL_LOGGING_H_
diff --git a/util/mutex.h b/util/mutex.h
index 8a13226..81121a4 100644
--- a/util/mutex.h
+++ b/util/mutex.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef UTIL_MUTEX_H_
+#define UTIL_MUTEX_H_
+
 /*
  * A simple mutex wrapper, supporting locks and read-write locks.
  * You should assume the locks are *not* re-entrant.
  */
 
-#ifndef RE2_UTIL_MUTEX_H_
-#define RE2_UTIL_MUTEX_H_
-
 #include <stdlib.h>
 
 #if !defined(_WIN32)
@@ -210,4 +210,4 @@
 
 }  // namespace re2
 
-#endif  /* #define RE2_UTIL_MUTEX_H_ */
+#endif  // UTIL_MUTEX_H_
diff --git a/util/pcre.h b/util/pcre.h
index 20b10c0..468d948 100644
--- a/util/pcre.h
+++ b/util/pcre.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef UTIL_PCRE_H_
+#define UTIL_PCRE_H_
+
 // This is a variant of PCRE's pcrecpp.h, originally written at Google.
 // The main changes are the addition of the HitLimit method and
 // compilation as PCRE in namespace re2.
@@ -664,3 +667,5 @@
 #undef MAKE_INTEGER_PARSER
 
 }  // namespace re2
+
+#endif  // UTIL_PCRE_H_
diff --git a/util/random.h b/util/random.h
index 6c6e701..6c67b2c 100644
--- a/util/random.h
+++ b/util/random.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Modified from Google perftools's tcmalloc_unittest.cc.
+#ifndef UTIL_RANDOM_H_
+#define UTIL_RANDOM_H_
 
-#ifndef RE2_UTIL_RANDOM_H__
-#define RE2_UTIL_RANDOM_H__
+// Modified from Google perftools's tcmalloc_unittest.cc.
 
 #include "util/util.h"
 
@@ -26,4 +26,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_UTIL_RANDOM_H__
+#endif  // UTIL_RANDOM_H_
diff --git a/util/sparse_array.h b/util/sparse_array.h
index 8f71fa0..d37a10a 100644
--- a/util/sparse_array.h
+++ b/util/sparse_array.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef UTIL_SPARSE_ARRAY_H_
+#define UTIL_SPARSE_ARRAY_H_
+
 // DESCRIPTION
 // 
 // SparseArray<T>(m) is a map from integers in [0, m) to T values.
@@ -89,9 +92,6 @@
 // immediately become inaccessible, but they are only guaranteed to be
 // destroyed when the SparseArray destructor is called.
 
-#ifndef RE2_UTIL_SPARSE_ARRAY_H__
-#define RE2_UTIL_SPARSE_ARRAY_H__
-
 #include "util/util.h"
 
 namespace re2 {
@@ -462,4 +462,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_UTIL_SPARSE_ARRAY_H__
+#endif  // UTIL_SPARSE_ARRAY_H_
diff --git a/util/sparse_set.h b/util/sparse_set.h
index 9dd41ee..537a094 100644
--- a/util/sparse_set.h
+++ b/util/sparse_set.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#ifndef UTIL_SPARSE_SET_H_
+#define UTIL_SPARSE_SET_H_
+
 // DESCRIPTION
 // 
 // SparseSet<T>(m) is a set of integers in [0, m).
@@ -44,9 +47,6 @@
 //
 // See sparse_array.h for implementation details
 
-#ifndef RE2_UTIL_SPARSE_SET_H__
-#define RE2_UTIL_SPARSE_SET_H__
-
 #include "util/util.h"
 
 namespace re2 {
@@ -182,4 +182,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_UTIL_SPARSE_SET_H__
+#endif  // UTIL_SPARSE_SET_H_
diff --git a/util/test.h b/util/test.h
index 3701eab..4bdd343 100644
--- a/util/test.h
+++ b/util/test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#ifndef RE2_UTIL_TEST_H__
-#define RE2_UTIL_TEST_H__
+#ifndef UTIL_TEST_H_
+#define UTIL_TEST_H_
 
 #include "util/util.h"
 #include "util/flags.h"
@@ -42,4 +42,4 @@
 };
 }  // namespace testing
 
-#endif  // RE2_UTIL_TEST_H__
+#endif  // UTIL_TEST_H_
diff --git a/util/thread.h b/util/thread.h
index fb67bdc..f9ecaf6 100644
--- a/util/thread.h
+++ b/util/thread.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#ifndef RE2_UTIL_THREAD_H__
-#define RE2_UTIL_THREAD_H__
+#ifndef UTIL_THREAD_H_
+#define UTIL_THREAD_H_
 
 #ifdef _WIN32
 #include <windows.h>
@@ -30,4 +30,4 @@
   bool joinable_;
 };
 
-#endif  // RE2_UTIL_THREAD_H__
+#endif  // UTIL_THREAD_H_
diff --git a/util/utf.h b/util/utf.h
index 06ff8f0..85b4297 100644
--- a/util/utf.h
+++ b/util/utf.h
@@ -14,8 +14,9 @@
  * This file and rune.cc have been converted to compile as C++ code
  * in name space re2.
  */
-#ifndef RE2_UTIL_UTF_H__
-#define RE2_UTIL_UTF_H__
+
+#ifndef UTIL_UTF_H_
+#define UTIL_UTF_H_
 
 #include <stdint.h>
 
@@ -40,4 +41,4 @@
 
 }  // namespace re2
 
-#endif  // RE2_UTIL_UTF_H__
+#endif  // UTIL_UTF_H_
diff --git a/util/util.h b/util/util.h
index 10b4871..e05139a 100644
--- a/util/util.h
+++ b/util/util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#ifndef RE2_UTIL_UTIL_H__
-#define RE2_UTIL_UTIL_H__
+#ifndef UTIL_UTIL_H_
+#define UTIL_UTIL_H_
 
 // C
 #include <stdio.h>
@@ -145,4 +145,4 @@
 #include "util/mutex.h"
 #include "util/utf.h"
 
-#endif // RE2_UTIL_UTIL_H__
+#endif  // UTIL_UTIL_H_
diff --git a/util/valgrind.h b/util/valgrind.h
index ca10b1a..2200a22 100644
--- a/util/valgrind.h
+++ b/util/valgrind.h
@@ -55,6 +55,8 @@
    ---------------------------------------------------------------- 
 */
 
+#ifndef UTIL_VALGRIND_H_
+#define UTIL_VALGRIND_H_
 
 /* This file is for inclusion into client (your!) code.
 
@@ -70,9 +72,6 @@
    problem, you can compile with the NVALGRIND symbol defined (gcc
    -DNVALGRIND) so that client requests are not even compiled in.  */
 
-#ifndef __VALGRIND_H
-#define __VALGRIND_H
-
 #include <stdarg.h>
 
 /* Nb: this file might be included in a file compiled with -ansi.  So
@@ -4514,4 +4513,4 @@
 #undef PLAT_ppc32_aix5
 #undef PLAT_ppc64_aix5
 
-#endif   /* __VALGRIND_H */
+#endif  // UTIL_VALGRIND_H_