diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp
index 5aadf3ce..a6c1069d 100644
--- a/amarok/src/engine/xine/xine-engine.cpp
+++ b/amarok/src/engine/xine/xine-engine.cpp
@@ -1286,7 +1286,7 @@ Fader::run()
         elapsedUs += stepSizeUs;
 
         // get volume (amarok main * equalizer preamp)
-        float vol = Engine::Base::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp;
+        float vol = XineEngine::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp;
 
         // compute the mix factor as the percentage of time spent since fade begun
         float mix = (elapsedUs / 1000.0) / (float)m_fadeLength;
diff --git a/amarok/src/metadata/rmff/rmff.h b/amarok/src/metadata/rmff/rmff.h
index aab22abe..abc8ea23 100644
--- a/amarok/src/metadata/rmff/rmff.h
+++ b/amarok/src/metadata/rmff/rmff.h
@@ -35,6 +35,8 @@
 
 namespace TagLib
 {
+   class AudioProperties;
+
    namespace RealMedia
    {
 #if SIZEOF_LONG == 4
@@ -277,9 +279,7 @@ namespace TagLib
       private:
          TagLib::ID3v1::Tag *m_id3tag;
       };
-      
-      class TagLib::AudioProperties;
-      
+
       class RealMediaFF
       {
       public: