diff --git a/trunk/src/ctemplate/find_ptr.h.in b/trunk/src/ctemplate/find_ptr.h.in
index 31ee803..095c538 100644
--- a/trunk/src/ctemplate/find_ptr.h.in
+++ b/trunk/src/ctemplate/find_ptr.h.in
@@ -35,7 +35,7 @@
 
 @ac_windows_dllexport_defines@
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 template <class T, class U>
 typename T::value_type::second_type* find_ptr(T& c, U v)
diff --git a/trunk/src/ctemplate/per_expand_data.h.in b/trunk/src/ctemplate/per_expand_data.h.in
index 01a09db..96e628b 100644
--- a/trunk/src/ctemplate/per_expand_data.h.in
+++ b/trunk/src/ctemplate/per_expand_data.h.in
@@ -50,7 +50,7 @@
 
 @ac_windows_dllexport_defines@
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 class TemplateModifier;
 class TemplateAnnotator;
diff --git a/trunk/src/ctemplate/str_ref.h.in b/trunk/src/ctemplate/str_ref.h.in
index c0f2ef6..68b591a 100644
--- a/trunk/src/ctemplate/str_ref.h.in
+++ b/trunk/src/ctemplate/str_ref.h.in
@@ -37,7 +37,7 @@
 
 @ac_windows_dllexport_defines@
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 template <class T>
 class str_ref_basic
diff --git a/trunk/src/ctemplate/template.h.in b/trunk/src/ctemplate/template.h.in
index a38bad5..90f6bea 100644
--- a/trunk/src/ctemplate/template.h.in
+++ b/trunk/src/ctemplate/template.h.in
@@ -63,7 +63,7 @@ class HtmlParser;
 
 @ac_windows_dllexport_defines@
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 // These free functions form the "simple" template API, and support
 // the most common operations (expanding a template from a file, and
diff --git a/trunk/src/ctemplate/template_annotator.h.in b/trunk/src/ctemplate/template_annotator.h.in
index 6d903a7..29c703a 100644
--- a/trunk/src/ctemplate/template_annotator.h.in
+++ b/trunk/src/ctemplate/template_annotator.h.in
@@ -56,7 +56,7 @@
 
 @ac_windows_dllexport_defines@
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 class ExpandEmitter;
 
diff --git a/trunk/src/ctemplate/template_cache.h.in b/trunk/src/ctemplate/template_cache.h.in
index 86f939e..998eff2 100644
--- a/trunk/src/ctemplate/template_cache.h.in
+++ b/trunk/src/ctemplate/template_cache.h.in
@@ -50,7 +50,7 @@ class TemplateCacheUnittest;
 
 @ac_windows_dllexport_defines@
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 class PerExpandData;
 class Template;
diff --git a/trunk/src/ctemplate/template_dictionary.h.in b/trunk/src/ctemplate/template_dictionary.h.in
index f4b18f8..e0c9942 100644
--- a/trunk/src/ctemplate/template_dictionary.h.in
+++ b/trunk/src/ctemplate/template_dictionary.h.in
@@ -69,7 +69,7 @@ template<typename A, int B, typename C, typename D> class small_map;
 template<typename NormalMap> class small_map_default_init;  // in small_map.h
 }
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 
 class @ac_windows_dllexport@ TemplateDictionary : public TemplateDictionaryInterface {
diff --git a/trunk/src/ctemplate/template_dictionary_interface.h.in b/trunk/src/ctemplate/template_dictionary_interface.h.in
index e37f3a8..0cc9171 100644
--- a/trunk/src/ctemplate/template_dictionary_interface.h.in
+++ b/trunk/src/ctemplate/template_dictionary_interface.h.in
@@ -48,7 +48,7 @@
 
 @ac_windows_dllexport_defines@
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 const int kIndent = 2;  // num spaces to indent each level -- used with dump
 
diff --git a/trunk/src/ctemplate/template_emitter.h.in b/trunk/src/ctemplate/template_emitter.h.in
index 3651b7a..fc29098 100644
--- a/trunk/src/ctemplate/template_emitter.h.in
+++ b/trunk/src/ctemplate/template_emitter.h.in
@@ -42,7 +42,7 @@
 
 @ac_windows_dllexport_defines@
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 class @ac_windows_dllexport@ ExpandEmitter {
  public:
diff --git a/trunk/src/ctemplate/template_enums.h.in b/trunk/src/ctemplate/template_enums.h.in
index e2a436e..57db6ca 100644
--- a/trunk/src/ctemplate/template_enums.h.in
+++ b/trunk/src/ctemplate/template_enums.h.in
@@ -35,7 +35,7 @@
 #ifndef TEMPLATE_TEMPLATE_ENUMS_H_
 #define TEMPLATE_TEMPLATE_ENUMS_H_
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 // Enums for GetTemplate flag values
 enum Strip { DO_NOT_STRIP, STRIP_BLANK_LINES, STRIP_WHITESPACE,
diff --git a/trunk/src/ctemplate/template_modifiers.h.in b/trunk/src/ctemplate/template_modifiers.h.in
index 5b13e01..dd7b158 100644
--- a/trunk/src/ctemplate/template_modifiers.h.in
+++ b/trunk/src/ctemplate/template_modifiers.h.in
@@ -70,7 +70,7 @@
 
 @ac_windows_dllexport_defines@
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 class Template;
 
diff --git a/trunk/src/ctemplate/template_namelist.h.in b/trunk/src/ctemplate/template_namelist.h.in
index 2f82636..2758a8b 100644
--- a/trunk/src/ctemplate/template_namelist.h.in
+++ b/trunk/src/ctemplate/template_namelist.h.in
@@ -48,7 +48,7 @@
 
 @ac_windows_dllexport_defines@
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 // RegisterTemplateFilename
 //   Used to define a reference variable for the name of a template file. E.g:
diff --git a/trunk/src/ctemplate/template_pathops.h.in b/trunk/src/ctemplate/template_pathops.h.in
index a0658cd..7a11ade 100644
--- a/trunk/src/ctemplate/template_pathops.h.in
+++ b/trunk/src/ctemplate/template_pathops.h.in
@@ -37,7 +37,7 @@
 
 @ac_windows_dllexport_defines@
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 extern @ac_windows_dllexport@
 const char kCWD[];       // a string that's equivalent to "./"
diff --git a/trunk/src/ctemplate/template_string.h.in b/trunk/src/ctemplate/template_string.h.in
index 44ed348..e151a35 100644
--- a/trunk/src/ctemplate/template_string.h.in
+++ b/trunk/src/ctemplate/template_string.h.in
@@ -57,7 +57,7 @@ extern char data_start[] __attribute__((weak));               // start of .data
 
 @ac_windows_dllexport_defines@
 
-@ac_google_start_namespace@
+namespace ctemplate {
 
 // Most methods of TemplateDictionary take a TemplateString rather than a
 // C++ string.  This is for efficiency: it can avoid extra string copies.