diff --git a/test_uphone/tests/Box2DTest/Box2dTest.cpp b/test_uphone/tests/Box2DTest/Box2dTest.cpp
index decda73d5e..d299870847 100644
--- a/test_uphone/tests/Box2DTest/Box2dTest.cpp
+++ b/test_uphone/tests/Box2DTest/Box2dTest.cpp
@@ -1,8 +1,5 @@
#include "Box2dTest.h"
#include "../testResource.h"
-//
-// #pragma comment(lib, "libgles_cm.lib")
-// //#pragma comment(lib, "libEGL.lib")
#define PTM_RATIO 32
enum
diff --git a/test_uphone/tests/Box2DTestBed/Box2dView.cpp b/test_uphone/tests/Box2DTestBed/Box2dView.cpp
index e7074a9817..7866b55d86 100644
--- a/test_uphone/tests/Box2DTestBed/Box2dView.cpp
+++ b/test_uphone/tests/Box2DTestBed/Box2dView.cpp
@@ -2,9 +2,6 @@
#include "GLES-Render.h"
#include "Test.h"
-//#pragma comment(lib, "libgles_cm.lib")
-//#pragma comment(lib, "libEGL.lib")
-
#define kAccelerometerFrequency 30
#define FRAMES_BETWEEN_PRESSES_FOR_DOUBLE_CLICK 10
diff --git a/test_win32/TestApplication.cpp b/test_win32/TestApplication.cpp
index 955afa1894..0e49a87a5d 100644
--- a/test_win32/TestApplication.cpp
+++ b/test_win32/TestApplication.cpp
@@ -1,5 +1,5 @@
#include "TestApplication.h"
-#include "winmain.h"
+#include "main.h"
#include "tests/controller.h"
using namespace cocos2d;
diff --git a/test_win32/winmain.cpp b/test_win32/main.cpp
similarity index 90%
rename from test_win32/winmain.cpp
rename to test_win32/main.cpp
index 19e1dd7cef..066747b412 100644
--- a/test_win32/winmain.cpp
+++ b/test_win32/main.cpp
@@ -1,4 +1,4 @@
-#include "winmain.h"
+#include "main.h"
#include "TestApplication.h"
HINSTANCE g_hInstance;
diff --git a/test_win32/winmain.h b/test_win32/main.h
similarity index 83%
rename from test_win32/winmain.h
rename to test_win32/main.h
index 912c385fba..f5ad256d5c 100644
--- a/test_win32/winmain.h
+++ b/test_win32/main.h
@@ -1,5 +1,5 @@
-#ifndef __WINMAIN_H__
-#define __WINMAIN_H__
+#ifndef __MAIN_H__
+#define __MAIN_H__
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files:
diff --git a/test_win32/test-win32.vcproj b/test_win32/test-win32.vcproj
index 9f39b80dfc..90cfa99b55 100644
--- a/test_win32/test-win32.vcproj
+++ b/test_win32/test-win32.vcproj
@@ -62,7 +62,7 @@
/>