Merge pull request #6378 from ricardoquesada/include_fixes_squash

Squashed commit of the following:

build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-266d376687910ea1333f99bca86d98b579746e1f
+086c0c076d472cd5dd97cc03cfe600085e508d41

build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-8239dbcfed49ba90f82f4adc053e9946203277c5
+89a1e8751e69f05947a7bb2bb20633a91773e937

cocos/2d/Android.mk

@@ -106,7 +106,7 @@ CCUserDefaultAndroid.cpp \
 ccUTF8.cpp \
 ccUtils.cpp \
 CCVertex.cpp \
-cocos2d.cpp \
+../cocos2d.cpp \
 TGAlib.cpp \
 TransformUtils.cpp \
 ZipUtils.cpp \

cocos/2d/CCAction.cpp

@@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "CCAction.h"
-#include "CCActionInterval.h"
-#include "CCNode.h"
-#include "CCDirector.h"
+#include "2d/CCAction.h"
+#include "2d/CCActionInterval.h"
+#include "2d/CCNode.h"
+#include "2d/CCDirector.h"
 #include "deprecated/CCString.h"
 
 NS_CC_BEGIN

cocos/2d/CCAction.h

@@ -28,8 +28,8 @@ THE SOFTWARE.
 #ifndef __ACTIONS_CCACTION_H__
 #define __ACTIONS_CCACTION_H__
 
-#include "CCRef.h"
-#include "CCGeometry.h"
+#include "base/CCRef.h"
+#include "base/CCGeometry.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionCamera.cpp

@@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "CCActionCamera.h"
-#include "CCNode.h"
+#include "2d/CCActionCamera.h"
+#include "2d/CCNode.h"
 #include "CCStdC.h"
 
 NS_CC_BEGIN

cocos/2d/CCActionCamera.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __CCCAMERA_ACTION_H__
 #define __CCCAMERA_ACTION_H__
 
-#include "CCActionInterval.h"
+#include "2d/CCActionInterval.h"
 #include "math/CCMath.h"
 
 NS_CC_BEGIN

cocos/2d/CCActionCatmullRom.cpp

@@ -29,8 +29,8 @@
  *
  * Adapted from cocos2d-x to cocos2d-iphone by Ricardo Quesada
  */
-#include "ccMacros.h"
-#include "CCActionCatmullRom.h"
+#include "2d/ccMacros.h"
+#include "2d/CCActionCatmullRom.h"
 
 using namespace std;
 

cocos/2d/CCActionCatmullRom.h

@@ -37,9 +37,9 @@
 
 #include <vector>
 
-#include "CCActionInterval.h"
-#include "CCNode.h"
-#include "CCGeometry.h"
+#include "2d/CCActionInterval.h"
+#include "2d/CCNode.h"
+#include "base/CCGeometry.h"
 
 NS_CC_BEGIN;
 

cocos/2d/CCActionEase.cpp

@@ -31,8 +31,8 @@ THE SOFTWARE.
  * by http://github.com/NikhilK
  */
 
-#include "CCActionEase.h"
-#include "CCTweenFunction.h"
+#include "2d/CCActionEase.h"
+#include "2d/CCTweenFunction.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionEase.h

@@ -27,7 +27,7 @@ THE SOFTWARE.
 #ifndef __ACTION_CCEASE_ACTION_H__
 #define __ACTION_CCEASE_ACTION_H__
 
-#include "CCActionInterval.h"
+#include "2d/CCActionInterval.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionGrid.cpp

@@ -23,8 +23,8 @@ 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 "CCActionGrid.h"
-#include "CCDirector.h"
+#include "2d/CCActionGrid.h"
+#include "2d/CCDirector.h"
 #include "CCGrid.h"
 #include "CCNodeGrid.h"
 

cocos/2d/CCActionGrid.h

@@ -26,8 +26,8 @@ THE SOFTWARE.
 #ifndef __ACTION_CCGRID_ACTION_H__
 #define __ACTION_CCGRID_ACTION_H__
 
-#include "CCActionInterval.h"
-#include "CCActionInstant.h"
+#include "2d/CCActionInterval.h"
+#include "2d/CCActionInstant.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionGrid3D.cpp

@@ -23,8 +23,8 @@ 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 "CCActionGrid3D.h"
-#include "CCDirector.h"
+#include "2d/CCActionGrid3D.h"
+#include "2d/CCDirector.h"
 #include <stdlib.h>
 
 NS_CC_BEGIN

cocos/2d/CCActionGrid3D.h

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #ifndef __ACTION_CCGRID3D_ACTION_H__
 #define __ACTION_CCGRID3D_ACTION_H__
 
-#include "CCActionGrid.h"
+#include "2d/CCActionGrid.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionInstant.cpp

@@ -25,9 +25,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCActionInstant.h"
-#include "CCNode.h"
-#include "CCSprite.h"
+#include "2d/CCActionInstant.h"
+#include "2d/CCNode.h"
+#include "2d/CCSprite.h"
 #include "CCScriptSupport.h"
 
 #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))

cocos/2d/CCActionInstant.h

@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include <functional>
 
 #include "CCStdC.h"
-#include "CCAction.h"
+#include "2d/CCAction.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionInterval.cpp

