From 50a2cb2b86fb4dd98861d04b716e31a18faee46f Mon Sep 17 00:00:00 2001
From: minggo <ming@cocos2d-x.org>
Date: Thu, 28 Aug 2014 17:32:23 +0800
Subject: [PATCH] remove unneeded includes

---
 cocos/2d/CCFastTMXTiledMap.h |  1 -
 cocos/2d/CCTMXXMLParser.h    |  2 +-
 cocos/3d/CCAttachNode.cpp    |  6 ------
 cocos/3d/CCAttachNode.h      |  6 ------
 cocos/3d/CCBundle3D.h        | 12 ++----------
 cocos/3d/CCMesh.cpp          | 17 ++---------------
 cocos/3d/CCMesh.h            |  6 ++----
 cocos/3d/CCMeshSkin.cpp      |  5 +----
 cocos/3d/CCMeshSkin.h        |  9 ++-------
 9 files changed, 10 insertions(+), 54 deletions(-)

diff --git a/cocos/2d/CCFastTMXTiledMap.h b/cocos/2d/CCFastTMXTiledMap.h
index 07a544a775..4b3fe2a81b 100644
--- a/cocos/2d/CCFastTMXTiledMap.h
+++ b/cocos/2d/CCFastTMXTiledMap.h
@@ -32,7 +32,6 @@ THE SOFTWARE.
 
 NS_CC_BEGIN
 
-class TMXObjectGroup;
 class TMXLayerInfo;
 class TMXTilesetInfo;
 class TMXMapInfo;
diff --git a/cocos/2d/CCTMXXMLParser.h b/cocos/2d/CCTMXXMLParser.h
index dde1c4f535..6c011a25c2 100644
--- a/cocos/2d/CCTMXXMLParser.h
+++ b/cocos/2d/CCTMXXMLParser.h
@@ -33,13 +33,13 @@ THE SOFTWARE.
 #include "platform/CCSAXParser.h"
 #include "base/CCVector.h"
 #include "base/CCValue.h"
+#include "2d/CCTMXObjectGroup.h" // needed for Vector<TMXObjectGroup*> for binding
 
 #include <string>
 
 NS_CC_BEGIN
 
 class TMXLayerInfo;
