diff --git a/Engine/source/sfx/openal/linux/LoadOAL.linux.cpp b/Engine/source/sfx/openal/linux/LoadOAL.linux.cpp
diff --git a/Engine/source/sfx/openal/sfxALDevice.cpp b/Engine/source/sfx/openal/sfxALDevice.cpp
@@ -63,10 +63,12 @@ SFXALDevice::SFXALDevice(  SFXProvider *provider,
 
    if( !Con::getBoolVariable( "$_forceAllMainThread" ) )
    {
+#if defined (_WIN32)
       SFXInternal::gUpdateThread = new AsyncPeriodicUpdateThread
          ( "OpenAL Update Thread", SFXInternal::gBufferUpdateList,
            Con::getIntVariable( "$pref::SFX::updateInterval", SFXInternal::DEFAULT_UPDATE_INTERVAL ) );
       SFXInternal::gUpdateThread->start();
+#endif
    }
 }
 

diff --git a/Engine/source/windowManager/platformCursorController.cpp b/Engine/source/windowManager/platformCursorController.cpp
@@ -28,8 +28,8 @@ void PlatformCursorController::pushCursor( S32 cursorID )
    // Place the new cursor shape onto the stack
    mCursors.increment();
 
-   CursorShape &shape = mCursors.last();
-   shape.mCursorType  = CursorShape::TYPE_RESOURCE;
+   CursorShapeT3D &shape = mCursors.last();
+   shape.mCursorType  = CursorShapeT3D::TYPE_RESOURCE;
    shape.mCursorID    = cursorID;
 
    // Now Change the Cursor Shape.
@@ -42,8 +42,8 @@ void PlatformCursorController::pushCursor( const UTF8 *fileName )
    mCursors.increment();
 
    // Store the Details.
-   CursorShape &shape = mCursors.last();
-   shape.mCursorType  = CursorShape::TYPE_FILE;
+   CursorShapeT3D &shape = mCursors.last();
+   shape.mCursorType  = CursorShapeT3D::TYPE_FILE;
    shape.mCursorFile  = String::ToString( "%s", fileName );
 
    // Now Change the Cursor Shape.
@@ -71,19 +71,19 @@ void PlatformCursorController::refreshCursor()
    setCursorShape( mCursors.last(), false );
 }
 
-void PlatformCursorController::setCursorShape( const CursorShape &shape, bool reload )
+void PlatformCursorController::setCursorShape( const CursorShapeT3D &shape, bool reload )
 {
     switch( shape.mCursorType )
     {
-        case CursorShape::TYPE_RESOURCE :
+        case CursorShapeT3D::TYPE_RESOURCE :
             {
 
                 // Set Resource.
                 setCursorShape( shape.mCursorID );
 
             } break;
 
-        case CursorShape::TYPE_FILE :
+        case CursorShapeT3D::TYPE_FILE :
             {
 
                 // Set File.

diff --git a/Engine/source/windowManager/platformCursorController.h b/Engine/source/windowManager/platformCursorController.h
@@ -33,20 +33,20 @@ class PlatformCursorController
 {
 protected:
 
-   struct CursorShape
+   struct CursorShapeT3D
    {
-      enum Type
+      enum TypeT3D
       {
          TYPE_RESOURCE,
          TYPE_FILE,
       };
 
-      Type   mCursorType;
+      TypeT3D mCursorType;
       S32    mCursorID;   // Points to a platform specific cursor ID
       String mCursorFile; // Points to a custom cursor file
    };
 
-   Vector<CursorShape> mCursors;
+   Vector<CursorShapeT3D> mCursors;
 
    /// The PlatformWindow that owns this Cursor Controller
    PlatformWindow *mOwner;
@@ -85,7 +85,7 @@ class PlatformCursorController
    virtual void setCursorVisible( bool visible ) = 0;
    virtual bool isCursorVisible() = 0;
 
-   virtual void setCursorShape( const CursorShape &shape, bool reload );
+   virtual void setCursorShape( const CursorShapeT3D &shape, bool reload );
    virtual void setCursorShape( U32 cursorID ) = 0;
    virtual void setCursorShape( const UTF8 *filename, bool reload ) = 0;