@@ -25,11 +25,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "CCActionInterval.h"
-#include "CCSprite.h"
-#include "CCNode.h"
+#include "2d/CCActionInterval.h"
+#include "2d/CCSprite.h"
+#include "2d/CCNode.h"
 #include "CCStdC.h"
-#include "CCActionInstant.h"
+#include "2d/CCActionInstant.h"
 #include <stdarg.h>
 
 NS_CC_BEGIN

cocos/2d/CCActionInterval.h

@@ -28,10 +28,10 @@ THE SOFTWARE.
 #ifndef __ACTION_CCINTERVAL_ACTION_H__
 #define __ACTION_CCINTERVAL_ACTION_H__
 
-#include "CCNode.h"
-#include "CCAction.h"
-#include "CCProtocols.h"
-#include "CCSpriteFrame.h"
+#include "2d/CCNode.h"
+#include "2d/CCAction.h"
+#include "2d/CCProtocols.h"
+#include "2d/CCSpriteFrame.h"
 #include "CCAnimation.h"
 #include "CCVector.h"
 #include <vector>

cocos/2d/CCActionManager.cpp

@@ -26,12 +26,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "CCActionManager.h"
-#include "CCNode.h"
+#include "2d/CCActionManager.h"
+#include "2d/CCNode.h"
 #include "CCScheduler.h"
-#include "ccMacros.h"
-#include "ccCArray.h"
-#include "uthash.h"
+#include "2d/ccMacros.h"
+#include "2d/ccCArray.h"
+#include "2d/uthash.h"
 
 NS_CC_BEGIN
 //

cocos/2d/CCActionManager.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #ifndef __ACTION_CCACTION_MANAGER_H__
 #define __ACTION_CCACTION_MANAGER_H__
 
-#include "CCAction.h"
+#include "2d/CCAction.h"
 #include "CCVector.h"
-#include "CCRef.h"
+#include "base/CCRef.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionPageTurn3D.cpp

@@ -23,7 +23,7 @@ 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 "CCActionPageTurn3D.h"
+#include "2d/CCActionPageTurn3D.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionPageTurn3D.h

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #ifndef __ACTION_CCPAGETURN3D_ACTION_H__
 #define __ACTION_CCPAGETURN3D_ACTION_H__
 
-#include "CCActionGrid3D.h"
+#include "2d/CCActionGrid3D.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionProgressTimer.cpp

@@ -23,8 +23,8 @@ 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 "CCActionProgressTimer.h"
-#include "CCProgressTimer.h"
+#include "2d/CCActionProgressTimer.h"
+#include "2d/CCProgressTimer.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionProgressTimer.h

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #ifndef __ACTION_CCPROGRESS_TIMER_H__
 #define __ACTION_CCPROGRESS_TIMER_H__
 
-#include "CCActionInterval.h"
+#include "2d/CCActionInterval.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionTiledGrid.cpp

@@ -23,9 +23,9 @@ 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 "CCActionTiledGrid.h"
-#include "CCDirector.h"
-#include "ccMacros.h"
+#include "2d/CCActionTiledGrid.h"
+#include "2d/CCDirector.h"
+#include "2d/ccMacros.h"
 #include "CCGrid.h"
 #include "CCNodeGrid.h"
 #include <stdlib.h>

cocos/2d/CCActionTiledGrid.h

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #ifndef __ACTION_CCTILEDGRID_ACTION_H__
 #define __ACTION_CCTILEDGRID_ACTION_H__
 
-#include "CCActionGrid.h"
+#include "2d/CCActionGrid.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionTween.cpp

@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "CCActionTween.h"
+#include "2d/CCActionTween.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionTween.h

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #ifndef __CCACTIONTWEEN_H__
 #define __CCACTIONTWEEN_H__
 
-#include "CCActionInterval.h"
+#include "2d/CCActionInterval.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCAnimation.cpp

@@ -26,10 +26,10 @@ THE SOFTWARE.
 ****************************************************************************/
 #include "CCAnimation.h"
 #include "CCTextureCache.h"
-#include "CCTexture2D.h"
-#include "ccMacros.h"
-#include "CCSpriteFrame.h"
-#include "CCDirector.h"
+#include "2d/CCTexture2D.h"
+#include "2d/ccMacros.h"
+#include "2d/CCSpriteFrame.h"
+#include "2d/CCDirector.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCAnimation.h

@@ -28,10 +28,10 @@ THE SOFTWARE.
 #define __CC_ANIMATION_H__
 
 #include "CCPlatformConfig.h"
-#include "CCRef.h"
+#include "base/CCRef.h"
 #include "CCValue.h"
-#include "CCGeometry.h"
-#include "CCSpriteFrame.h"
+#include "base/CCGeometry.h"
+#include "2d/CCSpriteFrame.h"
 #include "CCVector.h"
 
 #include <string>

cocos/2d/CCAnimationCache.cpp

@@ -25,12 +25,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "CCAnimationCache.h"
-#include "ccMacros.h"
+#include "2d/ccMacros.h"
 #include "CCAnimation.h"
-#include "CCSpriteFrame.h"
-#include "CCSpriteFrameCache.h"
+#include "2d/CCSpriteFrame.h"
+#include "2d/CCSpriteFrameCache.h"
 #include "deprecated/CCString.h"