-class TMXObjectGroup;
 class TMXTilesetInfo;
 
 /** @file
diff --git a/cocos/3d/CCAttachNode.cpp b/cocos/3d/CCAttachNode.cpp
index 3d0f575d30..ee53d03d9d 100644
--- a/cocos/3d/CCAttachNode.cpp
+++ b/cocos/3d/CCAttachNode.cpp
@@ -25,12 +25,6 @@
 #include "3d/CCAttachNode.h"
 #include "3d/CCSkeleton3D.h"
 
-#include "2d/CCNode.h"
-
-#include "base/CCDirector.h"
-#include "base/CCPlatformMacros.h"
-#include "base/ccMacros.h"
-
 NS_CC_BEGIN
 
 AttachNode* AttachNode::create(Bone3D* attachBone)
diff --git a/cocos/3d/CCAttachNode.h b/cocos/3d/CCAttachNode.h
index ed67bca143..57013cceb6 100644
--- a/cocos/3d/CCAttachNode.h
+++ b/cocos/3d/CCAttachNode.h
@@ -25,14 +25,8 @@
 #ifndef __CCATTACHNODE_H__
 #define __CCATTACHNODE_H__
 
-#include <vector>
-
-#include "base/CCVector.h"
-#include "base/ccTypes.h"
-#include "base/CCProtocols.h"
 #include "math/CCMath.h"
 #include "2d/CCNode.h"
-#include "renderer/CCMeshCommand.h"
 #include "3d/3dExport.h"
 
 NS_CC_BEGIN
diff --git a/cocos/3d/CCBundle3D.h b/cocos/3d/CCBundle3D.h
index 6388e14ad6..bd100d6d7a 100644
--- a/cocos/3d/CCBundle3D.h
+++ b/cocos/3d/CCBundle3D.h
@@ -25,18 +25,10 @@
 #ifndef __CCBUNDLE3D_H__
 #define __CCBUNDLE3D_H__
 
-#include <map>
-#include <list>
-
 #include "3d/CCBundle3DData.h"
-
-#include "base/ccMacros.h"
-#include "base/CCRef.h"
-#include "base/ccTypes.h"
-
-#include "json/document.h"
-#include "CCBundleReader.h"
 #include "3d/3dExport.h"
+#include "3d/CCBundleReader.h"
+#include "json/document.h"
 
 NS_CC_BEGIN
 class Animation3D;
diff --git a/cocos/3d/CCMesh.cpp b/cocos/3d/CCMesh.cpp
index 9b4d825f8d..92d855a6cd 100644
--- a/cocos/3d/CCMesh.cpp
+++ b/cocos/3d/CCMesh.cpp
@@ -22,26 +22,13 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include <list>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-
 #include "3d/CCMesh.h"
 #include "3d/CCMeshSkin.h"
+#include "3d/CCSkeleton3D.h"
 #include "3d/CCMeshVertexIndexData.h"
-
-#include "base/ccMacros.h"
-#include "base/CCEventCustom.h"
-#include "base/CCEventListenerCustom.h"
 #include "base/CCEventDispatcher.h"
-#include "base/CCEventType.h"
-#include "base/CCDirector.h"
-#include "renderer/ccGLStateCache.h"
-#include "renderer/CCTexture2D.h"
 #include "renderer/CCTextureCache.h"
-#include "renderer/CCGLProgramCache.h"
-
+#include "renderer/CCGLProgramState.h"
 
 using namespace std;
 
diff --git a/cocos/3d/CCMesh.h b/cocos/3d/CCMesh.h
index 5080d74f48..c55f949460 100644
--- a/cocos/3d/CCMesh.h
+++ b/cocos/3d/CCMesh.h
@@ -26,17 +26,13 @@
 #define __CCMESH_H__
 
 #include <string>
-#include <vector>
 
 #include "3d/CCBundle3DData.h"
 #include "3d/CCAABB.h"
 #include "3d/3dExport.h"
 
 #include "base/CCRef.h"
-#include "base/ccTypes.h"
 #include "math/CCMath.h"
-#include "renderer/CCGLProgram.h"
-#include "renderer/CCGLProgramState.h"
 #include "renderer/CCMeshCommand.h"
 
 NS_CC_BEGIN
@@ -44,6 +40,8 @@ NS_CC_BEGIN
 class Texture2D;
 class MeshSkin;
 class MeshIndexData;
+class GLProgramState;
+class GLProgram;
 /** 
  * Mesh: contains ref to index buffer, GLProgramState, texture, skin, blend function, aabb and so on
  */
diff --git a/cocos/3d/CCMeshSkin.cpp b/cocos/3d/CCMeshSkin.cpp
index 3387de9da5..6966178b9a 100644
--- a/cocos/3d/CCMeshSkin.cpp
+++ b/cocos/3d/CCMeshSkin.cpp
@@ -25,10 +25,7 @@
 #include "3d/CCMeshSkin.h"
 #include "3d/CCSkeleton3D.h"
 #include "3d/CCBundle3D.h"
-
-#include "base/ccMacros.h"
-#include "base/CCPlatformMacros.h"
-#include "platform/CCFileUtils.h"
+#include "3d/CCSkeleton3D.h"
 
 NS_CC_BEGIN
 
diff --git a/cocos/3d/CCMeshSkin.h b/cocos/3d/CCMeshSkin.h
index 6442c3401a..edc2cdfc75 100644
--- a/cocos/3d/CCMeshSkin.h
+++ b/cocos/3d/CCMeshSkin.h
@@ -25,17 +25,12 @@
 #ifndef __CCMESHSKIN_H__
 #define __CCMESHSKIN_H__
 
-#include <unordered_map>
-
 #include "3d/CCBundle3DData.h"
-#include "3d/CCSkeleton3D.h"
-
-#include "base/ccMacros.h"
+#include "3d/3dExport.h"
 #include "base/CCRef.h"
 #include "base/CCVector.h"
-#include "base/ccTypes.h"
 #include "math/CCMath.h"
-#include "3d/3dExport.h"
+
 
 NS_CC_BEGIN