diff --git a/cocos/physics/CCPhysicsBody.h b/cocos/physics/CCPhysicsBody.h
index 7c0c79002e..4e6f60f038 100644
--- a/cocos/physics/CCPhysicsBody.h
+++ b/cocos/physics/CCPhysicsBody.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCPhysicsSetting.h"
-#ifdef CC_USE_PHYSICS
-
 #ifndef __CCPHYSICS_BODY_H__
 #define __CCPHYSICS_BODY_H__
 
+#include "CCPhysicsSetting.h"
+#ifdef CC_USE_PHYSICS
+
 #include "CCObject.h"
 #include "CCGeometry.h"
 #include "CCArray.h"
@@ -300,6 +300,5 @@ protected:
 
 NS_CC_END
 
-#endif // __CCPHYSICS_BODY_H__
-
 #endif // CC_USE_PHYSICS
+#endif // __CCPHYSICS_BODY_H__
diff --git a/cocos/physics/CCPhysicsContact.h b/cocos/physics/CCPhysicsContact.h
index 3982f4fdd6..846761d1cb 100644
--- a/cocos/physics/CCPhysicsContact.h
+++ b/cocos/physics/CCPhysicsContact.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCPhysicsSetting.h"
-#ifdef CC_USE_PHYSICS
-
 #ifndef __CCPHYSICS_CONTACT_H__
 #define __CCPHYSICS_CONTACT_H__
 
+#include "CCPhysicsSetting.h"
+#ifdef CC_USE_PHYSICS
+
 #include "CCObject.h"
 #include "CCGeometry.h"
 #include "CCEventListenerCustom.h"
@@ -267,6 +267,6 @@ protected:
 };
 
 NS_CC_END
-#endif //__CCPHYSICS_CONTACT_H__
 
 #endif // CC_USE_PHYSICS
+#endif //__CCPHYSICS_CONTACT_H__
diff --git a/cocos/physics/CCPhysicsJoint.h b/cocos/physics/CCPhysicsJoint.h
index 2970d992d0..ff5285b819 100644
--- a/cocos/physics/CCPhysicsJoint.h
+++ b/cocos/physics/CCPhysicsJoint.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCPhysicsSetting.h"
-#ifdef CC_USE_PHYSICS
-
 #ifndef __CCPHYSICS_JOINT_H__
 #define __CCPHYSICS_JOINT_H__
 
+#include "CCPhysicsSetting.h"
+#ifdef CC_USE_PHYSICS
+
 #include "CCObject.h"
 #include "CCGeometry.h"
 
@@ -181,6 +181,5 @@ protected:
 
 NS_CC_END
 
-#endif // __CCPHYSICS_JOINT_H__
-
 #endif // CC_USE_PHYSICS
+#endif // __CCPHYSICS_JOINT_H__
diff --git a/cocos/physics/CCPhysicsShape.h b/cocos/physics/CCPhysicsShape.h
index 4aba49d4d7..b9525506d1 100644
--- a/cocos/physics/CCPhysicsShape.h
+++ b/cocos/physics/CCPhysicsShape.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCPhysicsSetting.h"
-#ifdef CC_USE_PHYSICS
-
 #ifndef __CCPHYSICS_SHAPE_H__
 #define __CCPHYSICS_SHAPE_H__
 
+#include "CCPhysicsSetting.h"
+#ifdef CC_USE_PHYSICS
+
 #include "CCObject.h"
 #include "CCGeometry.h"
 
@@ -309,6 +309,6 @@ protected:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_FIXTURE_H__
 
 #endif // CC_USE_PHYSICS
+#endif // __CCPHYSICS_FIXTURE_H__
diff --git a/cocos/physics/CCPhysicsWorld.h b/cocos/physics/CCPhysicsWorld.h
index e4cad6e7eb..2e70749f57 100644
--- a/cocos/physics/CCPhysicsWorld.h
+++ b/cocos/physics/CCPhysicsWorld.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCPhysicsSetting.h"
-#ifdef CC_USE_PHYSICS
-
 #ifndef __CCPHYSICS_WORLD_H__
 #define __CCPHYSICS_WORLD_H__
 
+#include "CCPhysicsSetting.h"
+#ifdef CC_USE_PHYSICS
+
 #include <list>
 #include <vector>
 
@@ -192,6 +192,5 @@ protected:
 
 NS_CC_END
 
-#endif // __CCPHYSICS_WORLD_H__
-
 #endif // CC_USE_PHYSICS
