diff --git a/libhive/libhive.pro b/libhive/libhive.pro
index 498bc6f0..48b85bb2 100644
--- a/libhive/libhive.pro
+++ b/libhive/libhive.pro
@@ -11,7 +11,6 @@ SOURCES += device.cpp \
 HEADERS += device.h \
            deviceclass.h \
            devicemanager.h \
-#           deviceplugin.h \
            radio433.h \
            gpio.h
 
diff --git a/server/server.pro b/server/server.pro
index 96807b3a..9749d1c1 100644
--- a/server/server.pro
+++ b/server/server.pro
@@ -8,7 +8,7 @@ INSTALLS += target
 
 QT += network
 
-LIBS += -L../libhive/ -lhive -L../plugins/deviceplugins/rfswitch/ -lhive_rfswitch
+LIBS += -L../libhive/ -lhive
 
 SOURCES += main.cpp \
            hivecore.cpp \
@@ -20,3 +20,4 @@ HEADERS += hivecore.h \
            tcpserver.h \
 
 # FIXME: Drop this and link them dynamically
+LIBS += -L../plugins/deviceplugins/rfswitch/ -lhive_rfswitch