diff --git a/cocos/2d/Android.mk b/cocos/2d/Android.mk
index d082c6cdd0..e79ad3db42 100644
--- a/cocos/2d/Android.mk
+++ b/cocos/2d/Android.mk
@@ -70,7 +70,6 @@ CCMenu.cpp \
 CCMenuItem.cpp \
 CCMotionStreak.cpp \
 CCNode.cpp \
-CCNotificationCenter.cpp \
 CCParallaxNode.cpp \
 CCParticleBatchNode.cpp \
 CCParticleExamples.cpp \
@@ -142,6 +141,7 @@ renderer/CCRenderMaterial.cpp \
 ../deprecated/CCString.cpp \
 ../deprecated/CCDictionary.cpp \
 ../deprecated/CCDeprecated.cpp \
+../deprecated/CCNotificationCenter.cpp \
 ../math/kazmath/kazmath/aabb.c \
 ../math/kazmath/kazmath/mat3.c \
 ../math/kazmath/kazmath/mat4.c \
diff --git a/cocos/2d/CCAction.cpp b/cocos/2d/CCAction.cpp
index 0ae3428605..0d758cc7f7 100644
--- a/cocos/2d/CCAction.cpp
+++ b/cocos/2d/CCAction.cpp
@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "CCActionInterval.h"
 #include "CCNode.h"
 #include "CCDirector.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 
 NS_CC_BEGIN
 //
diff --git a/cocos/2d/CCAnimation.h b/cocos/2d/CCAnimation.h
index 5cf4bb1d90..5f4299dd5e 100644
--- a/cocos/2d/CCAnimation.h
+++ b/cocos/2d/CCAnimation.h
@@ -29,7 +29,6 @@ THE SOFTWARE.
 
 #include "CCPlatformConfig.h"
 #include "CCRef.h"
-#include "CCArray.h"
 #include "CCValue.h"
 #include "CCGeometry.h"
 #include "CCSpriteFrame.h"
diff --git a/cocos/2d/CCAnimationCache.cpp b/cocos/2d/CCAnimationCache.cpp
index d16a92e8a5..fa5c1594f2 100644
--- a/cocos/2d/CCAnimationCache.cpp
+++ b/cocos/2d/CCAnimationCache.cpp
@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "CCAnimation.h"
 #include "CCSpriteFrame.h"
 #include "CCSpriteFrameCache.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include "platform/CCFileUtils.h"
 
 using namespace std;
diff --git a/cocos/2d/CCConfiguration.h b/cocos/2d/CCConfiguration.h
index 653031f43b..d3fd097cba 100644
--- a/cocos/2d/CCConfiguration.h
+++ b/cocos/2d/CCConfiguration.h
@@ -29,7 +29,6 @@ THE SOFTWARE.
 
 #include "CCRef.h"
 #include "CCGL.h"
-#include "CCString.h"
 #include "CCValue.h"
 #include <string>
 
diff --git a/cocos/2d/CCFontFNT.cpp b/cocos/2d/CCFontFNT.cpp
index cbc66fa32e..560a8d1fc0 100644
--- a/cocos/2d/CCFontFNT.cpp
+++ b/cocos/2d/CCFontFNT.cpp
@@ -29,7 +29,7 @@
 #include "CCDirector.h"
 #include "CCFontAtlas.h"
 #include "CCMap.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include "CCTextureCache.h"
 #include "ccUTF8.h"
 #include "platform/CCFileUtils.h"
diff --git a/cocos/2d/CCGLProgram.cpp b/cocos/2d/CCGLProgram.cpp
index 0dab9895cf..6b1c3d9663 100644
--- a/cocos/2d/CCGLProgram.cpp
+++ b/cocos/2d/CCGLProgram.cpp
@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include "ccMacros.h"
 #include "platform/CCFileUtils.h"
 #include "uthash.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 // extern
 #include "kazmath/GL/matrix.h"
 #include "kazmath/kazmath.h"
diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp
index 8a7325fc47..a9c9808405 100644
--- a/cocos/2d/CCLabel.cpp
+++ b/cocos/2d/CCLabel.cpp
@@ -38,6 +38,7 @@
 #include "CCEventType.h"
 #include "CCEventCustom.h"
 #include "platform/CCFileUtils.h"
+#include "deprecated/CCString.h"
 
 NS_CC_BEGIN
 
diff --git a/cocos/2d/CCLabelAtlas.cpp b/cocos/2d/CCLabelAtlas.cpp
index 1917ea4537..90d8d546f4 100644
--- a/cocos/2d/CCLabelAtlas.cpp
+++ b/cocos/2d/CCLabelAtlas.cpp
@@ -38,7 +38,7 @@ THE SOFTWARE.
 #include "platform/CCFileUtils.h"
 // external
 #include "kazmath/GL/matrix.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 
 NS_CC_BEGIN
 
diff --git a/cocos/2d/CCLabelBMFont.cpp b/cocos/2d/CCLabelBMFont.cpp
index 6f6b5b950d..1ce6e4708d 100644
--- a/cocos/2d/CCLabelBMFont.cpp
+++ b/cocos/2d/CCLabelBMFont.cpp
@@ -33,7 +33,7 @@ http://www.angelcode.com/products/bmfont/ (Free, Windows only)
 ****************************************************************************/
 #include "CCLabelBMFont.h"
 #include "CCDrawingPrimitives.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include "CCSprite.h"
 
 using namespace std;
diff --git a/cocos/2d/CCLabelTTF.cpp b/cocos/2d/CCLabelTTF.cpp
index 581d52274b..cf10e605fd 100644
--- a/cocos/2d/CCLabelTTF.cpp
+++ b/cocos/2d/CCLabelTTF.cpp
@@ -25,7 +25,7 @@ THE SOFTWARE.
 ****************************************************************************/
 #include "CCLabelTTF.h"
 #include "CCLabel.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 
 NS_CC_BEGIN
 
diff --git a/cocos/2d/CCLayer.cpp b/cocos/2d/CCLayer.cpp
index c2f93c2243..98c0ee6edc 100644
--- a/cocos/2d/CCLayer.cpp
+++ b/cocos/2d/CCLayer.cpp
@@ -46,7 +46,7 @@ THE SOFTWARE.
 #include "CCScene.h"
 #include "renderer/CCCustomCommand.h"
 #include "renderer/CCRenderer.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 
 NS_CC_BEGIN
 
diff --git a/cocos/2d/CCLayer.h b/cocos/2d/CCLayer.h
index fbc4285b70..a97f4771a5 100644
--- a/cocos/2d/CCLayer.h
+++ b/cocos/2d/CCLayer.h
@@ -45,6 +45,7 @@ NS_CC_BEGIN
  * @{
  */
 
+class __Set;
 class TouchScriptHandlerEntry;
 
 class EventListenerTouch;
@@ -77,10 +78,10 @@ public:
     CC_DEPRECATED_ATTRIBUTE virtual void ccTouchesEnded(__Set *pTouches, Event *pEvent) final {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);}
     CC_DEPRECATED_ATTRIBUTE virtual void ccTouchesCancelled(__Set *pTouches, Event *pEvent) final {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);}
     
-	/* Callback function should not be deprecated, it will generate lots of warnings.
-	Since 'setTouchEnabled' was deprecated, it will make warnings if developer overrides onTouchXXX and invokes setTouchEnabled(true) instead of using EventDispatcher::addEventListenerWithXXX.
+    /* Callback function should not be deprecated, it will generate lots of warnings.
+       Since 'setTouchEnabled' was deprecated, it will make warnings if developer overrides onTouchXXX and invokes setTouchEnabled(true) instead of using EventDispatcher::addEventListenerWithXXX.
     */