+#endif // __CCPHYSICS_WORLD_H__
diff --git a/cocos/physics/box2d/CCPhysicsBodyInfo_box2d.h b/cocos/physics/box2d/CCPhysicsBodyInfo_box2d.h
index ed5135bf36..f04076ffcf 100644
--- a/cocos/physics/box2d/CCPhysicsBodyInfo_box2d.h
+++ b/cocos/physics/box2d/CCPhysicsBodyInfo_box2d.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_BODY_INFO_BOX2D_H__
+#define __CCPHYSICS_BODY_INFO_BOX2D_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D)
 
-#ifndef __CCPHYSICS_BODY_INFO_H__
-#define __CCPHYSICS_BODY_INFO_H__
-
 #include "CCPlatformMacros.h"
 
 NS_CC_BEGIN
@@ -40,6 +40,6 @@ public:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_BODY_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D
+#endif // __CCPHYSICS_BODY_INFO_BOX2D_H__
diff --git a/cocos/physics/box2d/CCPhysicsContactInfo_box2d.h b/cocos/physics/box2d/CCPhysicsContactInfo_box2d.h
index c8d4a262d5..d66ed0e131 100644
--- a/cocos/physics/box2d/CCPhysicsContactInfo_box2d.h
+++ b/cocos/physics/box2d/CCPhysicsContactInfo_box2d.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_CONTACT_INFO_BOX2D_H__
+#define __CCPHYSICS_CONTACT_INFO_BOX2D_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D)
 
-#ifndef __CCPHYSICS_CONTACT_INFO_H__
-#define __CCPHYSICS_CONTACT_INFO_H__
-
 #include "CCPlatformMacros.h"
 NS_CC_BEGIN
 
@@ -39,6 +39,6 @@ public:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_CONTACT_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D
+#endif // __CCPHYSICS_CONTACT_INFO_BOX2D_H__
diff --git a/cocos/physics/box2d/CCPhysicsHelper_box2d.h b/cocos/physics/box2d/CCPhysicsHelper_box2d.h
index 01f156628d..f14fcef36f 100644
--- a/cocos/physics/box2d/CCPhysicsHelper_box2d.h
+++ b/cocos/physics/box2d/CCPhysicsHelper_box2d.h
@@ -22,11 +22,11 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_HELPER_BOX2D_H__
+#define __CCPHYSICS_HELPER_BOX2D_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D)
-
-#ifndef __CCPHYSICS_HELPER_H__
-#define __CCPHYSICS_HELPER_H__
 #include "CCPlatformMacros.h"
 #include "CCGeometry.h"
 
@@ -37,6 +37,6 @@ class PhysicsHelper
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_HELPER_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D
+#endif // __CCPHYSICS_HELPER_BOX2D_H__
diff --git a/cocos/physics/box2d/CCPhysicsJointInfo_box2d.h b/cocos/physics/box2d/CCPhysicsJointInfo_box2d.h
index c8223b6f8c..e1404eec45 100644
--- a/cocos/physics/box2d/CCPhysicsJointInfo_box2d.h
+++ b/cocos/physics/box2d/CCPhysicsJointInfo_box2d.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_JOINT_INFO_BOX2D_H__
+#define __CCPHYSICS_JOINT_INFO_BOX2D_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D)
 
-#ifndef __CCPHYSICS_JOINT_INFO_H__
-#define __CCPHYSICS_JOINT_INFO_H__
-
 #include "CCPlatformMacros.h"
 NS_CC_BEGIN
 
@@ -39,6 +39,6 @@ public:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_JOINT_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D
+#endif // __CCPHYSICS_JOINT_INFO_BOX2D_H__
diff --git a/cocos/physics/box2d/CCPhysicsShapeInfo_box2d.h b/cocos/physics/box2d/CCPhysicsShapeInfo_box2d.h
index cd1fc6abcc..15720797e0 100644
--- a/cocos/physics/box2d/CCPhysicsShapeInfo_box2d.h
+++ b/cocos/physics/box2d/CCPhysicsShapeInfo_box2d.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_SHAPE_INFO_BOX2D_H__
+#define __CCPHYSICS_SHAPE_INFO_BOX2D_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D)
 
-#ifndef __CCPHYSICS_SHAPE_INFO_H__
-#define __CCPHYSICS_SHAPE_INFO_H__
-
 #include "CCPlatformMacros.h"
 NS_CC_BEGIN
 
@@ -39,6 +39,6 @@ public:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_SHAPE_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D
+#endif // __CCPHYSICS_SHAPE_INFO_BOX2D_H__
diff --git a/cocos/physics/box2d/CCPhysicsWorldInfo_box2d.h b/cocos/physics/box2d/CCPhysicsWorldInfo_box2d.h
index 9df3ec46cd..fac9fd5181 100644
--- a/cocos/physics/box2d/CCPhysicsWorldInfo_box2d.h
+++ b/cocos/physics/box2d/CCPhysicsWorldInfo_box2d.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_WORLD_INFO_BOX2D_H__
+#define __CCPHYSICS_WORLD_INFO_BOX2D_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D)
 
