diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj
index 3942ace1ee..7ac28368b6 100644
--- a/cocos/2d/libcocos2d.vcxproj
+++ b/cocos/2d/libcocos2d.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -374,12 +374,12 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\chipmunk\prebuilt\releas
     <ClCompile Include="..\platform\CCImage.cpp" />
     <ClCompile Include="..\platform\CCSAXParser.cpp" />
     <ClCompile Include="..\platform\CCThread.cpp" />
-    <ClCompile Include="..\platform\desktop\CCGLViewImpl.cpp" />
-    <ClCompile Include="..\platform\win32\CCApplication.cpp" />
-    <ClCompile Include="..\platform\win32\CCCommon.cpp" />
-    <ClCompile Include="..\platform\win32\CCDevice.cpp" />
-    <ClCompile Include="..\platform\win32\CCFileUtilsWin32.cpp" />
-    <ClCompile Include="..\platform\win32\CCStdC.cpp" />
+    <ClCompile Include="..\platform\desktop\CCGLViewImpl-desktop.cpp" />
+    <ClCompile Include="..\platform\win32\CCApplication-win32.cpp" />
+    <ClCompile Include="..\platform\win32\CCCommon-win32.cpp" />
+    <ClCompile Include="..\platform\win32\CCDevice-win32.cpp" />
+    <ClCompile Include="..\platform\win32\CCFileUtils-win32.cpp" />
+    <ClCompile Include="..\platform\win32\CCStdC-win32.cpp" />
     <ClCompile Include="..\renderer\CCBatchCommand.cpp" />
     <ClCompile Include="..\renderer\CCCustomCommand.cpp" />
     <ClCompile Include="..\renderer\CCGLProgram.cpp" />
@@ -408,7 +408,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\chipmunk\prebuilt\releas
     <ClCompile Include="..\ui\UICheckBox.cpp" />
     <ClCompile Include="..\ui\UIDeprecated.cpp" />
     <ClCompile Include="..\ui\UIEditBox\UIEditBox.cpp" />
-    <ClCompile Include="..\ui\UIEditBox\UIEditBoxImplWin.cpp" />
+    <ClCompile Include="..\ui\UIEditBox\UIEditBoxImpl-win32.cpp" />
     <ClCompile Include="..\ui\UIHBox.cpp" />
     <ClCompile Include="..\ui\UIHelper.cpp" />
     <ClCompile Include="..\ui\UIImageView.cpp" />
@@ -747,12 +747,12 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\chipmunk\prebuilt\releas
     <ClInclude Include="..\platform\CCImage.h" />
     <ClInclude Include="..\platform\CCSAXParser.h" />
     <ClInclude Include="..\platform\CCThread.h" />
-    <ClInclude Include="..\platform\desktop\CCGLViewImpl.h" />
-    <ClInclude Include="..\platform\win32\CCApplication.h" />
-    <ClInclude Include="..\platform\win32\CCFileUtilsWin32.h" />
-    <ClInclude Include="..\platform\win32\CCGL.h" />
-    <ClInclude Include="..\platform\win32\CCPlatformDefine.h" />
-    <ClInclude Include="..\platform\win32\CCStdC.h" />
+    <ClInclude Include="..\platform\desktop\CCGLViewImpl-desktop.h" />
+    <ClInclude Include="..\platform\win32\CCApplication-win32.h" />
+    <ClInclude Include="..\platform\win32\CCFileUtils-win32.h" />
+    <ClInclude Include="..\platform\win32\CCGL-win32.h" />
+    <ClInclude Include="..\platform\win32\CCPlatformDefine-win32.h" />
+    <ClInclude Include="..\platform\win32\CCStdC-win32.h" />
     <ClInclude Include="..\platform\win32\compat\stdint.h" />
     <ClInclude Include="..\renderer\CCBatchCommand.h" />
     <ClInclude Include="..\renderer\CCCustomCommand.h" />
@@ -784,8 +784,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\chipmunk\prebuilt\releas
     <ClInclude Include="..\ui\UICheckBox.h" />
     <ClInclude Include="..\ui\UIDeprecated.h" />
     <ClInclude Include="..\ui\UIEditBox\UIEditBox.h" />
