diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a137fa115..27695dfad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,7 +28,6 @@ SET( TOMAHAWK_INC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../include/" )
 
 SET( tomahawkSources ${tomahawkSources}
      sip/SipHandler.cpp
-     sip/twitter/tomahawkoauthtwitter.cpp
 
      infosystem/infosystem.cpp
      infosystem/infoplugins/echonestplugin.cpp
@@ -71,7 +70,6 @@ SET( tomahawkHeaders ${tomahawkHeaders}
      "${TOMAHAWK_INC_DIR}/tomahawk/infosystem.h"
 
      sip/SipHandler.h
-     sip/twitter/tomahawkoauthtwitter.h
 
      infosystem/infoplugins/echonestplugin.h
      infosystem/infoplugins/musixmatchplugin.h
diff --git a/src/CMakeLists.win32.txt b/src/CMakeLists.win32.txt
index 9ecb59cfd..f494e2901 100644
--- a/src/CMakeLists.win32.txt
+++ b/src/CMakeLists.win32.txt
@@ -8,12 +8,18 @@ ADD_DEFINITIONS( -static-libgcc )
 SET( OS_SPECIFIC_LINK_LIBRARIES
     ${OS_SPECIFIC_LINK_LIBRARIES}
 
+#internal deps
+    sip_twitter
+    ${CMAKE_BINARY_DIR}/src/libtomahawk/libtomahawklib.dll
+
 # normal deps
     ${LIBLASTFM_LIBRARY}
     ${GLOOX_LIBS}
 
 # third party shipped with tomahawk
-    ${CMAKE_BINARY_DIR}/src/libtomahawk/libtomahawklib.dll
+    ${CMAKE_BINARY_DIR}/thirdparty/qtweetlib/libtomahawk_qtweetlib.dll
+
+    # fix them, they should be in ${CMAKE_BINARY_DIR} as well
     ${CMAKE_SOURCE_DIR}/rtaudio/librtaudio.dll
     ${CMAKE_SOURCE_DIR}/qxt/qxtweb-standalone/libqxtweb-standalone.dll
 
diff --git a/src/scanmanager.h b/src/scanmanager.h
index 24247c0ff..6ade3a9e5 100644
--- a/src/scanmanager.h
+++ b/src/scanmanager.h
@@ -8,7 +8,7 @@
 class MusicScanner;
 class QThread;
 
-class DLLEXPORT ScanManager : public QObject
+class ScanManager : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/sip/twitter/CMakeLists.txt b/src/sip/twitter/CMakeLists.txt
index 7ca0f93c8..8405955be 100644
--- a/src/sip/twitter/CMakeLists.txt
+++ b/src/sip/twitter/CMakeLists.txt
@@ -13,7 +13,7 @@ set( twitterSources
 
 set( twitterHeaders
     twitter.h
-	tomahawkoauthtwitter.h
+    tomahawkoauthtwitter.h
 )
 
 include_directories( . ${CMAKE_CURRENT_BINARY_DIR} .. 
@@ -26,16 +26,17 @@ add_library( sip_twitter SHARED ${twitterSources} ${twitterMoc} )
 
 IF( WIN32 )
 SET( OS_SPECIFIC_LINK_LIBRARIES
-	${OS_SPECIFIC_LINK_LIBRARIES}
-	"winmm.dll"
+        ${OS_SPECIFIC_LINK_LIBRARIES}
+        "winmm.dll"
         "iphlpapi.a"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../../build/src/libtomahawk/libtomahawklib.dll"
+        "${CMAKE_BINARY_DIR}/thirdparty/qtweetlib/libtomahawk_qtweetlib.dll"
+        "${CMAKE_BINARY_DIR}/src/libtomahawk/libtomahawklib.dll"
 )
 ENDIF( WIN32 )
 
 target_link_libraries( sip_twitter
-	${QT_LIBRARIES}
-	${OS_SPECIFIC_LINK_LIBRARIES}
+        ${QT_LIBRARIES}
+        ${OS_SPECIFIC_LINK_LIBRARIES}
 )
 
 IF( APPLE )
diff --git a/thirdparty/qtweetlib/CMakeLists.txt b/thirdparty/qtweetlib/CMakeLists.txt
index 55fa6cbcd..77bc9f38c 100644
--- a/thirdparty/qtweetlib/CMakeLists.txt
+++ b/thirdparty/qtweetlib/CMakeLists.txt
@@ -12,6 +12,7 @@ add_definitions( -DQT_SHARED )
 
 if(WIN32)
     set(PLATFORM_SPECIFIC_LIBS "ws2_32.dll" "advapi32.dll" )
+    add_definitions( -DQTWEETLIB_MAKEDLL )
 endif(WIN32)
 
 set(TOMAHAWK_QTWEETLIB_SOURCES
diff --git a/thirdparty/qtweetlib/qtweetlib/src/oauth.h b/thirdparty/qtweetlib/qtweetlib/src/oauth.h
index a1cfbe71d..d409ac872 100644
--- a/thirdparty/qtweetlib/qtweetlib/src/oauth.h
+++ b/thirdparty/qtweetlib/qtweetlib/src/oauth.h
@@ -40,8 +40,11 @@ class QTWEETLIBSHARED_EXPORT OAuth : public QObject
 public:
 	OAuth(QObject *parent = 0);
     OAuth(const QByteArray& consumerKey, const QByteArray& consumerSecret, QObject *parent = 0);
-	
-	enum HttpMethod {GET, POST, PUT, DELETE};
+#undef GET
+#undef POST
+#undef PUT
+#undef DELETE
+    enum HttpMethod {GET, POST, PUT, DELETE};
 
 	void parseTokens(const QByteArray& response);
 	QByteArray generateAuthorizationHeader(const QUrl& url, HttpMethod method);