diff --git a/src/LinearMath/btQuickprof.h b/src/LinearMath/btQuickprof.h
index 35a87cece..eec3e1514 100644
--- a/src/LinearMath/btQuickprof.h
+++ b/src/LinearMath/btQuickprof.h
@@ -1,4 +1,4 @@
-	
+
 /***************************************************************************************************
 **
 ** Real-Time Hierarchical Profiling for Game Programming Gems 3
@@ -25,203 +25,207 @@
 #ifdef USE_BT_CLOCK
 #ifdef __CELLOS_LV2__
 #include <sys/sys_time.h>
+#include <sys/time_util.h>
 #include <stdio.h>
 typedef uint64_t __int64;
 #endif
 
 #if defined (SUNOS) || defined (__SUNOS__) 
-        #include <stdio.h> 
+#include <stdio.h> 
 #endif
 
 #if defined(WIN32) || defined(_WIN32)
 
- #define USE_WINDOWS_TIMERS 
-   #define WIN32_LEAN_AND_MEAN 
-   #define NOWINRES 
-   #define NOMCX 
-   #define NOIME 
+#define USE_WINDOWS_TIMERS 
+#define WIN32_LEAN_AND_MEAN 
+#define NOWINRES 
+#define NOMCX 
+#define NOIME 
 #ifdef _XBOX
-	#include <Xtl.h>
+#include <Xtl.h>
 #else
-	#include <windows.h>
+#include <windows.h>
 #endif
-	#include <time.h>
+#include <time.h>
 
 #else
-	#include <sys/time.h>
+#include <sys/time.h>
 #endif
 
 #define mymin(a,b) (a > b ? a : b)
 
 /// basic clock
 class btClock
+{
+public:
+	btClock()
 	{
-	public:
-		btClock()
-		{
 #ifdef USE_WINDOWS_TIMERS
-			QueryPerformanceFrequency(&mClockFrequency);
+		QueryPerformanceFrequency(&mClockFrequency);
 #endif
-			reset();
-		}
+		reset();
+	}
 
-		~btClock()
-		{
-		}
+	~btClock()
+	{
+	}
 
-		/// Resets the initial reference time.
-		void reset()
-		{
+	/// Resets the initial reference time.
+	void reset()
+	{
 #ifdef USE_WINDOWS_TIMERS
-			QueryPerformanceCounter(&mStartTime);
-			mStartTick = GetTickCount();
-			mPrevElapsedTime = 0;
+		QueryPerformanceCounter(&mStartTime);
+		mStartTick = GetTickCount();
+		mPrevElapsedTime = 0;
 #else
 #ifdef __CELLOS_LV2__
 
-	typedef uint64_t __int64;
-	typedef __int64  ClockSize;
-	ClockSize newTime;
-	__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
-	mStartTime = newTime;
+		typedef uint64_t __int64;
+		typedef __int64  ClockSize;
+		ClockSize newTime;
+		//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+		SYS_TIMEBASE_GET( newTime );
+		mStartTime = newTime;
 #else
-			gettimeofday(&mStartTime, 0);
+		gettimeofday(&mStartTime, 0);
 #endif
 
 #endif
-		}
+	}
 
-		/// Returns the time in ms since the last call to reset or since 
-		/// the btClock was created.
-		unsigned long int getTimeMilliseconds()
-		{
+	/// Returns the time in ms since the last call to reset or since 
+	/// the btClock was created.
+	unsigned long int getTimeMilliseconds()
+	{
 #ifdef USE_WINDOWS_TIMERS
-			LARGE_INTEGER currentTime;
-			QueryPerformanceCounter(&currentTime);
-			LONGLONG elapsedTime = currentTime.QuadPart - 
-				mStartTime.QuadPart;
+		LARGE_INTEGER currentTime;
+		QueryPerformanceCounter(&currentTime);
+		LONGLONG elapsedTime = currentTime.QuadPart - 
+			mStartTime.QuadPart;
 
-			// Compute the number of millisecond ticks elapsed.
-			unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
+		// Compute the number of millisecond ticks elapsed.
+		unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
+			mClockFrequency.QuadPart);
+
+		// Check for unexpected leaps in the Win32 performance counter.  
+		// (This is caused by unexpected data across the PCI to ISA 
+		// bridge, aka south bridge.  See Microsoft KB274323.)
+		unsigned long elapsedTicks = GetTickCount() - mStartTick;
+		signed long msecOff = (signed long)(msecTicks - elapsedTicks);
+		if (msecOff < -100 || msecOff > 100)
+		{
+			// Adjust the starting time forwards.
+			LONGLONG msecAdjustment = mymin(msecOff * 
+				mClockFrequency.QuadPart / 1000, elapsedTime - 
+				mPrevElapsedTime);
+			mStartTime.QuadPart += msecAdjustment;
+			elapsedTime -= msecAdjustment;
+
+			// Recompute the number of millisecond ticks elapsed.
+			msecTicks = (unsigned long)(1000 * elapsedTime / 
 				mClockFrequency.QuadPart);
+		}
 
-			// Check for unexpected leaps in the Win32 performance counter.  
-			// (This is caused by unexpected data across the PCI to ISA 
-			// bridge, aka south bridge.  See Microsoft KB274323.)
-			unsigned long elapsedTicks = GetTickCount() - mStartTick;
-			signed long msecOff = (signed long)(msecTicks - elapsedTicks);
-			if (msecOff < -100 || msecOff > 100)
-			{
-				// Adjust the starting time forwards.
-				LONGLONG msecAdjustment = mymin(msecOff * 
-					mClockFrequency.QuadPart / 1000, elapsedTime - 
-					mPrevElapsedTime);
-				mStartTime.QuadPart += msecAdjustment;
-				elapsedTime -= msecAdjustment;
+		// Store the current elapsed time for adjustments next time.
+		mPrevElapsedTime = elapsedTime;
 
-				// Recompute the number of millisecond ticks elapsed.
-				msecTicks = (unsigned long)(1000 * elapsedTime / 
-					mClockFrequency.QuadPart);
-			}
-
-			// Store the current elapsed time for adjustments next time.
-			mPrevElapsedTime = elapsedTime;
-
-			return msecTicks;
+		return msecTicks;
 #else
-			
+
 #ifdef __CELLOS_LV2__
-	__int64 freq=sys_time_get_timebase_frequency();
-	 double dFreq=((double) freq) / 1000.0;
-	typedef uint64_t __int64;
-	typedef __int64  ClockSize;
-	ClockSize newTime;
-	__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
-	
-	return (newTime-mStartTime) / dFreq;
+		__int64 freq=sys_time_get_timebase_frequency();
+		double dFreq=((double) freq) / 1000.0;
+		typedef uint64_t __int64;
+		typedef __int64  ClockSize;
+		ClockSize newTime;
+		SYS_TIMEBASE_GET( newTime );
+		//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+
+		return (newTime-mStartTime) / dFreq;
 #else
 
-			struct timeval currentTime;
-			gettimeofday(&currentTime, 0);
-			return (currentTime.tv_sec - mStartTime.tv_sec) * 1000 + 
-				(currentTime.tv_usec - mStartTime.tv_usec) / 1000;
+		struct timeval currentTime;
+		gettimeofday(&currentTime, 0);
+		return (currentTime.tv_sec - mStartTime.tv_sec) * 1000 + 
+			(currentTime.tv_usec - mStartTime.tv_usec) / 1000;
 #endif //__CELLOS_LV2__
 #endif
+	}
+
+	/// Returns the time in us since the last call to reset or since 
+	/// the Clock was created.
+	unsigned long int getTimeMicroseconds()
+	{
+#ifdef USE_WINDOWS_TIMERS
+		LARGE_INTEGER currentTime;
+		QueryPerformanceCounter(&currentTime);
+		LONGLONG elapsedTime = currentTime.QuadPart - 
+			mStartTime.QuadPart;
+
+		// Compute the number of millisecond ticks elapsed.
+		unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
+			mClockFrequency.QuadPart);
+
+		// Check for unexpected leaps in the Win32 performance counter.  
+		// (This is caused by unexpected data across the PCI to ISA 
+		// bridge, aka south bridge.  See Microsoft KB274323.)
+		unsigned long elapsedTicks = GetTickCount() - mStartTick;
+		signed long msecOff = (signed long)(msecTicks - elapsedTicks);
+		if (msecOff < -100 || msecOff > 100)
+		{
+			// Adjust the starting time forwards.
+			LONGLONG msecAdjustment = mymin(msecOff * 
+				mClockFrequency.QuadPart / 1000, elapsedTime - 
+				mPrevElapsedTime);
+			mStartTime.QuadPart += msecAdjustment;
+			elapsedTime -= msecAdjustment;
 		}
 
-		/// Returns the time in us since the last call to reset or since 
-		/// the Clock was created.
-		unsigned long int getTimeMicroseconds()
-		{
-#ifdef USE_WINDOWS_TIMERS
-			LARGE_INTEGER currentTime;
-			QueryPerformanceCounter(&currentTime);
-			LONGLONG elapsedTime = currentTime.QuadPart - 
-				mStartTime.QuadPart;
+		// Store the current elapsed time for adjustments next time.
+		mPrevElapsedTime = elapsedTime;
 
-			// Compute the number of millisecond ticks elapsed.
-			unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
-				mClockFrequency.QuadPart);
+		// Convert to microseconds.
+		unsigned long usecTicks = (unsigned long)(1000000 * elapsedTime / 
+			mClockFrequency.QuadPart);
 
-			// Check for unexpected leaps in the Win32 performance counter.  
-			// (This is caused by unexpected data across the PCI to ISA 
-			// bridge, aka south bridge.  See Microsoft KB274323.)
-			unsigned long elapsedTicks = GetTickCount() - mStartTick;
-			signed long msecOff = (signed long)(msecTicks - elapsedTicks);
-			if (msecOff < -100 || msecOff > 100)
-			{
-				// Adjust the starting time forwards.
-				LONGLONG msecAdjustment = mymin(msecOff * 
-					mClockFrequency.QuadPart / 1000, elapsedTime - 
-					mPrevElapsedTime);
-				mStartTime.QuadPart += msecAdjustment;
-				elapsedTime -= msecAdjustment;
-			}
-
-			// Store the current elapsed time for adjustments next time.
-			mPrevElapsedTime = elapsedTime;
-
-			// Convert to microseconds.
-			unsigned long usecTicks = (unsigned long)(1000000 * elapsedTime / 
-				mClockFrequency.QuadPart);
-
-			return usecTicks;
+		return usecTicks;
 #else
 
 #ifdef __CELLOS_LV2__
-	__int64 freq=sys_time_get_timebase_frequency();
-	 double dFreq=((double) freq)/ 1000000.0;
-	typedef uint64_t __int64;
-	typedef __int64  ClockSize;
-	ClockSize newTime;
-	__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
-	
-	return (newTime-mStartTime) / dFreq;
+		__int64 freq=sys_time_get_timebase_frequency();
+		double dFreq=((double) freq)/ 1000000.0;
+		typedef uint64_t __int64;
+		typedef __int64  ClockSize;
+		ClockSize newTime;
+		//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+		SYS_TIMEBASE_GET( newTime );
+
+		return (newTime-mStartTime) / dFreq;
 #else
 
-			struct timeval currentTime;
-			gettimeofday(&currentTime, 0);
-			return (currentTime.tv_sec - mStartTime.tv_sec) * 1000000 + 
-				(currentTime.tv_usec - mStartTime.tv_usec);
+		struct timeval currentTime;
+		gettimeofday(&currentTime, 0);
+		return (currentTime.tv_sec - mStartTime.tv_sec) * 1000000 + 
+			(currentTime.tv_usec - mStartTime.tv_usec);
 #endif//__CELLOS_LV2__
 #endif 
-		}
+	}
 
-	private:
+private:
 #ifdef USE_WINDOWS_TIMERS
-		LARGE_INTEGER mClockFrequency;
-		DWORD mStartTick;
-		LONGLONG mPrevElapsedTime;
-		LARGE_INTEGER mStartTime;
+	LARGE_INTEGER mClockFrequency;
+	DWORD mStartTick;
+	LONGLONG mPrevElapsedTime;
+	LARGE_INTEGER mStartTime;
 #else
 #ifdef __CELLOS_LV2__
-		uint64_t	mStartTime;
+	uint64_t	mStartTime;
 #else
-		struct timeval mStartTime;
+	struct timeval mStartTime;
 #endif
 #endif //__CELLOS_LV2__
 
-	};
+};
 
 #endif //USE_BT_CLOCK
 
@@ -274,7 +278,7 @@ public:
 	void				First(void);
 	void				Next(void);
 	bool				Is_Done(void);
-    bool                Is_Root(void) { return (CurrentParent->Get_Parent() == 0); }
+	bool                Is_Root(void) { return (CurrentParent->Get_Parent() == 0); }
 
 	void				Enter_Child( int index );		// Make the given child the new parent
 	void				Enter_Largest_Child( void );	// Make the largest child the new parent
@@ -334,7 +338,7 @@ public:
 	{ 
 		CProfileManager::Start_Profile( name ); 
 	}
-	
+
 	~CProfileSample( void )					
 	{ 
 		CProfileManager::Stop_Profile();