-#include "platform/CCFileUtils.h"
+#include "2d/platform/CCFileUtils.h"
 
 using namespace std;
 

cocos/2d/CCAnimationCache.h

@@ -27,7 +27,7 @@ THE SOFTWARE.
 #ifndef __CC_ANIMATION_CACHE_H__
 #define __CC_ANIMATION_CACHE_H__
 
-#include "CCRef.h"
+#include "base/CCRef.h"
 #include "CCMap.h"
 #include "CCValue.h"
 

cocos/2d/CCAtlasNode.cpp

@@ -26,15 +26,15 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "CCAtlasNode.h"
-#include "CCTextureAtlas.h"
+#include "2d/CCTextureAtlas.h"
 #include "CCTextureCache.h"
-#include "CCDirector.h"
-#include "CCGLProgram.h"
+#include "2d/CCDirector.h"
+#include "2d/CCGLProgram.h"
 #include "CCShaderCache.h"
 #include "ccGLStateCache.h"
-#include "CCDirector.h"
+#include "2d/CCDirector.h"
 #include "TransformUtils.h"
-#include "renderer/CCRenderer.h"
+#include "2d/renderer/CCRenderer.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCAtlasNode.h

@@ -28,10 +28,10 @@ THE SOFTWARE.
 #ifndef __CCATLAS_NODE_H__
 #define __CCATLAS_NODE_H__
 
-#include "CCNode.h"
-#include "CCProtocols.h"
-#include "ccTypes.h"
-#include "renderer/CCQuadCommand.h"
+#include "2d/CCNode.h"
+#include "2d/CCProtocols.h"
+#include "2d/ccTypes.h"
+#include "2d/renderer/CCQuadCommand.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCClippingNode.cpp

@@ -26,14 +26,14 @@
  */
 
 #include "CCClippingNode.h"
-#include "CCGLProgram.h"
+#include "2d/CCGLProgram.h"
 #include "CCShaderCache.h"
-#include "CCDirector.h"
+#include "2d/CCDirector.h"
 #include "CCDrawingPrimitives.h"
 
-#include "renderer/CCRenderer.h"
-#include "renderer/CCGroupCommand.h"
-#include "renderer/CCCustomCommand.h"
+#include "2d/renderer/CCRenderer.h"
+#include "2d/renderer/CCGroupCommand.h"
+#include "2d/renderer/CCCustomCommand.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCClippingNode.h

@@ -28,10 +28,10 @@
 #ifndef __MISCNODE_CCCLIPPING_NODE_H__
 #define __MISCNODE_CCCLIPPING_NODE_H__
 
-#include "CCNode.h"
+#include "2d/CCNode.h"
 #include "CCGL.h"
-#include "renderer/CCGroupCommand.h"
-#include "renderer/CCCustomCommand.h"
+#include "2d/renderer/CCGroupCommand.h"
+#include "2d/renderer/CCCustomCommand.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCComponent.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __CC_FRAMEWORK_COMPONENT_H__
 #define __CC_FRAMEWORK_COMPONENT_H__
 
-#include "CCRef.h"
+#include "base/CCRef.h"
 #include "CCScriptSupport.h"
 #include <string>
 

cocos/2d/CCComponentContainer.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 #include "CCComponentContainer.h"
 #include "CCComponent.h"
-#include "CCDirector.h"
+#include "2d/CCDirector.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCConfiguration.cpp

@@ -26,9 +26,9 @@ THE SOFTWARE.
 
 #include "CCConfiguration.h"
 #include <string.h>
-#include "ccMacros.h"
-#include "ccConfig.h"
-#include "platform/CCFileUtils.h"
+#include "2d/ccMacros.h"
+#include "2d/ccConfig.h"
+#include "2d/platform/CCFileUtils.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCConfiguration.h

@@ -27,7 +27,7 @@ THE SOFTWARE.
 #ifndef __CCCONFIGURATION_H__
 #define __CCCONFIGURATION_H__
 
-#include "CCRef.h"
+#include "base/CCRef.h"
 #include "CCGL.h"
 #include "CCValue.h"
 #include <string>

cocos/2d/CCDirector.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 ****************************************************************************/
 
 // cocos2d includes
-#include "CCDirector.h"
+#include "2d/CCDirector.h"
 
 // standard includes
 #include <string>
@@ -36,29 +36,29 @@ THE SOFTWARE.
 #include "CCNS.h"
 #include "CCScene.h"
 #include "CCScheduler.h"
-#include "ccMacros.h"
+#include "2d/ccMacros.h"
 #include "CCTransition.h"
 #include "CCTextureCache.h"
-#include "CCSpriteFrameCache.h"
+#include "2d/CCSpriteFrameCache.h"
 #include "CCAutoreleasePool.h"
-#include "platform/CCFileUtils.h"
+#include "2d/platform/CCFileUtils.h"
 #include "CCApplication.h"
 #include "CCFontFNT.h"
 #include "CCFontAtlasCache.h"
-#include "CCActionManager.h"
+#include "2d/CCActionManager.h"
 #include "CCAnimationCache.h"
-#include "CCTouch.h"
+#include "2d/CCTouch.h"
 #include "CCUserDefault.h"
 #include "ccGLStateCache.h"
 #include "CCShaderCache.h"
 #include "CCProfiling.h"