+    <ClInclude Include="..\ui\UIEditBox\UIEditBoxImpl-win32.h" />
     <ClInclude Include="..\ui\UIEditBox\UIEditBoxImpl.h" />
-    <ClInclude Include="..\ui\UIEditBox\UIEditBoxImplWin.h" />
     <ClInclude Include="..\ui\UIHBox.h" />
     <ClInclude Include="..\ui\UIHelper.h" />
     <ClInclude Include="..\ui\UIImageView.h" />
@@ -895,4 +895,4 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\chipmunk\prebuilt\releas
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/cocos/2d/libcocos2d.vcxproj.filters b/cocos/2d/libcocos2d.vcxproj.filters
index 71ff22990a..dfcdb7b987 100644
--- a/cocos/2d/libcocos2d.vcxproj.filters
+++ b/cocos/2d/libcocos2d.vcxproj.filters
@@ -631,21 +631,6 @@
     <ClCompile Include="..\renderer\CCTextureCache.cpp">
       <Filter>renderer</Filter>
     </ClCompile>
-    <ClCompile Include="..\platform\win32\CCApplication.cpp">
-      <Filter>platform\win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\platform\win32\CCCommon.cpp">
-      <Filter>platform\win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\platform\win32\CCDevice.cpp">
-      <Filter>platform\win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\platform\win32\CCFileUtilsWin32.cpp">
-      <Filter>platform\win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\platform\win32\CCStdC.cpp">
-      <Filter>platform\win32</Filter>
-    </ClCompile>
     <ClCompile Include="..\math\CCAffineTransform.cpp">
       <Filter>math</Filter>
     </ClCompile>
@@ -718,9 +703,6 @@
     <ClCompile Include="..\storage\local-storage\LocalStorage.cpp">
       <Filter>storage</Filter>
     </ClCompile>
-    <ClCompile Include="..\platform\desktop\CCGLViewImpl.cpp">
-      <Filter>platform\desktop</Filter>
-    </ClCompile>
     <ClCompile Include="..\platform\CCGLView.cpp">
       <Filter>platform</Filter>
     </ClCompile>
@@ -1126,9 +1108,6 @@
     <ClCompile Include="..\ui\UIEditBox\UIEditBox.cpp">
       <Filter>ui\UIWidgets\EditBox</Filter>
     </ClCompile>
-    <ClCompile Include="..\ui\UIEditBox\UIEditBoxImplWin.cpp">
-      <Filter>ui\UIWidgets\EditBox</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControl.cpp">
       <Filter>extension\GUI\CCControlExtensions</Filter>
     </ClCompile>
@@ -1165,6 +1144,27 @@
     <ClCompile Include="..\ui\proj.win32\Win32InputBox.cpp">
       <Filter>ui\UIWidgets\EditBox</Filter>
     </ClCompile>
+    <ClCompile Include="..\platform\win32\CCApplication-win32.cpp">
+      <Filter>platform\win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\platform\win32\CCCommon-win32.cpp">
+      <Filter>platform\win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\platform\win32\CCDevice-win32.cpp">
+      <Filter>platform\win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\platform\win32\CCFileUtils-win32.cpp">
+      <Filter>platform\win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\platform\win32\CCStdC-win32.cpp">
+      <Filter>platform\win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\platform\desktop\CCGLViewImpl-desktop.cpp">
+      <Filter>platform\desktop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ui\UIEditBox\UIEditBoxImpl-win32.cpp">
+      <Filter>ui\UIWidgets\EditBox</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\physics\CCPhysicsBody.h">
@@ -1639,21 +1639,6 @@
     <ClInclude Include="..\platform\win32\compat\stdint.h">
       <Filter>platform\win32\compat</Filter>
     </ClInclude>
-    <ClInclude Include="..\platform\win32\CCApplication.h">
-      <Filter>platform\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\platform\win32\CCFileUtilsWin32.h">
-      <Filter>platform\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\platform\win32\CCGL.h">
-      <Filter>platform\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\platform\win32\CCPlatformDefine.h">
-      <Filter>platform\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\platform\win32\CCStdC.h">
-      <Filter>platform\win32</Filter>
-    </ClInclude>
     <ClInclude Include="..\math\CCAffineTransform.h">
       <Filter>math</Filter>
     </ClInclude>