-	virtual bool onTouchBegan(Touch *touch, Event *unused_event); 
+    virtual bool onTouchBegan(Touch *touch, Event *unused_event); 
     virtual void onTouchMoved(Touch *touch, Event *unused_event); 
     virtual void onTouchEnded(Touch *touch, Event *unused_event); 
     virtual void onTouchCancelled(Touch *touch, Event *unused_event);
diff --git a/cocos/2d/CCMenu.cpp b/cocos/2d/CCMenu.cpp
index da226b8d28..6a88406905 100644
--- a/cocos/2d/CCMenu.cpp
+++ b/cocos/2d/CCMenu.cpp
@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include "CCStdC.h"
 #include "CCInteger.h"
 #include "CCEventListenerTouch.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 
 #include <vector>
 #include <stdarg.h>
diff --git a/cocos/2d/CCMenuItem.cpp b/cocos/2d/CCMenuItem.cpp
index 3615905f6b..8f2e15ca75 100644
--- a/cocos/2d/CCMenuItem.cpp
+++ b/cocos/2d/CCMenuItem.cpp
@@ -31,6 +31,7 @@ THE SOFTWARE.
 #include "CCLabelAtlas.h"
 #include "CCLabel.h"
 #include "CCScriptSupport.h"
+#include "deprecated/CCString.h"
 #include <stdarg.h>
 #include <cstring>
 
diff --git a/cocos/2d/CCMenuItem.h b/cocos/2d/CCMenuItem.h
index 9233921202..cc85ae34b8 100644
--- a/cocos/2d/CCMenuItem.h
+++ b/cocos/2d/CCMenuItem.h
@@ -34,7 +34,6 @@ THE SOFTWARE.
 // cocos2d includes
 #include "CCNode.h"
 #include "CCProtocols.h"
-#include "CCArray.h"
 
 NS_CC_BEGIN
 
diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp
index 76e8c678e0..5970b52c8a 100644
--- a/cocos/2d/CCNode.cpp
+++ b/cocos/2d/CCNode.cpp
@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 #include <algorithm>
 
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include "ccCArray.h"
 #include "TransformUtils.h"
 #include "CCGrid.h"
diff --git a/cocos/2d/CCParticleSystem.h b/cocos/2d/CCParticleSystem.h
index 9cd9823b70..cf1d30e36b 100644
--- a/cocos/2d/CCParticleSystem.h
+++ b/cocos/2d/CCParticleSystem.h
@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include "CCProtocols.h"
 #include "CCNode.h"
 #include "CCValue.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 
 NS_CC_BEGIN
 
diff --git a/cocos/2d/CCScene.cpp b/cocos/2d/CCScene.cpp
index a03a1b0fbc..9b5069d5f8 100644
--- a/cocos/2d/CCScene.cpp
+++ b/cocos/2d/CCScene.cpp
@@ -31,6 +31,7 @@ THE SOFTWARE.
 #include "CCSprite.h"
 #include "CCSpriteBatchNode.h"
 #include "CCPhysicsWorld.h"
+#include "deprecated/CCString.h"
 
 NS_CC_BEGIN
 
diff --git a/cocos/2d/CCScriptSupport.h b/cocos/2d/CCScriptSupport.h
index c24f41fdd5..feebdde34d 100644
--- a/cocos/2d/CCScriptSupport.h
+++ b/cocos/2d/CCScriptSupport.h
@@ -33,7 +33,6 @@
 #include "CCTouch.h"
 #include "CCEventTouch.h"
 #include "CCEventKeyboard.h"
-#include "CCSet.h"
 #include <map>
 #include <string>
 #include <list>
diff --git a/cocos/2d/CCSprite.cpp b/cocos/2d/CCSprite.cpp
index e688b35668..fd60eca586 100644
--- a/cocos/2d/CCSprite.cpp
+++ b/cocos/2d/CCSprite.cpp
@@ -24,14 +24,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
-
+#include "CCSprite.h"
 #include "CCSpriteBatchNode.h"
