diff --git a/src/ctemplate/per_expand_data.h.in b/src/ctemplate/per_expand_data.h.in
index 96e628b..fa6c5e1 100644
--- a/src/ctemplate/per_expand_data.h.in
+++ b/src/ctemplate/per_expand_data.h.in
@@ -125,15 +125,10 @@ class @ac_windows_dllexport@ PerExpandData {
   }
 
  private:
-#ifdef _MSC_VER
-  typedef @ac_cv_cxx_hash_map_class@<const char*, const void*, StringHash> DataMap;
-#else
   struct DataEq {
     bool operator()(const char* s1, const char* s2) const;
   };
-  typedef @ac_cv_cxx_hash_map_class@<const char*, const void*, StringHash, DataEq>
-    DataMap;
-#endif
+  typedef @ac_cv_cxx_hash_map_class@<const char*, const void*, StringHash, DataEq> DataMap;
 
   const char* annotate_path_;
   TemplateAnnotator* annotator_;
diff --git a/src/ctemplate/template_annotator.h.in b/src/ctemplate/template_annotator.h.in
old mode 100755
new mode 100644
diff --git a/src/ctemplate/template_namelist.h.in b/src/ctemplate/template_namelist.h.in
old mode 100755
new mode 100644
diff --git a/src/ctemplate/template_string.h.in b/src/ctemplate/template_string.h.in
old mode 100755
new mode 100644
diff --git a/src/per_expand_data.cc b/src/per_expand_data.cc
index 0a468cf..f8f3025 100644
--- a/src/per_expand_data.cc
+++ b/src/per_expand_data.cc
@@ -42,12 +42,10 @@ namespace ctemplate {
 
 using std::string;
 
-#ifndef _MSC_VER
 bool PerExpandData::DataEq::operator()(const char* s1, const char* s2) const {
   return ((s1 == 0 && s2 == 0) ||
           (s1 && s2 && *s1 == *s2 && strcmp(s1, s2) == 0));
 }
-#endif
 
 PerExpandData::~PerExpandData() {
   delete map_;