-#include "platform/CCImage.h"
+#include "2d/platform/CCImage.h"
 #include "CCGLView.h"
 #include "CCConfiguration.h"
-#include "CCEventDispatcher.h"
-#include "CCEventCustom.h"
+#include "2d/CCEventDispatcher.h"
+#include "2d/CCEventCustom.h"
 #include "CCFontFreeType.h"
-#include "renderer/CCRenderer.h"
+#include "2d/renderer/CCRenderer.h"
 #include "CCConsole.h"
 
 #include "math/CCMath.h"

cocos/2d/CCDirector.h

@@ -28,11 +28,11 @@ THE SOFTWARE.
 #ifndef __CCDIRECTOR_H__
 #define __CCDIRECTOR_H__
 
-#include "CCPlatformMacros.h"
+#include "base/CCPlatformMacros.h"
 
-#include "CCRef.h"
-#include "ccTypes.h"
-#include "CCGeometry.h"
+#include "base/CCRef.h"
+#include "2d/ccTypes.h"
+#include "base/CCGeometry.h"
 #include "CCVector.h"
 #include "CCGL.h"
 #include "CCLabelAtlas.h"

cocos/2d/CCDrawNode.cpp

@@ -21,16 +21,16 @@
  * SOFTWARE.
  */
 
-#include "CCDrawNode.h"
+#include "2d/CCDrawNode.h"
 #include "CCShaderCache.h"
 #include "CCGL.h"
-#include "CCEventType.h"
+#include "2d/CCEventType.h"
 #include "CCConfiguration.h"
-#include "renderer/CCCustomCommand.h"
-#include "renderer/CCRenderer.h"
-#include "CCDirector.h"
-#include "CCEventListenerCustom.h"
-#include "CCEventDispatcher.h"
+#include "2d/renderer/CCCustomCommand.h"
+#include "2d/renderer/CCRenderer.h"
+#include "2d/CCDirector.h"
+#include "2d/CCEventListenerCustom.h"
+#include "2d/CCEventDispatcher.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCDrawNode.h

@@ -31,9 +31,9 @@
 #ifndef __CCDRAWNODES_CCDRAW_NODE_H__
 #define __CCDRAWNODES_CCDRAW_NODE_H__
 
-#include "CCNode.h"
-#include "ccTypes.h"
-#include "renderer/CCCustomCommand.h"
+#include "2d/CCNode.h"
+#include "2d/ccTypes.h"
+#include "2d/renderer/CCCustomCommand.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCDrawingPrimitives.cpp

@@ -41,15 +41,15 @@ THE SOFTWARE.
 #include <string.h>
 #include <cmath>
 
-#include "ccTypes.h"
-#include "ccMacros.h"
+#include "2d/ccTypes.h"
+#include "2d/ccMacros.h"
 #include "CCGL.h"
-#include "CCDirector.h"
+#include "2d/CCDirector.h"
 #include "ccGLStateCache.h"
 #include "CCShaderCache.h"
-#include "CCGLProgram.h"
-#include "CCActionCatmullRom.h"
-#include "renderer/CCRenderer.h"
+#include "2d/CCGLProgram.h"
+#include "2d/CCActionCatmullRom.h"
+#include "2d/renderer/CCRenderer.h"
 
 NS_CC_BEGIN
 #ifndef M_PI

cocos/2d/CCDrawingPrimitives.h

@@ -41,8 +41,8 @@ THE SOFTWARE.
 #define __CCDRAWING_PRIMITIVES__
     
 
-#include "ccTypes.h"
-#include "ccMacros.h"
+#include "2d/ccTypes.h"
+#include "2d/ccMacros.h"
 #include "math/CCMath.h"
 
 /**

cocos/2d/CCEvent.cpp

@@ -22,7 +22,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCEvent.h"
+#include "2d/CCEvent.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEvent.h

@@ -29,8 +29,8 @@
 #include <string>
 #include <stdint.h>
 
-#include "CCRef.h"
-#include "CCPlatformMacros.h"
+#include "base/CCRef.h"
+#include "base/CCPlatformMacros.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventAcceleration.cpp

@@ -22,7 +22,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCEventAcceleration.h"
+#include "2d/CCEventAcceleration.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventAcceleration.h

@@ -25,8 +25,8 @@
 #ifndef __cocos2d_libs__CCAccelerometerEvent__
 #define __cocos2d_libs__CCAccelerometerEvent__
 
-#include "CCEvent.h"
-#include "ccTypes.h"
+#include "2d/CCEvent.h"
+#include "2d/ccTypes.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventCustom.cpp

@@ -22,8 +22,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCEventCustom.h"
-#include "ccMacros.h"
+#include "2d/CCEventCustom.h"
+#include "2d/ccMacros.h"
 #include <functional>
 
 NS_CC_BEGIN

cocos/2d/CCEventCustom.h

@@ -25,7 +25,7 @@
 #ifndef __cocos2d_libs__CCCustomEvent__
 #define __cocos2d_libs__CCCustomEvent__
 
-#include "CCEvent.h"
+#include "2d/CCEvent.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventDispatcher.cpp

@@ -21,19 +21,19 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
-#include "CCEventDispatcher.h"
-#include "CCEvent.h"
-#include "CCEventTouch.h"
-#include "CCEventCustom.h"
-#include "CCEventListenerTouch.h"
-#include "CCEventListenerAcceleration.h"
-#include "CCEventListenerMouse.h"
-#include "CCEventListenerKeyboard.h"
-#include "CCEventListenerCustom.h"
+#include "2d/CCEventDispatcher.h"
+#include "2d/CCEvent.h"
+#include "2d/CCEventTouch.h"
+#include "2d/CCEventCustom.h"
+#include "2d/CCEventListenerTouch.h"
+#include "2d/CCEventListenerAcceleration.h"
+#include "2d/CCEventListenerMouse.h"
+#include "2d/CCEventListenerKeyboard.h"
+#include "2d/CCEventListenerCustom.h"
 
 #include "CCScene.h"
-#include "CCDirector.h"
-#include "CCEventType.h"
+#include "2d/CCDirector.h"
+#include "2d/CCEventType.h"
 
 #include <algorithm>
 

cocos/2d/CCEventDispatcher.h

@@ -25,9 +25,9 @@
 #ifndef __CC_EVENT_DISPATCHER_H__
 #define __CC_EVENT_DISPATCHER_H__
 
-#include "CCPlatformMacros.h"
-#include "CCEventListener.h"
-#include "CCEvent.h"
+#include "base/CCPlatformMacros.h"
+#include "2d/CCEventListener.h"
+#include "2d/CCEvent.h"
 #include "CCStdC.h"
 
 #include <functional>

cocos/2d/CCEventKeyboard.cpp

@@ -23,7 +23,7 @@
  
  ****************************************************************************/
 