-#include <string.h>
-#include <algorithm>
 #include "CCAnimation.h"
 #include "CCAnimationCache.h"
 #include "ccConfig.h"
-#include "CCSprite.h"
 #include "CCSpriteFrame.h"
 #include "CCSpriteFrameCache.h"
 #include "CCTextureCache.h"
@@ -52,9 +49,10 @@ THE SOFTWARE.
 // external
 #include "kazmath/GL/matrix.h"
 #include "kazmath/kazmath.h"
+#include "deprecated/CCString.h"
 
-
-using namespace std;
+#include <string.h>
+#include <algorithm>
 
 NS_CC_BEGIN
 
diff --git a/cocos/2d/CCSprite.h b/cocos/2d/CCSprite.h
index d117f78435..8321412551 100644
--- a/cocos/2d/CCSprite.h
+++ b/cocos/2d/CCSprite.h
@@ -32,7 +32,6 @@ THE SOFTWARE.
 #include "CCProtocols.h"
 #include "CCTextureAtlas.h"
 #include "ccTypes.h"
-#include "CCDictionary.h"
 #include <string>
 #ifdef EMSCRIPTEN
 #include "CCGLBufferedNode.h"
diff --git a/cocos/2d/CCSpriteBatchNode.cpp b/cocos/2d/CCSpriteBatchNode.cpp
index aae535904a..edeca1948d 100644
--- a/cocos/2d/CCSpriteBatchNode.cpp
+++ b/cocos/2d/CCSpriteBatchNode.cpp
@@ -27,9 +27,6 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "CCSpriteBatchNode.h"
-
-#include <algorithm>
-
 #include "ccConfig.h"
 #include "CCSprite.h"
 #include "CCGrid.h"
@@ -48,6 +45,10 @@ THE SOFTWARE.
 // external
 #include "kazmath/GL/matrix.h"
 
+#include "deprecated/CCString.h" // For StringUtils::format
+
+#include <algorithm>
+
 NS_CC_BEGIN
 
 /*
diff --git a/cocos/2d/CCSpriteFrameCache.cpp b/cocos/2d/CCSpriteFrameCache.cpp
index bc89ef1b69..ec1abfec0e 100644
--- a/cocos/2d/CCSpriteFrameCache.cpp
+++ b/cocos/2d/CCSpriteFrameCache.cpp
@@ -35,7 +35,7 @@ THE SOFTWARE.
 #include "CCSprite.h"
 #include "TransformUtils.h"
 #include "platform/CCFileUtils.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include "CCArray.h"
 #include "CCDictionary.h"
 #include "CCDirector.h"
diff --git a/cocos/2d/CCTMXLayer.cpp b/cocos/2d/CCTMXLayer.cpp
index 983d7e9d14..06ca065b2f 100644
--- a/cocos/2d/CCTMXLayer.cpp
+++ b/cocos/2d/CCTMXLayer.cpp
@@ -34,6 +34,8 @@ THE SOFTWARE.
 #include "ccCArray.h"
 #include "CCDirector.h"
 
+#include "deprecated/CCString.h" // For StringUtils::format
+
 NS_CC_BEGIN
 
 
diff --git a/cocos/2d/CCTMXTiledMap.cpp b/cocos/2d/CCTMXTiledMap.cpp
index bd42a02bb8..19a909de31 100644
--- a/cocos/2d/CCTMXTiledMap.cpp
+++ b/cocos/2d/CCTMXTiledMap.cpp
@@ -28,6 +28,8 @@ THE SOFTWARE.
 #include "CCTMXXMLParser.h"
 #include "CCTMXLayer.h"
 #include "CCSprite.h"
+#include "deprecated/CCString.h" // For StringUtils::format
+
 #include <algorithm>
 
 NS_CC_BEGIN
diff --git a/cocos/2d/CCTexture2D.cpp b/cocos/2d/CCTexture2D.cpp
index e8235d614a..8e2181e32d 100644
--- a/cocos/2d/CCTexture2D.cpp
+++ b/cocos/2d/CCTexture2D.cpp
@@ -44,6 +44,7 @@ THE SOFTWARE.
 #include "ccGLStateCache.h"
 #include "CCShaderCache.h"
 #include "platform/CCDevice.h"
+#include "deprecated/CCString.h"
 
 #if CC_ENABLE_CACHE_TEXTURE_DATA
     #include "CCTextureCache.h"
diff --git a/cocos/2d/CCTextureAtlas.cpp b/cocos/2d/CCTextureAtlas.cpp
index 208cc24329..ed091744c1 100644
--- a/cocos/2d/CCTextureAtlas.cpp
+++ b/cocos/2d/CCTextureAtlas.cpp
@@ -39,7 +39,7 @@ THE SOFTWARE.
 
 // support
 #include "CCTexture2D.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include <stdlib.h>
 #include "CCEventDispatcher.h"
 #include "CCEventListenerCustom.h"
diff --git a/cocos/2d/CCTextureCache.cpp b/cocos/2d/CCTextureCache.cpp
index eb7d443349..029df4218a 100644
--- a/cocos/2d/CCTextureCache.cpp
+++ b/cocos/2d/CCTextureCache.cpp
@@ -37,7 +37,7 @@ THE SOFTWARE.
 #include "platform/CCFileUtils.h"
 #include "ccUtils.h"
 #include "CCScheduler.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 
 
 #ifdef EMSCRIPTEN
diff --git a/cocos/2d/CCTileMapAtlas.cpp b/cocos/2d/CCTileMapAtlas.cpp
index 17dd396116..193b5fe5e0 100644
--- a/cocos/2d/CCTileMapAtlas.cpp
+++ b/cocos/2d/CCTileMapAtlas.cpp
@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "ccConfig.h"
 #include "CCInteger.h"
 #include "CCDirector.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include <sstream>
 
 NS_CC_BEGIN
diff --git a/cocos/2d/CMakeLists.txt b/cocos/2d/CMakeLists.txt
index 48d08535d4..b9bb67b0ec 100644
--- a/cocos/2d/CMakeLists.txt
+++ b/cocos/2d/CMakeLists.txt
@@ -103,7 +103,6 @@ set(COCOS2D_SRC
   base64.cpp
   ccUtils.cpp
   CCVertex.cpp
-  CCNotificationCenter.cpp
   TGAlib.cpp
   ZipUtils.cpp
   ccCArray.cpp
@@ -145,6 +144,7 @@ set(COCOS2D_SRC
   renderer/CCRenderer.cpp
   renderer/CCRenderMaterial.cpp
   ../deprecated/CCDeprecated.cpp
+  ../deprecated/CCNotificationCenter.cpp
   ../../external/edtaa3func/edtaa3func.cpp
 )
 
diff --git a/cocos/2d/cocos2d.h b/cocos/2d/cocos2d.h
index 6ed03d1961..bf59256bea 100644
--- a/cocos/2d/cocos2d.h
+++ b/cocos/2d/cocos2d.h
@@ -59,19 +59,11 @@ THE SOFTWARE.
 
 // cocoa
 #include "CCAffineTransform.h"
-#include "CCDictionary.h"
 #include "CCRef.h"
-#include "CCArray.h"
 #include "CCVector.h"
 #include "CCMap.h"
 #include "CCGeometry.h"
-#include "CCSet.h"
 #include "CCAutoreleasePool.h"
-#include "CCInteger.h"
-#include "CCFloat.h"
-#include "CCDouble.h"
-#include "CCBool.h"
-#include "CCString.h"
 #include "CCNS.h"
 #include "CCData.h"
 #include "CCValue.h"
@@ -230,7 +222,6 @@ THE SOFTWARE.
 
 // support
 #include "ccUTF8.h"
-#include "CCNotificationCenter.h"
 #include "CCProfiling.h"
 #include "CCConsole.h"
 #include "CCUserDefault.h"
@@ -277,8 +268,19 @@ THE SOFTWARE.
 #include "CCComponentContainer.h"
 
 // Deprecated include
+#include "deprecated/CCDictionary.h"
+#include "deprecated/CCArray.h"
+#include "deprecated/CCSet.h"
+#include "deprecated/CCInteger.h"
+#include "deprecated/CCFloat.h"
+#include "deprecated/CCDouble.h"
+#include "deprecated/CCBool.h"
+#include "deprecated/CCString.h"
+#include "deprecated/CCNotificationCenter.h"
+// CCDeprecated.h must be included at the end
 #include "deprecated/CCDeprecated.h"
 
+
 NS_CC_BEGIN
 
 CC_DLL const char* cocos2dVersion();
diff --git a/cocos/2d/platform/android/Android.mk b/cocos/2d/platform/android/Android.mk
index 0dc5a9cb13..6ac94dbb80 100644
--- a/cocos/2d/platform/android/Android.mk
+++ b/cocos/2d/platform/android/Android.mk
@@ -26,6 +26,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/../.. \
+                    $(LOCAL_PATH)/../../.. \
                     $(LOCAL_PATH)/../../../base \
                     $(LOCAL_PATH)/../../../math/kazmath \
                     $(LOCAL_PATH)/../../../physics
diff --git a/cocos/2d/platform/android/CCGLView.cpp b/cocos/2d/platform/android/CCGLView.cpp
index 2f826d6782..3015993c0b 100644
--- a/cocos/2d/platform/android/CCGLView.cpp
+++ b/cocos/2d/platform/android/CCGLView.cpp
@@ -27,7 +27,6 @@ THE SOFTWARE.
 #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
 
 #include "CCGLView.h"
-#include "CCSet.h"
 #include "CCDirector.h"
 #include "ccMacros.h"
 #include "jni/IMEJni.h"
diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp b/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
index 0f5cfa6b12..20313d6cc5 100644
--- a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
+++ b/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "JniHelper.h"
 #include "CCFileUtilsAndroid.h"
 #include "android/asset_manager_jni.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include "Java_org_cocos2dx_lib_Cocos2dxHelper.h"
 
 #define  LOG_TAG    "Java_org_cocos2dx_lib_Cocos2dxHelper.cpp"
diff --git a/cocos/2d/platform/android/jni/TouchesJni.cpp b/cocos/2d/platform/android/jni/TouchesJni.cpp
index 296927f53b..d6c33ad564 100644
--- a/cocos/2d/platform/android/jni/TouchesJni.cpp
+++ b/cocos/2d/platform/android/jni/TouchesJni.cpp
@@ -21,7 +21,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
-#include "CCSet.h"
 #include "CCDirector.h"
 #include "CCEventKeyboard.h"
 #include "CCGLView.h"
diff --git a/cocos/2d/platform/apple/CCFileUtilsApple.mm b/cocos/2d/platform/apple/CCFileUtilsApple.mm
index 1267fecce3..23fe27f883 100644
--- a/cocos/2d/platform/apple/CCFileUtilsApple.mm
+++ b/cocos/2d/platform/apple/CCFileUtilsApple.mm
@@ -27,7 +27,7 @@ THE SOFTWARE.
 
 #include <string>
 #include <stack>
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include "CCFileUtils.h"
 #include "CCDirector.h"
 #include "CCSAXParser.h"
diff --git a/cocos/2d/platform/linux/CCFileUtilsLinux.cpp b/cocos/2d/platform/linux/CCFileUtilsLinux.cpp
index a2c4cb30ad..8bfd43534b 100644
--- a/cocos/2d/platform/linux/CCFileUtilsLinux.cpp
+++ b/cocos/2d/platform/linux/CCFileUtilsLinux.cpp
@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include "platform/CCCommon.h"
 #include "ccMacros.h"
 #include "CCApplication.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdio.h>
diff --git a/cocos/audio/android/Android.mk b/cocos/audio/android/Android.mk
index 136e0fc3b2..099f4bd016 100644
--- a/cocos/audio/android/Android.mk
+++ b/cocos/audio/android/Android.mk
@@ -12,6 +12,7 @@ LOCAL_SRC_FILES := cddSimpleAudioEngine.cpp \
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \
+                    $(LOCAL_PATH)/../.. \
                     $(LOCAL_PATH)/../../math/kazmath \
                     $(LOCAL_PATH)/../../2d \
                     $(LOCAL_PATH)/../../2d/platform/android \
diff --git a/cocos/audio/android/ccdandroidUtils.cpp b/cocos/audio/android/ccdandroidUtils.cpp
index 3a8e8a462f..f167bbe1c6 100644
--- a/cocos/audio/android/ccdandroidUtils.cpp
+++ b/cocos/audio/android/ccdandroidUtils.cpp
@@ -39,9 +39,9 @@ namespace CocosDenshion {
             // Removing `assets` since it isn't needed for the API of playing sound.
             size_t pos = fullPath.find("assets/");
             if (pos == 0)
-                {
-                    fullPath = fullPath.substr(strlen("assets/"));
-                }
+            {
+                fullPath = fullPath.substr(strlen("assets/"));
+            }
             return fullPath;
         }
     }
diff --git a/cocos/base/CCDataVisitor.cpp b/cocos/base/CCDataVisitor.cpp
index a908ead8bd..23755cab6d 100644
--- a/cocos/base/CCDataVisitor.cpp
+++ b/cocos/base/CCDataVisitor.cpp
@@ -27,7 +27,7 @@
 #include "CCInteger.h"
 #include "CCFloat.h"
 #include "CCDouble.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include "CCArray.h"
 #include "CCDictionary.h"
 #include "CCSet.h"
diff --git a/cocos/deprecated/CCArray.cpp b/cocos/deprecated/CCArray.cpp
index 62af0b697e..b5f949d048 100644
--- a/cocos/deprecated/CCArray.cpp
+++ b/cocos/deprecated/CCArray.cpp
@@ -25,7 +25,7 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "CCArray.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include "platform/CCFileUtils.h"
 
 NS_CC_BEGIN
diff --git a/cocos/deprecated/CCDictionary.cpp b/cocos/deprecated/CCDictionary.cpp
index 9c4dfb791c..47b60d9b2e 100644
--- a/cocos/deprecated/CCDictionary.cpp
+++ b/cocos/deprecated/CCDictionary.cpp
@@ -24,10 +24,10 @@
  ****************************************************************************/
 
 #include "CCDictionary.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include "CCInteger.h"
 #include "platform/CCFileUtils.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include "CCBool.h"
 #include "CCInteger.h"
 #include "CCFloat.h"
diff --git a/cocos/deprecated/CCDictionary.h b/cocos/deprecated/CCDictionary.h
index 343fd05520..e105c295ed 100644
--- a/cocos/deprecated/CCDictionary.h
+++ b/cocos/deprecated/CCDictionary.h
@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "uthash.h"
 #include "CCRef.h"
 #include "CCArray.h"
-#include "CCString.h"
+#include "deprecated/CCString.h"
 
 NS_CC_BEGIN
 
diff --git a/cocos/deprecated/CCString.cpp b/cocos/deprecated/CCString.cpp
index 7298023df3..34194426e7 100644
--- a/cocos/deprecated/CCString.cpp
+++ b/cocos/deprecated/CCString.cpp
@@ -23,7 +23,7 @@ Copyright (c) 2013-2014 Chukong Technologies
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCString.h"
+#include "deprecated/CCString.h"
 #include "platform/CCFileUtils.h"
 #include "ccMacros.h"
 #include <stdlib.h>