diff --git a/qt-openzwave/qt-openzwave.pro b/qt-openzwave/qt-openzwave.pro
index 5c3b162..7f1cb5e 100644
--- a/qt-openzwave/qt-openzwave.pro
+++ b/qt-openzwave/qt-openzwave.pro
@@ -99,7 +99,9 @@ macx {
     QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
     QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
     CONFIG +=lib_bundle
-}
+} else {
+    LIBS += -L../../open-zwave -lopenzwave
+} 
 
 message(" ")
 message("Summary:")
diff --git a/qt-ozwdaemon/qt-ozwdaemon.pro b/qt-ozwdaemon/qt-ozwdaemon.pro
index adeca0c..a60f353 100644
--- a/qt-ozwdaemon/qt-ozwdaemon.pro
+++ b/qt-ozwdaemon/qt-ozwdaemon.pro
@@ -4,8 +4,7 @@ QT += remoteobjects
 
 CONFIG += c++11 console silent
 CONFIG -= app_bundle
-
-include(../qt-openzwave.pri)
+CONFIG -= silent
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
@@ -37,5 +36,7 @@ macx {
     ICON = res/ozw_logo.icns
 } else {
     LIBS += -L../qt-openzwave/ -lqt-openzwave
-    INCLUDEPATH += ../qt-openzwave/qt-openzwave/include/
+    INCLUDEPATH += ../qt-openzwave/include/
 }
+
+include(../qt-openzwave.pri)
diff --git a/simpleclient/main.cpp b/simpleclient/main.cpp
index 221ee38..cfd200b 100644
--- a/simpleclient/main.cpp
+++ b/simpleclient/main.cpp
@@ -53,7 +53,7 @@
 #include <QRemoteObjectNode>
 #include <QAbstractItemModelReplica>
 
-#include <qt-openzwave/qtozwmanager.h>
+#include "qt-openzwave/qtozwmanager.h"
 
 #include "mainwindow.h"
 
diff --git a/simpleclient/simpleclient.pro b/simpleclient/simpleclient.pro
index d790dee..765ba01 100644
--- a/simpleclient/simpleclient.pro
+++ b/simpleclient/simpleclient.pro
@@ -4,11 +4,6 @@ QT += widgets remoteobjects testlib
 CONFIG += silent
 DEFINES  += remote
 
-
-include(../qt-openzwave.pri)
-
-
-
 unix {
     QMAKE_POST_LINK += "if [ ! -e config ]; then ln -s $$OZW_LIB_PATH/config config; fi"
 }
@@ -48,6 +43,7 @@ macx {
     QMAKE_BUNDLE_DATA += BUNDLE LIBOZW
     INCLUDEPATH += ../qt-openzwave/qt-openzwave/include/
 } else {
-    LIBS += -L../qt-openzwave/ -lqt-openzwave
-    INCLUDEPATH += ../qt-openzwave/qt-openzwave/include/
+    LIBS += -L../qt-openzwave/ -lqt-openzwave -L../../open-zwave -lopenzwave
+    INCLUDEPATH += ../qt-openzwave/include/
 }
+include(../qt-openzwave.pri)