diff --git a/src/libtomahawk/database/fuzzyindex.cpp b/src/libtomahawk/database/fuzzyindex.cpp
index 3016a6f86..7e1074c23 100644
--- a/src/libtomahawk/database/fuzzyindex.cpp
+++ b/src/libtomahawk/database/fuzzyindex.cpp
@@ -8,6 +8,15 @@
 
 #include <CLucene.h>
 
+#ifndef WIN32
+using namespace lucene::analysis;
+using namespace lucene::document;
+using namespace lucene::store;
+using namespace lucene::index;
+using namespace lucene::queryParser;
+using namespace lucene::search;
+#endif
+
 
 FuzzyIndex::FuzzyIndex( DatabaseImpl& db )
     : QObject()
diff --git a/src/libtomahawk/database/fuzzyindex.h b/src/libtomahawk/database/fuzzyindex.h
index 176391afe..036907ba7 100644
--- a/src/libtomahawk/database/fuzzyindex.h
+++ b/src/libtomahawk/database/fuzzyindex.h
@@ -7,26 +7,34 @@
 #include <QString>
 #include <QMutex>
 
-//namespace lucene
-//{
-//    namespace analysis
-//    {
-        class SimpleAnalyzer;
-//    }
-//    namespace store
-//    {
-        class Directory;
-//    }
-//    namespace index
-//    {
-        class IndexReader;
-        class IndexWriter;
-//    }
-//    namespace search
-//    {
-        class IndexSearcher;
-//    }
-//}
+#ifndef WIN32
+namespace lucene
+{
+    namespace analysis
+    {
+      class SimpleAnalyzer;
+    }
+    namespace store
+    {
+      class Directory;
+    }
+    namespace index
+    {
+      class IndexReader;
+      class IndexWriter;
+    }
+    namespace search
+    {
+      class IndexSearcher;
+    }
+}
+#else
+class SimpleAnalyzer;
+class Directory;
+class IndexReader;
+class IndexWriter;
+class IndexSearcher;
+#endif
 
 class DatabaseImpl;
 
@@ -54,10 +62,17 @@ private:
     DatabaseImpl& m_db;
     QMutex m_mutex;
 
+    #ifndef WIN32
+    lucene::analysis::SimpleAnalyzer* m_analyzer;
+    lucene::store::Directory* m_luceneDir;
+    lucene::index::IndexReader* m_luceneReader;
+    lucene::search::IndexSearcher* m_luceneSearcher;
+    #else
     SimpleAnalyzer* m_analyzer;
     Directory* m_luceneDir;
     IndexReader* m_luceneReader;
     IndexSearcher* m_luceneSearcher;
+    #endif
 };
 
 #endif // FUZZYINDEX_H