diff --git a/cocos/editor-support/cocosbuilder/CCNodeLoader.cpp b/cocos/editor-support/cocosbuilder/CCNodeLoader.cpp
index df5ea02bb5..3dbb92507a 100644
--- a/cocos/editor-support/cocosbuilder/CCNodeLoader.cpp
+++ b/cocos/editor-support/cocosbuilder/CCNodeLoader.cpp
@@ -1,10 +1,15 @@
-#include "cocos2d.h"
-
 #include "CCNodeLoader.h"
 #include "CCBSelectorResolver.h"
 #include "CCBMemberVariableAssigner.h"
 #include "CCBAnimationManager.h"
 #include "CCNode+CCBRelativePositioning.h"
+#include "deprecated/CCArray.h"
+#include "deprecated/CCString.h"
+#include "base/CCDirector.h"
+#include "renderer/CCTextureCache.h"
+#include "2d/CCSpriteFrameCache.h"
+#include "2d/CCAnimationCache.h"
+#include "platform/CCFileUtils.h"
 
 
 using namespace std;
diff --git a/cocos/editor-support/cocostudio/FlatBuffersSerialize.h b/cocos/editor-support/cocostudio/FlatBuffersSerialize.h
index 7c2ba5adbb..edc47fad89 100644
--- a/cocos/editor-support/cocostudio/FlatBuffersSerialize.h
+++ b/cocos/editor-support/cocostudio/FlatBuffersSerialize.h
@@ -25,9 +25,13 @@
 #ifndef __cocos2d_libs__FlatBuffersSerialize__
 #define __cocos2d_libs__FlatBuffersSerialize__
 
-#include "cocos2d.h"
+#include <string>
+#include <vector>
+
 #include "ExtensionMacros.h"
 #include "cocostudio/CocosStudioExport.h"
