diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index eae0c916b..db4789cea 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -364,13 +364,13 @@ target_link_libraries( tomahawklib
     ${QT_LIBRARIES}
     ${OS_SPECIFIC_LINK_LIBRARIES}
     ${LIBECHONEST_LIBRARY}
+    tomahawk_jdns
     portfwd
     qjson
     mad
     vorbisfile
     ogg
     FLAC++
-    tomahawk_jdns
     ${CLUCENE_LIBRARY}
 )
 
diff --git a/src/libtomahawk/qtsingleapp/qtlockedfile_win.cpp b/src/libtomahawk/qtsingleapp/qtlockedfile_win.cpp
index 4cd200397..8090470cd 100644
--- a/src/libtomahawk/qtsingleapp/qtlockedfile_win.cpp
+++ b/src/libtomahawk/qtsingleapp/qtlockedfile_win.cpp
@@ -45,6 +45,8 @@
 // Maximum number of concurrent read locks. Must not be greater than MAXIMUM_WAIT_OBJECTS
 #define MAX_READERS MAXIMUM_WAIT_OBJECTS
 
+#define TCHAR WCHAR
+
 Qt::HANDLE QtLockedFile::getMutexHandle(int idx, bool doCreate)
 {
     if (mutexname.isEmpty()) {
diff --git a/thirdparty/jdns/jdnsshared/jdnsshared.h b/thirdparty/jdns/jdnsshared/jdnsshared.h
index 701c7115e..9b8acf6b6 100644
--- a/thirdparty/jdns/jdnsshared/jdnsshared.h
+++ b/thirdparty/jdns/jdnsshared/jdnsshared.h
@@ -23,6 +23,8 @@
 
 #include "qjdns.h"
 
+#include "../jdns_export.h"
+
 class JDnsShared;
 class JDnsSharedPrivate;
 class JDnsSharedRequestPrivate;
@@ -194,7 +196,7 @@ pub->publish(QJDns::Unique, rec);
 
    \sa JDnsShared
 */
-class JDnsSharedRequest : public QObject
+class JDNS_EXPORT JDnsSharedRequest : public QObject
 {
 	Q_OBJECT
 public:
@@ -401,7 +403,7 @@ dns->addInterface(addr);
 
    \sa JDnsSharedRequest
 */
-class JDnsShared : public QObject
+class JDNS_EXPORT JDnsShared : public QObject
 {
 	Q_OBJECT
 public: