diff -ur amarok-1.3.7/amarok/src/amarokcore/amarokdcophandler.cpp amarok-1.3.7_qt-3.3.3/amarok/src/amarokcore/amarokdcophandler.cpp
--- amarok-1.3.7/amarok/src/amarokcore/amarokdcophandler.cpp	2005-12-06 01:09:25.000000000 +0100
+++ amarok-1.3.7_qt-3.3.3/amarok/src/amarokcore/amarokdcophandler.cpp	2005-12-09 00:18:42.000000000 +0100
@@ -439,7 +439,7 @@
         //the amarok binary anyway --mxcl
         debug() << "Startup ID: " << args.first() << endl;
         kapp->setStartupId( args.first().local8Bit() );
-        KStartupInfo::appStarted();
+//        KStartupInfo::appStarted();
         args.pop_front();
 
         const int argc = args.count() + 1;

diff -ur amarok-1.3.7/amarok/src/analyzers/analyzerbase.h amarok-1.3.7_qt-3.3.3/amarok/src/analyzers/analyzerbase.h
--- amarok-1.3.7/amarok/src/analyzers/analyzerbase.h	2005-12-06 01:09:25.000000000 +0100
+++ amarok-1.3.7_qt-3.3.3/amarok/src/analyzers/analyzerbase.h	2005-12-09 00:23:49.000000000 +0100
@@ -19,8 +19,10 @@
 
 #ifdef HAVE_QGLWIDGET
 #include <qgl.h>     //baseclass
-#include <GL/gl.h>   //included for convenience
-#include <GL/glu.h>  //included for convenience
+//#include <GL/gl.h>   //included for convenience
+//#include <GL/glu.h>  //included for convenience
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
 #else
 //this is a workaround for compile problems due to moc
 #define QGLWidget QWidget

diff -ur amarok-1.3.7/amarok/src/osd.cpp amarok-1.3.7_qt-3.3.3/amarok/src/osd.cpp
--- amarok-1.3.7/amarok/src/osd.cpp	2005-12-06 01:09:25.000000000 +0100
+++ amarok-1.3.7_qt-3.3.3/amarok/src/osd.cpp	2005-12-09 15:50:23.000000000 +0100
@@ -72,7 +72,7 @@
 void
 OSDWidget::show() //virtual
 {
-    if ( !isEnabled() || m_text.isEmpty() )
+/*    if ( !isEnabled() || m_text.isEmpty() )
         return;
 
     const uint M = fontMetrics().width( 'x' );
@@ -81,10 +81,10 @@
     const QRect newGeometry = determineMetrics( M );
 
     if( m_translucency && !isShown() || !newGeometry.intersects( oldGeometry ) )
-        m_screenshot = QPixmap::grabWindow( qt_xrootwin(),
+{        m_screenshot = QPixmap::grabWindow( qt_xrootwin(),
                 newGeometry.x(), newGeometry.y(),
                 newGeometry.width(), newGeometry.height() );
-
+}
 
     else if( m_translucency ) {
         const QRect unite = oldGeometry.unite( newGeometry );
@@ -110,7 +110,9 @@
             m_timer->start( m_duration, true ); //calls hide()
     }
     else
-        warning() << "Attempted to make an invalid sized OSD\n";
+        warning() << "Attempted to make an invalid sized OSD\n";*/
+
+	warning() << "OSD not supported on OS X for the moment";
 }
 
 QRect
@@ -118,8 +120,7 @@
 {
     // sometimes we only have a tiddly cover
     const QSize minImageSize = m_cover.size().boundedTo( QSize(100,100) );
-
-    // determine a sensible maximum size, don't cover the whole desktop or cross the screen
+   // determine a sensible maximum size, don't cover the whole desktop or cross the screen
     const QSize margin( (M + MARGIN) * 2, (M + MARGIN) * 2 ); //margins
     const QSize image = m_cover.isNull() ? QSize( 0, 0 ) : minImageSize;
     const QSize max = QApplication::desktop()->screen( m_screen )->size() - margin;

diff -ur amarok-1.3.7/amarok/src/playerwindow.cpp amarok-1.3.7_qt-3.3.3/amarok/src/playerwindow.cpp
--- amarok-1.3.7/amarok/src/playerwindow.cpp	2005-12-06 01:09:25.000000000 +0100
+++ amarok-1.3.7_qt-3.3.3/amarok/src/playerwindow.cpp	2005-12-09 15:51:44.000000000 +0100
@@ -45,8 +45,8 @@
 #include <kurldrag.h>
 #include <kwin.h>            //eventFilter()
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
+//#include <X11/Xlib.h>
+//#include <X11/Xutil.h>
 
 
 //simple function for fetching amarok images