-#ifndef __CCPHYSICS_WORLD_INFO_H__
-#define __CCPHYSICS_WORLD_INFO_H__
-
 #include "CCPlatformMacros.h"
 NS_CC_BEGIN
 
@@ -39,6 +39,6 @@ public:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_WORLD_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D
+#endif // __CCPHYSICS_WORLD_INFO_BOX2D_H__
diff --git a/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h
index dd2d276ac5..143fec843c 100644
--- a/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h
+++ b/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_BODY_INFO_CHIPMUNK_H__
+#define __CCPHYSICS_BODY_INFO_CHIPMUNK_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK)
 
-#ifndef __CCPHYSICS_BODY_INFO_H__
-#define __CCPHYSICS_BODY_INFO_H__
-
 #include "chipmunk.h"
 #include "CCPlatformMacros.h"
 #include "CCObject.h"
@@ -51,6 +51,6 @@ private:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_BODY_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK
+#endif // __CCPHYSICS_BODY_INFO_CHIPMUNK_H__
diff --git a/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h
index 4b01ad9d53..6cc0e189c1 100644
--- a/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h
+++ b/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_CONTACT_INFO_CHIPMUNK_H__
+#define __CCPHYSICS_CONTACT_INFO_CHIPMUNK_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK)
 
-#ifndef __CCPHYSICS_CONTACT_INFO_H__
-#define __CCPHYSICS_CONTACT_INFO_H__
-
 #include "chipmunk.h"
 #include "CCPlatformMacros.h"
 NS_CC_BEGIN
@@ -49,6 +49,6 @@ private:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_WORLD_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK
+#endif // __CCPHYSICS_CONTACT_INFO_CHIPMUNK_H__
diff --git a/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h
index bf6f6d14db..52d0023b8b 100644
--- a/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h
+++ b/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_HELPER_CHIPMUNK_H__
+#define __CCPHYSICS_HELPER_CHIPMUNK_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK)
 
-#ifndef __CCPHYSICS_HELPER_H__
-#define __CCPHYSICS_HELPER_H__
-
 #include "chipmunk.h"
 #include "CCPlatformMacros.h"
 #include "CCGeometry.h"
@@ -68,6 +68,6 @@ public:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_HELPER_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK
+#endif // __CCPHYSICS_HELPER_CHIPMUNK_H__
diff --git a/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h
index 016cd74d12..bdd3f1e887 100644
--- a/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h
+++ b/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_JOINT_INFO_CHIPMUNK_H__
+#define __CCPHYSICS_JOINT_INFO_CHIPMUNK_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK)
 
-#ifndef __CCPHYSICS_JOINT_INFO_H__
-#define __CCPHYSICS_JOINT_INFO_H__
-
 #include "chipmunk.h"
 #include "CCPlatformMacros.h"
 #include <vector>
@@ -60,6 +60,6 @@ private:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_SHAPE_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK
+#endif // __CCPHYSICS_JOINT_INFO_CHIPMUNK_H__
diff --git a/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h
index b519fd378a..2bdd55a7f9 100644
--- a/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h
+++ b/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_SHAPE_INFO_CHIPMUNK_H__
+#define __CCPHYSICS_SHAPE_INFO_CHIPMUNK_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK)
 
-#ifndef __CCPHYSICS_SHAPE_INFO_H__
-#define __CCPHYSICS_SHAPE_INFO_H__
-
 #include <vector>
 #include <map>
 #include "chipmunk.h"
@@ -70,6 +70,6 @@ private:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_SHAPE_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK
+#endif // __CCPHYSICS_SHAPE_INFO_CHIPMUNK_H__
diff --git a/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h
index b50e1a3240..0c098d3d90 100644
--- a/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h
+++ b/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h
@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_WORLD_INFO_CHIPMUNK_H__
+#define __CCPHYSICS_WORLD_INFO_CHIPMUNK_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK)
 
-#ifndef __CCPHYSICS_WORLD_INFO_H__
-#define __CCPHYSICS_WORLD_INFO_H__
-
 #include "chipmunk.h"
 #include "CCPlatformMacros.h"
 #include <vector>
@@ -55,6 +55,6 @@ private:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_WORLD_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK
+#endif // __CCPHYSICS_WORLD_INFO_CHIPMUNK_H__