@@ -1744,9 +1729,6 @@
     <ClInclude Include="..\storage\local-storage\LocalStorage.h">
       <Filter>storage</Filter>
     </ClInclude>
-    <ClInclude Include="..\platform\desktop\CCGLViewImpl.h">
-      <Filter>platform\desktop</Filter>
-    </ClInclude>
     <ClInclude Include="..\platform\CCGLView.h">
       <Filter>platform</Filter>
     </ClInclude>
@@ -2248,9 +2230,6 @@
     <ClInclude Include="..\ui\UIEditBox\UIEditBoxImpl.h">
       <Filter>ui\UIWidgets\EditBox</Filter>
     </ClInclude>
-    <ClInclude Include="..\ui\UIEditBox\UIEditBoxImplWin.h">
-      <Filter>ui\UIWidgets\EditBox</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControl.h">
       <Filter>extension\GUI\CCControlExtensions</Filter>
     </ClInclude>
@@ -2290,6 +2269,27 @@
     <ClInclude Include="..\ui\proj.win32\Win32InputBox.h">
       <Filter>ui\UIWidgets\EditBox</Filter>
     </ClInclude>
+    <ClInclude Include="..\platform\win32\CCApplication-win32.h">
+      <Filter>platform\win32</Filter>
+    </ClInclude>
+    <ClInclude Include="..\platform\win32\CCFileUtils-win32.h">
+      <Filter>platform\win32</Filter>
+    </ClInclude>
+    <ClInclude Include="..\platform\win32\CCGL-win32.h">
+      <Filter>platform\win32</Filter>
+    </ClInclude>
+    <ClInclude Include="..\platform\win32\CCPlatformDefine-win32.h">
+      <Filter>platform\win32</Filter>
+    </ClInclude>
+    <ClInclude Include="..\platform\win32\CCStdC-win32.h">
+      <Filter>platform\win32</Filter>
+    </ClInclude>
+    <ClInclude Include="..\platform\desktop\CCGLViewImpl-desktop.h">
+      <Filter>platform\desktop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ui\UIEditBox\UIEditBoxImpl-win32.h">
+      <Filter>ui\UIWidgets\EditBox</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\math\Mat4.inl">
diff --git a/cocos/audio/win32/MciPlayer.h b/cocos/audio/win32/MciPlayer.h
index ba13b12759..a004265fdb 100644
--- a/cocos/audio/win32/MciPlayer.h
+++ b/cocos/audio/win32/MciPlayer.h
@@ -1,7 +1,7 @@
 #ifndef _MCI_PLAYER_WIN32_H_
 #define _MCI_PLAYER_WIN32_H_
 
-#include "CCStdC.h"
+#include "platform/CCStdC.h"
 #include <mmsystem.h>
 #include <string>
 using namespace std;
diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h
index 328ea8d43f..f240c4f7e8 100644
--- a/cocos/cocos2d.h
+++ b/cocos/cocos2d.h
@@ -201,7 +201,7 @@ THE SOFTWARE.
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
     #include "platform/win32/CCApplication-win32.h"
-    #include "platform/desktop/CCGLViewImpl-win32.h"
+    #include "platform/desktop/CCGLViewImpl-desktop.h"
     #include "platform/win32/CCGL-win32.h"
     #include "platform/win32/CCStdC-win32.h"
 #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
diff --git a/tests/cpp-tests/proj.win32/main.h b/tests/cpp-tests/proj.win32/main.h
index e74708bdf2..095e22791f 100644
--- a/tests/cpp-tests/proj.win32/main.h
+++ b/tests/cpp-tests/proj.win32/main.h
@@ -8,6 +8,6 @@
 #include <tchar.h>
 
 // C RunTime Header Files
-#include "CCStdC.h"
+#include "platform/CCStdC.h"
 
 #endif    // __MAIN_H__