diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro
index 0469cb79..8e5eda63 100644
--- a/SleepyHeadQT.pro
+++ b/SleepyHeadQT.pro
@@ -1,9 +1,9 @@
 TEMPLATE = subdirs
 
-CONFIG -= use_bundled_libs
 
 # Need them for windows..
 win32:CONFIG += use_bundled_libs
+else:CONFIG -= use_bundled_libs
 
 use_bundled_libs {
     SUBDIRS = 3rdparty
diff --git a/sleepyhead/UpdaterWindow.cpp b/sleepyhead/UpdaterWindow.cpp
index cd251560..5dab6393 100644
--- a/sleepyhead/UpdaterWindow.cpp
+++ b/sleepyhead/UpdaterWindow.cpp
@@ -13,8 +13,8 @@
 #include <QDesktopWidget>
 
 #include "SleepLib/profiles.h"
-#include "quazip/quazip.h"
-#include "quazip/quazipfile.h"
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
 #include "UpdaterWindow.h"
 #include "ui_UpdaterWindow.h"
 #include "version.h"
diff --git a/sleepyhead/oximetry.cpp b/sleepyhead/oximetry.cpp
index 0a911c10..31e4f73c 100644
--- a/sleepyhead/oximetry.cpp
+++ b/sleepyhead/oximetry.cpp
@@ -9,7 +9,12 @@
 #include <QCalendarWidget>
 #include <QTextCharFormat>
 
+
+#ifdef USE_BUNDLED_LIBS
 #include "src/qextserialenumerator.h"
+#else
+#include <qextserialport/qextserialenumerator.h>
+#endif
 
 #include "oximetry.h"
 #include "ui_oximetry.h"
diff --git a/sleepyhead/oximetry.h b/sleepyhead/oximetry.h
index f055d10a..2391c935 100644
--- a/sleepyhead/oximetry.h
+++ b/sleepyhead/oximetry.h
@@ -14,7 +14,11 @@
 #include <QMessageBox>
 #include <QMutex>
 
+#ifdef USE_BUNDLED_LIBS
 #include "src/qextserialport.h"
+#else
+#include <qextserialport/qextserialport.h>
+#endif
 
 #include "SleepLib/profiles.h"
 #include "SleepLib/day.h"
diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro
index f9803258..cffabd25 100644
--- a/sleepyhead/sleepyhead.pro
+++ b/sleepyhead/sleepyhead.pro
@@ -40,7 +40,6 @@ else:DEFINES += GIT_REVISION=\\\"UNKNOWN\\\"
 unix:!macx:LIBS        += -lX11 -lz -lGLU
 
 macx {
-  SOURCES          +=
   LIBS             += -lz
   ICON              = ../icons/iconfile.icns
 }
@@ -55,6 +54,10 @@ if (win32-msvc2008|win32-msvc2010|win32-msvc2012):!equals(TEMPLATE_PREFIX, "vc")
 }
 
 
+win32:CONFIG += use_bundled_libs
+
+use_bundled_libs:DEFINES += USE_BUNDLED_LIBS
+
 #include(..3rdparty/qextserialport/src/qextserialport.pri)
 #include(3rdparty/quazip-0.5.1/quazip/quazip.pri)
 
@@ -243,6 +246,6 @@ greaterThan(QT_MAJOR_VERSION,4) {
 }
 
 use_bundled_libs {
-    INCLUDEPATH += $$PWD/../3rdparty/qextserialport/src
-    DEPENDPATH += $$PWD/../3rdparty/qextserialport/src
+    INCLUDEPATH += $$PWD/../3rdparty/qextserialport
+    DEPENDPATH += $$PWD/../3rdparty/qextserialport
 }