--- /usr/include/tunepimp-0.5/tunepimp.h	2007-09-10 15:36:15.000000000 +0200
+++ tunepimp.h	2007-11-14 10:55:06.000000000 +0100
@@ -29,16 +29,12 @@
 
 #include <vector>
 #include <map>
+#include <string>
 
-#include "defs.h"
-#include "mutex.h"
-#include "track.h"
-#include "context.h"
-#include "filecache.h"
-#include "analyzer.h"
-#include "write.h"
-#include "readmeta.h"
-#include "plugins.h"
+#include <defs.h>
+#include <context.h>
+
+class Track;
 
 class TPCallback
 {
@@ -55,21 +51,21 @@
 {
     public:
 
-                  TunePimp(const string &appName, const std::string &appVersion, 
+                  TunePimp(const std::string &appName, const std::string &appVersion, 
                            int startThreads = TP_THREAD_ALL, const char *pluginDir = NULL);
         virtual  ~TunePimp(void);
 
         // Setup functions -------------------------------------------------
         void      getVersion            (int &major, int &minor, int &rev);
         void      setMusicDNSClientId   (const std::string &clientId);
-        string   &getMusicDNSClientId   (void);
+	std::string   &getMusicDNSClientId   (void);
 
         void      setServer             (const std::string &server, short port);
         void      setProxy              (const std::string &proxyServer, short proxyPort);
         void      getServer             (std::string &server, short &port);
         void      getProxy              (std::string &proxyServer, short &proxyPort);
 
-        void      getSupportedExtensions(vector<string> &extList);
+        void      getSupportedExtensions(std::vector<std::string> &extList);
 
         void      setAnalyzerPriority   (TPThreadPriorityEnum pri);
         TPThreadPriorityEnum getAnalyzerPriority(void);
@@ -108,7 +104,7 @@
         void      identifyAgain         (int fileId);
 
         // Writing functions ----------------------------------
-        int       getRecognizedFileList (int threshold, vector<int> &fileIds);
+        int       getRecognizedFileList (int threshold, std::vector<int> &fileIds);
         bool      writeTags             (std::vector<int> *fileIds = NULL);
 
         // Config options ----------------------------------
@@ -158,16 +154,16 @@
 
     private:
 
-        Plugins          *plugins;
-        FileCache        *cache;
-        Analyzer         *analyzer;
-        WatchdogThread   *watchdog;
-        WriteThread      *write;
-        ReadThread       *read;
+        class Plugins          *plugins;
+        class FileCache        *cache;
+        class Analyzer         *analyzer;
+        class WatchdogThread   *watchdog;
+        class WriteThread      *write;
+        class ReadThread       *read;
         std::string            server, proxyServer;
         short             port, proxyPort;
         std::string            err;
-        std::vector<string>    extList;
+        std::vector<std::string>    extList;
         TPCallback       *callback;
 
     public: