diff --git a/src/base/arena-inl.h b/src/base/arena-inl.h
index 9dc56c4..d3f0d22 100644
--- a/src/base/arena-inl.h
+++ b/src/base/arena-inl.h
@@ -138,7 +138,7 @@ template<class T, class C> const int ArenaAllocator<T, C>::kAlignment =
 
 
 // 'new' must be in the global namespace.
-_END_GOOGLE_NAMESPACE_
+}
 using GOOGLE_NAMESPACE::UnsafeArena;
 
 
@@ -347,6 +347,6 @@ class ArrayGladiator : public Gladiator {
 
 #endif  // ********** example
 
-_END_GOOGLE_NAMESPACE_
+}
 
 #endif  // BASE_ARENA_INL_H_
diff --git a/src/base/arena.cc b/src/base/arena.cc
index 7e4a289..950c04d 100644
--- a/src/base/arena.cc
+++ b/src/base/arena.cc
@@ -502,4 +502,4 @@ char* SafeArena::Realloc(char* s, size_t oldsize, size_t newsize) {
   return newstr;
 }
 
-_END_GOOGLE_NAMESPACE_
+}
diff --git a/src/base/arena.h b/src/base/arena.h
index 80394f0..89edb51 100644
--- a/src/base/arena.h
+++ b/src/base/arena.h
@@ -693,6 +693,6 @@ class CTEMPLATE_DLL_DECL SafeArena : public BaseArena {
   DISALLOW_COPY_AND_ASSIGN(SafeArena);
 };
 
-_END_GOOGLE_NAMESPACE_
+}
 
 #endif  // BASE_ARENA_H_
diff --git a/src/base/fileutil.h b/src/base/fileutil.h
index 39eab71..7d169fb 100644
--- a/src/base/fileutil.h
+++ b/src/base/fileutil.h
@@ -101,6 +101,6 @@ class File {
   FILE* fp_;
 };
 
-_END_GOOGLE_NAMESPACE_
+}
 
 #endif  // TEMPLATE_OPENSOURCE_FILEUTIL_H_
diff --git a/src/base/manual_constructor.h b/src/base/manual_constructor.h
index e0ac7df..e913983 100644
--- a/src/base/manual_constructor.h
+++ b/src/base/manual_constructor.h
@@ -231,6 +231,6 @@ class ManualConstructor {
 #undef UTIL_GTL_ALIGNED_CHAR_ARRAY
 #undef UTIL_GTL_ALIGN_OF
 
-_END_GOOGLE_NAMESPACE_
+}
 
 #endif  // UTIL_GTL_MANUAL_CONSTRUCTOR_H_
diff --git a/src/base/mutex.h b/src/base/mutex.h
index 94508b5..7469bb1 100644
--- a/src/base/mutex.h
+++ b/src/base/mutex.h
@@ -403,6 +403,6 @@ class WriterMutexLock {
 #define ReaderMutexLock(x) COMPILE_ASSERT(0, rmutex_lock_decl_missing_var_name)
 #define WriterMutexLock(x) COMPILE_ASSERT(0, wmutex_lock_decl_missing_var_name)
 
-_END_GOOGLE_NAMESPACE_
+}
 
 #endif  /* #define GOOGLE_MUTEX_H__ */
diff --git a/src/base/small_map.h b/src/base/small_map.h
index 07dab22..50c16d5 100644
--- a/src/base/small_map.h
+++ b/src/base/small_map.h
@@ -563,6 +563,6 @@ inline bool small_map<NormalMap, kArraySize, EqualKey,
   return other != *this;
 }
 
-_END_GOOGLE_NAMESPACE_
+}
 
 #endif  // UTIL_GTL_SMALL_MAP_H_
diff --git a/src/indented_writer.h b/src/indented_writer.h
index f44a034..672ec55 100644
--- a/src/indented_writer.h
+++ b/src/indented_writer.h
@@ -129,6 +129,6 @@ class IndentedWriter {
   const static int kIndent = 2;            // num spaces to indent each level
 };
 
-_END_GOOGLE_NAMESPACE_
+}
 
 #endif  // TEMPLATE_INDENTED_WRITER_H_
diff --git a/src/per_expand_data.cc b/src/per_expand_data.cc
index 2c81c3f..bfe2007 100644
--- a/src/per_expand_data.cc
+++ b/src/per_expand_data.cc
@@ -75,4 +75,4 @@ const void* PerExpandData::LookupForModifiers(const char* key) const {
   return map_ ? find_ptr2(*map_, key) : NULL;
 }
 
-_END_GOOGLE_NAMESPACE_
+}
diff --git a/src/template.cc b/src/template.cc
index 07990a1..e9d6ede 100644
--- a/src/template.cc
+++ b/src/template.cc
@@ -2774,4 +2774,4 @@ bool Template::ExpandWithDataAndCache(
   return ExpandLocked(expand_emitter, dict, per_expand_data, cache);
 }
 
-_END_GOOGLE_NAMESPACE_
+}
diff --git a/src/template_annotator.cc b/src/template_annotator.cc
index 9d18cfe..318b0fa 100644
--- a/src/template_annotator.cc
+++ b/src/template_annotator.cc
@@ -105,4 +105,4 @@ void TextTemplateAnnotator::EmitFileIsMissing(ExpandEmitter* emitter,
   EMIT_MISSING_ANNOTATION(emitter,"MISSING_FILE", value);
 }
 