-#include "CCEventKeyboard.h"
+#include "2d/CCEventKeyboard.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventKeyboard.h

@@ -26,7 +26,7 @@
 #ifndef __cocos2d_libs__CCKeyboardEvent__
 #define __cocos2d_libs__CCKeyboardEvent__
 
-#include "CCEvent.h"
+#include "2d/CCEvent.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventListener.cpp

@@ -22,8 +22,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCEventListener.h"
-#include "platform/CCCommon.h"
+#include "2d/CCEventListener.h"
+#include "2d/platform/CCCommon.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventListener.h

@@ -25,8 +25,8 @@
 #ifndef __CCEVENTLISTENER_H__
 #define __CCEVENTLISTENER_H__
 
-#include "CCPlatformMacros.h"
-#include "CCRef.h"
+#include "base/CCPlatformMacros.h"
+#include "base/CCRef.h"
 
 #include <functional>
 #include <string>

cocos/2d/CCEventListenerAcceleration.cpp

@@ -22,8 +22,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCEventListenerAcceleration.h"
-#include "CCEventAcceleration.h"
+#include "2d/CCEventListenerAcceleration.h"
+#include "2d/CCEventAcceleration.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventListenerAcceleration.h

@@ -25,8 +25,8 @@
 #ifndef __cocos2d_libs__CCAccelerometerListener__
 #define __cocos2d_libs__CCAccelerometerListener__
 
-#include "CCEventListener.h"
-#include "ccTypes.h"
+#include "2d/CCEventListener.h"
+#include "2d/ccTypes.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventListenerCustom.cpp

@@ -22,8 +22,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCEventListenerCustom.h"
-#include "CCEventCustom.h"
+#include "2d/CCEventListenerCustom.h"
+#include "2d/CCEventCustom.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventListenerCustom.h

@@ -25,7 +25,7 @@
 #ifndef __cocos2d_libs__CCCustomEventListener__
 #define __cocos2d_libs__CCCustomEventListener__
 
-#include "CCEventListener.h"
+#include "2d/CCEventListener.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventListenerKeyboard.cpp

@@ -23,9 +23,9 @@
  
  ****************************************************************************/
 
-#include "CCEventListenerKeyboard.h"
-#include "CCEventKeyboard.h"
-#include "ccMacros.h"
+#include "2d/CCEventListenerKeyboard.h"
+#include "2d/CCEventKeyboard.h"
+#include "2d/ccMacros.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventListenerKeyboard.h

@@ -26,8 +26,8 @@
 #ifndef __cocos2d_libs__CCKeyboardEventListener__
 #define __cocos2d_libs__CCKeyboardEventListener__
 
-#include "CCEventListener.h"
-#include "CCEventKeyboard.h"
+#include "2d/CCEventListener.h"
+#include "2d/CCEventKeyboard.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventListenerMouse.cpp

@@ -23,7 +23,7 @@
 
  ****************************************************************************/
 
-#include "CCEventListenerMouse.h"
+#include "2d/CCEventListenerMouse.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventListenerMouse.h

@@ -23,8 +23,8 @@
 
  ****************************************************************************/
 
-#include "CCEventListener.h"
-#include "CCEventMouse.h"
+#include "2d/CCEventListener.h"
+#include "2d/CCEventMouse.h"
 
 #ifndef __cocos2d_libs__CCMouseEventListener__
 #define __cocos2d_libs__CCMouseEventListener__

cocos/2d/CCEventListenerTouch.cpp

@@ -22,9 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCEventListenerTouch.h"
-#include "CCEventDispatcher.h"
-#include "CCEventTouch.h"
+#include "2d/CCEventListenerTouch.h"
+#include "2d/CCEventDispatcher.h"
+#include "2d/CCEventTouch.h"
 
 #include <algorithm>
 

cocos/2d/CCEventListenerTouch.h

@@ -26,8 +26,8 @@
 #ifndef __cocos2d_libs__CCTouchEventListener__
 #define __cocos2d_libs__CCTouchEventListener__
 
-#include "CCEventListener.h"
-#include "CCTouch.h"
+#include "2d/CCEventListener.h"
+#include "2d/CCTouch.h"
 
 #include <vector>
 

cocos/2d/CCEventMouse.cpp

@@ -23,7 +23,7 @@
 
  ****************************************************************************/
 
-#include "CCEventMouse.h"
+#include "2d/CCEventMouse.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventMouse.h

@@ -26,7 +26,7 @@
 #ifndef __cocos2d_libs__CCMouseEvent__
 #define __cocos2d_libs__CCMouseEvent__
 
-#include "CCEvent.h"
+#include "2d/CCEvent.h"
 
 #define MOUSE_BUTTON_LEFT       0
 #define MOUSE_BUTTON_RIGHT      1

cocos/2d/CCEventTouch.cpp

@@ -22,7 +22,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCEventTouch.h"
+#include "2d/CCEventTouch.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventTouch.h

@@ -25,8 +25,8 @@
 #ifndef __cocos2d_libs__TouchEvent__
 #define __cocos2d_libs__TouchEvent__
 
-#include "CCEvent.h"
-#include "CCTouch.h"
+#include "2d/CCEvent.h"
+#include "2d/CCTouch.h"
 #include <vector>
 
 NS_CC_BEGIN

cocos/2d/CCFont.h

@@ -28,7 +28,7 @@
 
 #include <string>
 
-#include "CCLabel.h"
+#include "2d/CCLabel.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCFontAtlas.cpp

@@ -26,10 +26,10 @@
 #include "CCFontAtlas.h"
 #include "CCFontFreeType.h"
 #include "ccUTF8.h"
-#include "CCDirector.h"
-#include "CCEventListenerCustom.h"
-#include "CCEventDispatcher.h"
-#include "CCEventType.h"
+#include "2d/CCDirector.h"
+#include "2d/CCEventListenerCustom.h"
+#include "2d/CCEventDispatcher.h"
+#include "2d/CCEventType.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCFontAtlas.h

@@ -26,8 +26,8 @@
 #define _CCFontAtlas_h_
 
 #include <unordered_map>
-#include "CCPlatformMacros.h"
-#include "CCRef.h"
+#include "base/CCPlatformMacros.h"
+#include "base/CCRef.h"
 #include "CCStdC.h"
 
 NS_CC_BEGIN

cocos/2d/CCFontAtlasCache.cpp

@@ -30,7 +30,7 @@
 #include "CCFontFNT.h"
 #include "CCFontFreeType.h"
 #include "CCFontCharMap.h"
-#include "CCDirector.h"
+#include "2d/CCDirector.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCFontAtlasCache.h

@@ -30,7 +30,7 @@
 #include <unordered_map>
 
 #include "CCFontAtlas.h"
-#include "CCLabel.h"
+#include "2d/CCLabel.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCFontCharMap.cpp

@@ -25,8 +25,8 @@
 
 #include "CCFontCharMap.h"
 #include "CCFontAtlas.h"
-#include "platform/CCFileUtils.h"
-#include "CCDirector.h"
+#include "2d/platform/CCFileUtils.h"
+#include "2d/CCDirector.h"
 #include "CCTextureCache.h"
 #include "ccUTF8.h"
 

cocos/2d/CCFontFNT.cpp

@@ -24,15 +24,15 @@
  ****************************************************************************/
 
 #include "CCFontFNT.h"
-#include "uthash.h"
+#include "2d/uthash.h"
 #include "CCConfiguration.h"
-#include "CCDirector.h"
+#include "2d/CCDirector.h"
 #include "CCFontAtlas.h"
 #include "CCMap.h"
 #include "deprecated/CCString.h"
 #include "CCTextureCache.h"
 #include "ccUTF8.h"
-#include "platform/CCFileUtils.h"
+#include "2d/platform/CCFileUtils.h"
 
 using namespace std;
 NS_CC_BEGIN

cocos/2d/CCFontFreeType.cpp

@@ -28,7 +28,7 @@ THE SOFTWARE.
 
 #include "ccUTF8.h"
 #include "CCFontFreeType.h"
-#include "platform/CCFileUtils.h"
+#include "2d/platform/CCFileUtils.h"
 #include "edtaa3func.h"
 #include FT_BBOX_H
 

cocos/2d/CCGLProgram.cpp

@@ -26,12 +26,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "CCDirector.h"
-#include "CCGLProgram.h"
+#include "2d/CCDirector.h"
+#include "2d/CCGLProgram.h"
 #include "ccGLStateCache.h"
-#include "ccMacros.h"
-#include "platform/CCFileUtils.h"
-#include "uthash.h"
+#include "2d/ccMacros.h"
+#include "2d/platform/CCFileUtils.h"
+#include "2d/uthash.h"
 #include "deprecated/CCString.h"
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8)

