diff --git a/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h b/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
index d98051da3..0c48cb60f 100644
--- a/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
+++ b/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
@@ -41,10 +41,13 @@ email: projectileman@yahoo.com
 
 
 
-
+#ifndef PLANEDIREPSILON
 #define PLANEDIREPSILON 0.0000001f
-#define PARALELENORMALS 0.000001f
+#endif
 
+#ifndef PARALELENORMALS
+#define PARALELENORMALS 0.000001f
+#endif
 
 #define TRIANGLE_NORMAL(v1,v2,v3,n)\
 {\
diff --git a/src/BulletCollision/Gimpact/gim_box_collision.h b/src/BulletCollision/Gimpact/gim_box_collision.h
index 9c572638a..a051b4fdb 100644
--- a/src/BulletCollision/Gimpact/gim_box_collision.h
+++ b/src/BulletCollision/Gimpact/gim_box_collision.h
@@ -97,6 +97,8 @@ email: projectileman@yahoo.com
 //	return test_cross_edge_box(edge,absolute_edge,pointa,pointb,extend,1,0,0,1);
 //}
 
+#ifndef TEST_CROSS_EDGE_BOX_MCR
+
 #define TEST_CROSS_EDGE_BOX_MCR(edge,absolute_edge,pointa,pointb,_extend,i_dir_0,i_dir_1,i_comp_0,i_comp_1)\
 {\
 	const btScalar dir0 = -edge[i_dir_0];\
@@ -113,6 +115,7 @@ email: projectileman@yahoo.com
 	if(pmin>rad || -rad>pmax) return false;\
 }\
 
+#endif
 
 #define TEST_CROSS_EDGE_BOX_X_AXIS_MCR(edge,absolute_edge,pointa,pointb,_extend)\
 {\
@@ -190,8 +193,9 @@ public:
 	}
 };
 
-
+#ifndef BOX_PLANE_EPSILON
 #define BOX_PLANE_EPSILON 0.000001f
+#endif
 
 //! Axis aligned box
 class GIM_AABB
@@ -571,7 +575,7 @@ public:
 	}
 };
 
-
+#ifndef BT_BOX_COLLISION_H_INCLUDED
 //! Compairison of transformation objects
 SIMD_FORCE_INLINE bool btCompareTransformsEqual(const btTransform & t1,const btTransform & t2)
 {
@@ -582,6 +586,7 @@ SIMD_FORCE_INLINE bool btCompareTransformsEqual(const btTransform & t1,const btT
 	if(!(t1.getBasis().getRow(2) == t2.getBasis().getRow(2)) ) return false;
 	return true;
 }
+#endif
 
 
 
diff --git a/src/BulletCollision/Gimpact/gim_contact.h b/src/BulletCollision/Gimpact/gim_contact.h
index 5d9f8ef81..b41c714b5 100644
--- a/src/BulletCollision/Gimpact/gim_contact.h
+++ b/src/BulletCollision/Gimpact/gim_contact.h
@@ -40,8 +40,15 @@ email: projectileman@yahoo.com
 /**
 Configuration var for applying interpolation of  contact normals
 */
+#ifndef NORMAL_CONTACT_AVERAGE
 #define NORMAL_CONTACT_AVERAGE 1
+#endif
+
+#ifndef CONTACT_DIFF_EPSILON
 #define CONTACT_DIFF_EPSILON 0.00001f
+#endif
+
+#ifndef BT_CONTACT_H_STRUCTS_INCLUDED
 
 /// Structure for collision results
 ///Functions for managing and sorting contacts resulting from a collision query.
@@ -121,6 +128,7 @@ public:
 
 };
 
+#endif
 
 class gim_contact_array:public gim_array<GIM_CONTACT>
 {
diff --git a/src/BulletCollision/Gimpact/gim_tri_collision.h b/src/BulletCollision/Gimpact/gim_tri_collision.h
index 5b552a1ed..267f806e7 100644
--- a/src/BulletCollision/Gimpact/gim_tri_collision.h
+++ b/src/BulletCollision/Gimpact/gim_tri_collision.h
@@ -38,8 +38,9 @@ email: projectileman@yahoo.com
 
 
 
-
+#ifndef MAX_TRI_CLIPPING
 #define MAX_TRI_CLIPPING 16
+#endif
 
 //! Structure for collision
 struct GIM_TRIANGLE_CONTACT_DATA
diff --git a/src/BulletDynamics/Vehicle/btRaycastVehicle.h b/src/BulletDynamics/Vehicle/btRaycastVehicle.h
index 82d44c73e..04656b912 100644
--- a/src/BulletDynamics/Vehicle/btRaycastVehicle.h
+++ b/src/BulletDynamics/Vehicle/btRaycastVehicle.h
@@ -19,7 +19,7 @@ class btDynamicsWorld;
 #include "btWheelInfo.h"
 #include "BulletDynamics/Dynamics/btActionInterface.h"
 
-class btVehicleTuning;
+//class btVehicleTuning;
 
 ///rayCast vehicle, very special constraint that turn a rigidbody into a vehicle.
 class btRaycastVehicle : public btActionInterface
diff --git a/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h b/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h
index 7e3ab329f..6d46a21db 100644
--- a/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h
+++ b/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h
@@ -20,7 +20,9 @@ subject to the following restrictions:
 #include "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h"
 #include "BulletSoftBody/btSoftBody.h"
 
+#ifndef BT_SOFT_RIGID_DYNAMICS_WORLD_H
 typedef	btAlignedObjectArray<btSoftBody*> btSoftBodyArray;
+#endif
 
 class btSoftBodySolver;
 
diff --git a/src/LinearMath/btQuickprof.h b/src/LinearMath/btQuickprof.h
index fd0030715..7b38d71b9 100644
--- a/src/LinearMath/btQuickprof.h
+++ b/src/LinearMath/btQuickprof.h
@@ -65,9 +65,11 @@ btLeaveProfileZoneFunc* btGetCurrentLeaveProfileZoneFunc();
 void btSetCustomEnterProfileZoneFunc(btEnterProfileZoneFunc* enterFunc);
 void btSetCustomLeaveProfileZoneFunc(btLeaveProfileZoneFunc* leaveFunc);
 
-
+#ifndef BT_NO_PROFILE // FIX redefinition
 //To disable built-in profiling, please comment out next line
 //#define BT_NO_PROFILE 1
+#endif //BT_NO_PROFILE
+
 #ifndef BT_NO_PROFILE
 //btQuickprofGetCurrentThreadIndex will return -1 if thread index cannot be determined, 
 //otherwise returns thread index in range [0..maxThreads]