-_END_GOOGLE_NAMESPACE_
+}
diff --git a/src/template_cache.cc b/src/template_cache.cc
index 1067b01..db652e7 100644
--- a/src/template_cache.cc
+++ b/src/template_cache.cc
@@ -769,4 +769,4 @@ bool TemplateCache::IsValidTemplateFilename(const string& filename,
   return true;
 }
 
-_END_GOOGLE_NAMESPACE_
+}
diff --git a/src/template_dictionary.cc b/src/template_dictionary.cc
index a243d8d..05a8889 100644
--- a/src/template_dictionary.cc
+++ b/src/template_dictionary.cc
@@ -1029,4 +1029,4 @@ TemplateDictionary::CreateSectionIterator(
   abort();
 }
 
-_END_GOOGLE_NAMESPACE_
+}
diff --git a/src/template_modifiers.cc b/src/template_modifiers.cc
index 1af6640..e092955 100644
--- a/src/template_modifiers.cc
+++ b/src/template_modifiers.cc
@@ -1414,4 +1414,4 @@ vector<const ModifierAndValue*> GetDefaultModifierForJson() {
   return GetModifierForJson(NULL, NULL);
 }
 
-_END_GOOGLE_NAMESPACE_
+}
diff --git a/src/template_modifiers_internal.h b/src/template_modifiers_internal.h
index eb65950..fdfd56e 100644
--- a/src/template_modifiers_internal.h
+++ b/src/template_modifiers_internal.h
@@ -242,6 +242,6 @@ std::vector<const ModifierAndValue*> GetDefaultModifierForXml();
 extern CTEMPLATE_DLL_DECL
 std::vector<const ModifierAndValue*> GetDefaultModifierForJson();
 
-_END_GOOGLE_NAMESPACE_
+}
 
 #endif  // TEMPLATE_TEMPLATE_MODIFIERS_INTERNAL_H_
diff --git a/src/template_namelist.cc b/src/template_namelist.cc
index d9ad8e6..f1ec37c 100644
--- a/src/template_namelist.cc
+++ b/src/template_namelist.cc
@@ -191,4 +191,4 @@ bool TemplateNamelist::IsAllSyntaxOkay(Strip strip) {
   return bad_syntax_list.empty();
 }
 
-_END_GOOGLE_NAMESPACE_
+}
diff --git a/src/template_pathops.cc b/src/template_pathops.cc
index 1868dcd..dce8d94 100644
--- a/src/template_pathops.cc
+++ b/src/template_pathops.cc
@@ -142,4 +142,4 @@ bool ContainsFullWord(const string& text, const string& word) {
   return false;
 }
 
-_END_GOOGLE_NAMESPACE_
+}
diff --git a/src/template_string.cc b/src/template_string.cc
index bb4e751..f0b16e1 100644
--- a/src/template_string.cc
+++ b/src/template_string.cc
@@ -253,4 +253,4 @@ StaticTemplateStringInitializer::StaticTemplateStringInitializer(
   ts_copy_of_sts.AddToGlobalIdToNameMap();
 }
 
-_END_GOOGLE_NAMESPACE_
+}
diff --git a/src/tests/template_test_util.cc b/src/tests/template_test_util.cc
index 3a112ae..595227c 100644
--- a/src/tests/template_test_util.cc
+++ b/src/tests/template_test_util.cc
@@ -306,4 +306,4 @@ const char* TemplateDictionaryPeer::GetFilename() const {
   return dict_->filename_;
 }
 
-_END_GOOGLE_NAMESPACE_
+}
diff --git a/src/tests/template_test_util.h b/src/tests/template_test_util.h
index 5745643..0f11b29 100644
--- a/src/tests/template_test_util.h
+++ b/src/tests/template_test_util.h
@@ -278,7 +278,6 @@ class TemplateCachePeer {
   void operator=(const TemplateCachePeer&);
 };
 
-_END_GOOGLE_NAMESPACE_
-
+}
 
 #endif  // TEMPLATE_TEMPLATE_TEST_UTIL_H_
diff --git a/src/windows/port.cc b/src/windows/port.cc
index 54a566d..151ff14 100644
--- a/src/windows/port.cc
+++ b/src/windows/port.cc
@@ -99,7 +99,7 @@ void CreateOrCleanTestDir(const string& dirname) {
   }
 }
 
-_END_GOOGLE_NAMESPACE_
+}
 
 void GetNamelist(const char* testdata_dir, vector<string>* namelist) {
   string glob(GOOGLE_NAMESPACE::PathJoin(testdata_dir,
diff --git a/src/windows/port.h b/src/windows/port.h
index 7a8367f..1860e61 100644
--- a/src/windows/port.h
+++ b/src/windows/port.h
@@ -125,7 +125,7 @@ extern int CTEMPLATE_DLL_DECL safe_vsnprintf(char *str, size_t size,
 _START_GOOGLE_NAMESPACE_
 extern CTEMPLATE_DLL_DECL std::string TmpFile(const char* basename);
 void CTEMPLATE_DLL_DECL CreateOrCleanTestDir(const std::string& dirname);
-_END_GOOGLE_NAMESPACE_
+}
 void CTEMPLATE_DLL_DECL GetNamelist(const char* testdata_dir,
                                     std::vector<std::string>* namelist);
 #endif  /* __cplusplus */