cocos/2d/CCGLProgram.h

@@ -30,8 +30,8 @@ THE SOFTWARE.
 #ifndef __CCGLPROGRAM_H__
 #define __CCGLPROGRAM_H__
 
-#include "ccMacros.h"
-#include "CCRef.h"
+#include "2d/ccMacros.h"
+#include "base/CCRef.h"
 #include "CCGL.h"
 #include "math/CCMath.h"
 #include <set>

cocos/2d/CCGrabber.cpp

@@ -24,8 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "CCGrabber.h"
-#include "ccMacros.h"
-#include "CCTexture2D.h"
+#include "2d/ccMacros.h"
+#include "2d/CCTexture2D.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCGrabber.h

@@ -27,7 +27,7 @@ THE SOFTWARE.
 #define __EFFECTS_CCGRABBER_H__
 
 #include "CCConfiguration.h"
-#include "CCRef.h"
+#include "base/CCRef.h"
 #include "CCGL.h"
 
 NS_CC_BEGIN

cocos/2d/CCGrid.cpp

@@ -23,16 +23,16 @@ 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 "ccMacros.h"
+#include "2d/ccMacros.h"
 #include "CCGrid.h"
-#include "CCDirector.h"
+#include "2d/CCDirector.h"
 #include "CCGrabber.h"
 #include "ccUtils.h"
-#include "CCGLProgram.h"
+#include "2d/CCGLProgram.h"
 #include "CCShaderCache.h"
 #include "ccGLStateCache.h"
 #include "CCGL.h"
-#include "renderer/CCRenderer.h"
+#include "2d/renderer/CCRenderer.h"
 #include "TransformUtils.h"
 
 NS_CC_BEGIN

cocos/2d/CCGrid.h

@@ -26,11 +26,11 @@ THE SOFTWARE.
 #ifndef __EFFECTS_CCGRID_H__
 #define __EFFECTS_CCGRID_H__
 
-#include "CCRef.h"
-#include "CCNode.h"
-#include "ccTypes.h"
-#include "CCTexture2D.h"
-#include "CCDirector.h"
+#include "base/CCRef.h"
+#include "2d/CCNode.h"
+#include "2d/ccTypes.h"
+#include "2d/CCTexture2D.h"
+#include "2d/CCDirector.h"
 #ifdef EMSCRIPTEN
 #include "CCGLBufferedNode.h"
 #endif // EMSCRIPTEN

cocos/2d/CCIMEDelegate.h

@@ -27,7 +27,7 @@ THE SOFTWARE.
 #define __CC_IME_DELEGATE_H__
 
 #include <string>
-#include "CCGeometry.h"
+#include "base/CCGeometry.h"
 
 NS_CC_BEGIN
 extern const std::string STD_STRING_EMPTY;

cocos/2d/CCIMEDispatcher.h

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #ifndef __CC_IME_DISPATCHER_H__
 #define __CC_IME_DISPATCHER_H__
 
-#include "CCIMEDelegate.h"
+#include "2d/CCIMEDelegate.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCLabel.cpp

@@ -23,21 +23,21 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCLabel.h"
+#include "2d/CCLabel.h"
 #include "CCFontAtlasCache.h"
 #include "CCLabelTextFormatter.h"
-#include "CCSprite.h"
+#include "2d/CCSprite.h"
 #include "CCShaderCache.h"
 #include "ccUTF8.h"
-#include "CCSpriteFrame.h"
-#include "CCDirector.h"
-#include "renderer/CCRenderer.h"
+#include "2d/CCSpriteFrame.h"
+#include "2d/CCDirector.h"
+#include "2d/renderer/CCRenderer.h"
 #include "CCFont.h"
-#include "CCEventListenerCustom.h"
-#include "CCEventDispatcher.h"
-#include "CCEventType.h"
-#include "CCEventCustom.h"
-#include "platform/CCFileUtils.h"
+#include "2d/CCEventListenerCustom.h"
+#include "2d/CCEventDispatcher.h"
+#include "2d/CCEventType.h"
+#include "2d/CCEventCustom.h"
+#include "2d/platform/CCFileUtils.h"
 #include "deprecated/CCString.h"
 #include "CCProfiling.h"
 

cocos/2d/CCLabel.h

@@ -27,9 +27,9 @@
 #ifndef _COCOS2D_CCLABEL_H_
 #define _COCOS2D_CCLABEL_H_
 
-#include "CCSpriteBatchNode.h"
-#include "ccTypes.h"
-#include "renderer/CCCustomCommand.h"
+#include "2d/CCSpriteBatchNode.h"
+#include "2d/ccTypes.h"
+#include "2d/renderer/CCCustomCommand.h"
 #include "CCFontAtlas.h"
 
 NS_CC_BEGIN

cocos/2d/CCLabelAtlas.cpp

@@ -25,22 +25,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "CCLabelAtlas.h"
-#include "CCTextureAtlas.h"
+#include "2d/CCTextureAtlas.h"
 #include "CCTextureCache.h"
 #include "CCDrawingPrimitives.h"
-#include "ccConfig.h"
+#include "2d/ccConfig.h"
 #include "CCShaderCache.h"
-#include "CCGLProgram.h"
+#include "2d/CCGLProgram.h"
 #include "ccGLStateCache.h"