+#include "platform/CCPlatformMacros.h"
+#include "ui/UIWidget.h"
 
 namespace flatbuffers
 {
diff --git a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h
index 20967a5aaa..1ae0d998c8 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h
@@ -25,7 +25,6 @@ THE SOFTWARE.
 #ifndef __ARMATURENODEREADER_H_
 #define __ARMATURENODEREADER_H_
 
-#include "cocos2d.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 #include "cocostudio/WidgetReader/NodeReaderDefine.h"
 
diff --git a/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h b/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h
index a3daa194e1..26c5ebbe82 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h
@@ -25,7 +25,9 @@
 #ifndef __cocos2d_libs__ComAudioReader__
 #define __cocos2d_libs__ComAudioReader__
 
-#include "cocos2d.h"
+#include "base/CCRef.h"
+#include "2d/CCComponent.h"
+#include "2d/CCNode.h"
 #include "cocostudio/CocosStudioExport.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 
diff --git a/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h b/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h
index 55a011703a..b17071282c 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h
@@ -25,7 +25,6 @@
 #ifndef __cocos2d_libs__GameMapReader__
 #define __cocos2d_libs__GameMapReader__
 
-#include "cocos2d.h"
 #include "cocostudio/CocosStudioExport.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 #include "cocostudio/WidgetReader/NodeReaderDefine.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h b/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h
index 72ed03e1ca..4e8eca330d 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h
@@ -25,7 +25,6 @@
 #ifndef __cocos2d_libs__GameNode3DReader__
 #define __cocos2d_libs__GameNode3DReader__
 
-#include "cocos2d.h"
 #include "2d/CCCameraBackgroundBrush.h"
 #include "cocostudio/CocosStudioExport.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp
index bcb8c281ad..a359d18ab6 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp
+++ b/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp
@@ -23,6 +23,7 @@
  ****************************************************************************/
 
 #include "Light3DReader.h"
+#include "2d/CCLight.h"
 
 #include "cocostudio/CSParseBinary_generated.h"
 #include "cocostudio/CSParse3DBinary_generated.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h b/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h
index e529f0aba0..1a257fdb15 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h
@@ -24,7 +24,7 @@
 
 #ifndef __cocos2d_libs__Light3DReader__
 #define __cocos2d_libs__Light3DReader__
-#include "cocos2d.h"
+
 #include "cocostudio/CocosStudioExport.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 #include "cocostudio/WidgetReader/NodeReaderDefine.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h b/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h
index 948553d427..febc5d7ca9 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h
@@ -25,7 +25,7 @@
 #ifndef __cocos2d_libs__Node3DReader__
 #define __cocos2d_libs__Node3DReader__
 
-#include "cocos2d.h"
+#include "math/Vec3.h"
 #include "cocostudio/CocosStudioExport.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 #include "cocostudio/WidgetReader/NodeReaderDefine.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp
index 1b5b0dddaa..a55bacf485 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp
+++ b/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp
@@ -22,6 +22,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCFileUtils.h"
 #include "Particle3DReader.h"
 
 #include "cocostudio/CSParseBinary_generated.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h b/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h
index 3171195e76..4ac718bfb8 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h
@@ -25,7 +25,6 @@
 #ifndef __cocos2d_libs__Particle3DReader__
 #define __cocos2d_libs__Particle3DReader__
 
-#include "cocos2d.h"
 #include "cocostudio/CocosStudioExport.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 #include "cocostudio/WidgetReader/NodeReaderDefine.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h b/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h
index 0ca1b9d84b..c72b62799e 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h
@@ -25,7 +25,6 @@
 #ifndef __cocos2d_libs__ParticleReader__
 #define __cocos2d_libs__ParticleReader__
 
-#include "cocos2d.h"
 #include "cocostudio/CocosStudioExport.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 #include "cocostudio/WidgetReader/NodeReaderDefine.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h
index da240acc85..c11f152c8e 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h
@@ -25,7 +25,7 @@
 #ifndef __cocos2d_libs__ProjectNodeReader__
 #define __cocos2d_libs__ProjectNodeReader__
 
-#include "cocos2d.h"
+#include "base/CCRef.h"
 #include "cocostudio/CocosStudioExport.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 
diff --git a/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h
index 8b3d93d349..931412a3b1 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h
@@ -25,7 +25,6 @@
 #ifndef __cocos2d_libs__SingleNodeReader__
 #define __cocos2d_libs__SingleNodeReader__
 
-#include "cocos2d.h"
 #include "cocostudio/CocosStudioExport.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 #include "cocostudio/WidgetReader/NodeReaderDefine.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h
index 392ecf01c1..040bc561b7 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h
@@ -25,7 +25,6 @@ THE SOFTWARE.
 #ifndef __BONENODEREADER_H_
 #define __BONENODEREADER_H_
 
-#include "cocos2d.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 #include "cocostudio/WidgetReader/NodeReaderDefine.h"
 
diff --git a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h
index 5ac054944d..95932eeed6 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h
@@ -25,7 +25,6 @@ THE SOFTWARE.
 #ifndef _SKELETONNODEREADER_H_
 #define _SKELETONNODEREADER_H_
 
-#include "cocos2d.h"
 #include "cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h"
 
 class SkeletonNodeReader : public  BoneNodeReader
diff --git a/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp
index a145174910..388b269e23 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp
+++ b/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp
@@ -22,6 +22,11 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "2d/CCLight.h"
+#include "3d/CCSprite3D.h"
+#include "3d/CCAnimate3D.h"
+#include "3d/CCAnimation3D.h"
+#include "platform/CCFileUtils.h"
 #include "Sprite3DReader.h"
 
 #include "cocostudio/CSParseBinary_generated.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h b/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h
index b758195d7e..863342770f 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h
@@ -25,7 +25,7 @@
 #ifndef __cocos2d_libs__Sprite3DReader__
 #define __cocos2d_libs__Sprite3DReader__
 
-#include "cocos2d.h"
+#include "math/Vec2.h"
 #include "cocostudio/CocosStudioExport.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 #include "cocostudio/WidgetReader/NodeReaderDefine.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h b/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h
index 2e772dfc64..7bfc7a0057 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h
@@ -25,7 +25,6 @@
 #ifndef __cocos2d_libs__SpriteReader__
 #define __cocos2d_libs__SpriteReader__
 
-#include "cocos2d.h"
 #include "cocostudio/CocosStudioExport.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 #include "cocostudio/WidgetReader/NodeReaderDefine.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp
index 4ccdd4414d..6d0fdbd9db 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp
+++ b/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp
@@ -22,6 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "base/CCDirector.h"
+#include "2d/CCCamera.h"
+#include "platform/CCFileUtils.h"
 #include "UserCameraReader.h"
 
 #include "cocostudio/CSParseBinary_generated.h"
diff --git a/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h b/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h
index 420ca7cfcb..3b9065ce1d 100644
--- a/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h
+++ b/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h
@@ -25,7 +25,7 @@
 #ifndef __cocos2d_libs__UserCameraReader__
 #define __cocos2d_libs__UserCameraReader__
 
-#include "cocos2d.h"
+#include "math/Vec2.h"
 #include "cocostudio/CocosStudioExport.h"
 #include "cocostudio/WidgetReader/NodeReaderProtocol.h"
 #include "cocostudio/WidgetReader/NodeReaderDefine.h"
diff --git a/cocos/editor-support/spine/PolygonBatch.cpp b/cocos/editor-support/spine/PolygonBatch.cpp
index 63b1bbf1b5..e98c6a2516 100644
--- a/cocos/editor-support/spine/PolygonBatch.cpp
+++ b/cocos/editor-support/spine/PolygonBatch.cpp
@@ -31,6 +31,11 @@
 
 #include <spine/PolygonBatch.h>
 #include <spine/extension.h>
+#include "base/ccMacros.h"
+#include "base/CCDirector.h"
+#include "renderer/CCRenderer.h"
+#include "renderer/ccGLStateCache.h"
+#include "renderer/CCGLProgram.h"
 
 USING_NS_CC;
 
diff --git a/cocos/editor-support/spine/PolygonBatch.h b/cocos/editor-support/spine/PolygonBatch.h
index 5fa028e302..74d7ecad55 100644
--- a/cocos/editor-support/spine/PolygonBatch.h
+++ b/cocos/editor-support/spine/PolygonBatch.h
@@ -32,7 +32,7 @@
 #ifndef SPINE_POLYGONBATCH_H_
 #define SPINE_POLYGONBATCH_H_
 
-#include "cocos2d.h"
+#include "renderer/CCTexture2D.h"
 
 namespace spine {