Index: configure.ac
===================================================================
--- configure.ac	(revision 2604)
+++ configure.ac	(working copy)
@@ -12,13 +12,23 @@
 AC_PROG_CXX
 AC_PROG_LIBTOOL
 
-PKG_CHECK_MODULES(OGRE, [OGRE >= 1.4.0],,
- AC_MSG_ERROR([OGRE is required to compile OgreBullet]))
+#PKG_CHECK_MODULES(OGRE, [OGRE >= 1.4.0],,
+# AC_MSG_ERROR([OGRE is required to compile OgreBullet]))
+
+OGRE_CFLAGS="-W -Wall -mno-cygwin -mthreads -fmessage-length=0 -fexceptions -fident \
+	-O2 \
+	-I\$(OGRE_HOME)/OgreMain/include \
+	-DWIN32 -D_WINDOWS"
+
 AC_SUBST(OGRE_CFLAGS)
 AC_SUBST(OGRE_LIBS)
 
-PKG_CHECK_MODULES(bullet, [bullet >= 2.6.0],,
- AC_MSG_ERROR([Bullet is required to compile OgreBullet]))
+#PKG_CHECK_MODULES(bullet, [bullet >= 2.6.0],,
+# AC_MSG_ERROR([Bullet is required to compile OgreBullet]))
+#  -I\$(BULLET_HOME)/src/BulletCollision -I\$(BULLET_HOME)/src/BulletDynamics
+
+bullet_CFLAGS="-W -Wall -mno-cygwin -O2 -I\$(BULLET_HOME)/src"
+
 AC_SUBST(bullet_CFLAGS)
 AC_SUBST(bullet_LIBS)
 
@@ -33,6 +43,7 @@
  Dynamics/src/Makefile
  Dynamics/include/Makefile
  Dynamics/include/Constraints/Makefile
+ Dynamics/include/Prefab/Makefile
  OgreBullet.pc
  ])
 
Index: Dynamics/src/OgreBulletDynamicsWorld.cpp
===================================================================
--- Dynamics/src/OgreBulletDynamicsWorld.cpp	(revision 2604)
+++ Dynamics/src/OgreBulletDynamicsWorld.cpp	(working copy)
@@ -35,8 +35,8 @@
 
 #include "Constraints/OgreBulletDynamicsRaycastVehicle.h"
 
-#include "GIMPACT/Bullet/btGImpactShape.h"
-#include "GIMPACT/Bullet/btGImpactCollisionAlgorithm.h"
+#include "BulletCollision/Gimpact/btGImpactShape.h"
+#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"
 
 using namespace Ogre;
 using namespace OgreBulletCollisions;
Index: Collisions/include/Shapes/OgreBulletCollisionsGImpactShape.h
===================================================================
--- Collisions/include/Shapes/OgreBulletCollisionsGImpactShape.h	(revision 2604)
+++ Collisions/include/Shapes/OgreBulletCollisionsGImpactShape.h	(working copy)
@@ -28,8 +28,8 @@
 
 #include "OgreBulletCollisionsPreRequisites.h"
 
-#include "GIMPACT/Bullet/btGImpactShape.h"
-#include "GIMPACT/Bullet/btGImpactCollisionAlgorithm.h"
+#include "BulletCollision/Gimpact/btGImpactShape.h"
+#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"
 
 #include "OgreBulletCollisionsShape.h"
 
@@ -53,4 +53,4 @@
 		btTriangleMesh*         mTriMesh;
 	};
 }
-#endif
\ No newline at end of file
+#endif
Index: Collisions/include/OgreBulletCollisionsRay.h
===================================================================
--- Collisions/include/OgreBulletCollisionsRay.h	(revision 2604)
+++ Collisions/include/OgreBulletCollisionsRay.h	(working copy)
@@ -48,9 +48,9 @@
 		void setWorld(CollisionsWorld *world);
 		void setMaxDistance(Ogre::Real max_distance);
 
-        inline const Ogre::Ray &getRay() const;
-		inline Ogre::Vector3 getRayStartPoint() const;
-		inline Ogre::Vector3 getRayEndPoint() const;
+        const Ogre::Ray &getRay() const;
+        Ogre::Vector3 getRayStartPoint() const;
+        Ogre::Vector3 getRayEndPoint() const;
 
     protected:
 
Index: Collisions/include/OgreBulletCollisionsPreRequisites.h
===================================================================
--- Collisions/include/OgreBulletCollisionsPreRequisites.h	(revision 2604)
+++ Collisions/include/OgreBulletCollisionsPreRequisites.h	(working copy)
@@ -29,8 +29,8 @@
 
 #include "btBulletCollisionCommon.h"
 
-#include "GIMPACT/Bullet/btGImpactShape.h"
-#include "GIMPACT/Bullet/btGImpactCollisionAlgorithm.h"
+#include "BulletCollision/Gimpact/btGImpactShape.h"
+#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"
 
 #include "Ogre.h"