-#include "CCDirector.h"
+#include "2d/CCDirector.h"
 #include "TransformUtils.h"
-#include "platform/CCFileUtils.h"
+#include "2d/platform/CCFileUtils.h"
 // external
 #include "deprecated/CCString.h"
 
 #if CC_LABELATLAS_DEBUG_DRAW
-#include "renderer/CCRenderer.h"
-#include "CCDirector.h"
+#include "2d/renderer/CCRenderer.h"
+#include "2d/CCDirector.h"
 #endif
 
 NS_CC_BEGIN

cocos/2d/CCLabelAtlas.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 
 #include "CCAtlasNode.h"
 #if CC_LABELATLAS_DEBUG_DRAW
-#include "renderer/CCCustomCommand.h"
+#include "2d/renderer/CCCustomCommand.h"
 #endif
 NS_CC_BEGIN
 

cocos/2d/CCLabelBMFont.cpp

@@ -34,11 +34,11 @@ http://www.angelcode.com/products/bmfont/ (Free, Windows only)
 #include "CCLabelBMFont.h"
 #include "CCDrawingPrimitives.h"
 #include "deprecated/CCString.h"
-#include "CCSprite.h"
+#include "2d/CCSprite.h"
 
 #if CC_LABELBMFONT_DEBUG_DRAW
-#include "renderer/CCRenderer.h"
-#include "CCDirector.h"
+#include "2d/renderer/CCRenderer.h"
+#include "2d/CCDirector.h"
 #endif
 
 using namespace std;

cocos/2d/CCLabelBMFont.h

@@ -34,9 +34,9 @@ Use any of these editors to generate BMFonts:
 #ifndef __CCBITMAP_FONT_ATLAS_H__
 #define __CCBITMAP_FONT_ATLAS_H__
 
-#include "CCLabel.h"
+#include "2d/CCLabel.h"
 #if CC_LABELBMFONT_DEBUG_DRAW
-#include "renderer/CCCustomCommand.h"
+#include "2d/renderer/CCCustomCommand.h"
 #endif
 
 NS_CC_BEGIN

cocos/2d/CCLabelTTF.cpp

@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "CCLabelTTF.h"
-#include "CCLabel.h"
+#include "2d/CCLabel.h"
 #include "deprecated/CCString.h"
 
 NS_CC_BEGIN

cocos/2d/CCLabelTTF.h

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #ifndef __CCLABELTTF_H__
 #define __CCLABELTTF_H__
 
-#include "CCNode.h"
+#include "2d/CCNode.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCLabelTextFormatter.cpp

@@ -27,8 +27,8 @@
 
 #include "ccUTF8.h"
 #include "CCLabelTextFormatter.h"
-#include "CCDirector.h"
-#include "CCLabel.h"
+#include "2d/CCDirector.h"
+#include "2d/CCLabel.h"
 
 using namespace std;
 

cocos/2d/CCLayer.cpp

@@ -26,25 +26,25 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include <stdarg.h>
-#include "CCLayer.h"
-#include "CCDirector.h"
+#include "2d/CCLayer.h"
+#include "2d/CCDirector.h"
 #include "CCScriptSupport.h"
 #include "CCShaderCache.h"
-#include "CCGLProgram.h"
+#include "2d/CCGLProgram.h"
 #include "ccGLStateCache.h"
 #include "TransformUtils.h"
 // extern
-#include "CCEventDispatcher.h"
-#include "CCEventListenerTouch.h"
-#include "CCEventTouch.h"
-#include "CCEventKeyboard.h"
-#include "CCEventListenerKeyboard.h"
-#include "CCEventAcceleration.h"
-#include "CCEventListenerAcceleration.h"
-#include "platform/CCDevice.h"
+#include "2d/CCEventDispatcher.h"
+#include "2d/CCEventListenerTouch.h"
+#include "2d/CCEventTouch.h"
+#include "2d/CCEventKeyboard.h"
+#include "2d/CCEventListenerKeyboard.h"
+#include "2d/CCEventAcceleration.h"
+#include "2d/CCEventListenerAcceleration.h"
+#include "2d/platform/CCDevice.h"
 #include "CCScene.h"
-#include "renderer/CCCustomCommand.h"
-#include "renderer/CCRenderer.h"
+#include "2d/renderer/CCCustomCommand.h"
+#include "2d/renderer/CCRenderer.h"
 #include "deprecated/CCString.h"
 
 #if CC_USE_PHYSICS

cocos/2d/CCLayer.h

@@ -28,15 +28,15 @@ THE SOFTWARE.
 #ifndef __CCLAYER_H__
 #define __CCLAYER_H__
 
-#include "CCNode.h"
-#include "CCProtocols.h"
-#include "CCEventTouch.h"
+#include "2d/CCNode.h"
+#include "2d/CCProtocols.h"
+#include "2d/CCEventTouch.h"
 #ifdef EMSCRIPTEN
 #include "CCGLBufferedNode.h"
 #endif // EMSCRIPTEN
 
-#include "CCEventKeyboard.h"
-#include "renderer/CCCustomCommand.h"
+#include "2d/CCEventKeyboard.h"
+#include "2d/renderer/CCCustomCommand.h"
 
 #include "CCPhysicsWorld.h"