diff --git a/source/detail/linux_X11/platform_spec.cpp b/source/detail/linux_X11/platform_spec.cpp
index 1f17cda4..43fde207 100644
--- a/source/detail/linux_X11/platform_spec.cpp
+++ b/source/detail/linux_X11/platform_spec.cpp
@@ -14,8 +14,6 @@
  *	http://standards.freedesktop.org/clipboards-spec/clipboards-0.1.txt
  */
 
-#if defined(NANA_LINUX) || defined(NANA_MACOS)
-
 #include <nana/detail/platform_spec_selector.hpp>
 #include <X11/Xlocale.h>
 #include <locale>
@@ -1414,7 +1412,3 @@ namespace detail
 	}
 }//end namespace detail
 }//end namespace nana
-
-
-//#if defined(NANA_LINUX) || defined(NANA_MACOS)
-#endif
diff --git a/source/detail/win32/platform_spec.cpp b/source/detail/win32/platform_spec.cpp
index 7b048aba..f7ac9917 100644
--- a/source/detail/win32/platform_spec.cpp
+++ b/source/detail/win32/platform_spec.cpp
@@ -12,8 +12,6 @@
  *	This file provides basis class and data structrue that required by nana
  */
 
-#if defined(NANA_WINDOWS)
-
 #include <nana/detail/platform_spec_selector.hpp>
 #include <shellapi.h>
 #include <stdexcept>
@@ -292,6 +290,3 @@ namespace detail
 	}
 }//end namespace detail
 }//end namespace nana
-
-//#if defined(NANA_WINDOWS)
-#endif
\ No newline at end of file
diff --git a/source/internationalization.cpp b/source/internationalization.cpp
index c2e47e5d..2e7367fc 100644
--- a/source/internationalization.cpp
+++ b/source/internationalization.cpp
@@ -14,8 +14,6 @@
 #include <nana/gui/widgets/widget.hpp>
 #include <unordered_map>
 #include <fstream>
-#include <sstream>   // Warning:(17, 1) [unused] Unused import statement
-#include <memory>    // Warning:(17, 1) [unused] Unused import statement
 
 #if defined(STD_THREAD_NOT_SUPPORTED)
 #include <nana/std_mutex.hpp>
@@ -75,7 +73,7 @@ namespace nana
 						bool escape = false;
 						for (auto i = read_ptr_ + 1; i != end_ptr_; ++i)
 						{
-							if (escape)  // Warning:(78, 12) Condition is always false
+							if (escape)
 							{
 								escape = false;
 								continue;
@@ -88,6 +86,8 @@ namespace nana
 								reach_right_quota = true;
 								break;
 							}
+							else if ('\\' == *i)
+								escape = true;
 						}
 						_m_eat_ws();
 						if (read_ptr_ == end_ptr_ || '"' != *read_ptr_)
@@ -268,10 +268,10 @@ namespace nana
 			{
 				auto result = mgr.table.emplace(wd, std::move(eval));
 				result.first->second.destroy = nana::API::events(wd).destroy([wd]{
-					auto & mgr = get_eval_manager();  // Warning:(271, 13) Local 'mgr' hides previous declaration
-					std::lock_guard<std::recursive_mutex> lock(mgr.mutex); // Local 'lock' hides previous
+					auto & eval_mgr = get_eval_manager();
+					std::lock_guard<std::recursive_mutex> lockgd(eval_mgr.mutex);
 
-					mgr.table.erase(wd);
+					eval_mgr.table.erase(wd);
 				});
 			}
 			else