diff --git a/ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h
index 30366338a..7828773cd 100644
--- a/ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h
+++ b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h
@@ -33,9 +33,6 @@
 #include <QDebug>
 #include <QString>
 #include <QMutex>
-#if defined(Q_OS_LINUX)
-#include <usb.h>
-#endif
 #include "../hidapi/hidapi.h"
 #include "ophid_const.h"
 #include "ophid_global.h"
diff --git a/ground/openpilotgcs/src/plugins/ophid/ophid.pro b/ground/openpilotgcs/src/plugins/ophid/ophid.pro
index bad70ea7a..f882d9198 100644
--- a/ground/openpilotgcs/src/plugins/ophid/ophid.pro
+++ b/ground/openpilotgcs/src/plugins/ophid/ophid.pro
@@ -38,38 +38,20 @@ macx {
             -framework IOKit
 }
 
-linux-g++ {
+linux {
     SOURCES += src/ophid_usbmon_linux.cpp
-    LIBS += -lusb -ludev
+    LIBS += -ludev -lrt -lpthread
 
     # hidapi library
     ## rawhid
     #  SOURCES += hidapi/linux/hid.c
     ## libusb
     SOURCES += hidapi/libusb/hid.c
-    LIBS += `pkg-config libusb-1.0 --libs` -lrt -lpthread
-    INCLUDEPATH += /usr/include/libusb-1.0 
-#   INCLUDEPATH += `pkg-config libusb-1.0 --cflags`
+
+    CONFIG += link_pkgconfig
+    PKGCONFIG += libusb-1.0
 
     !exists(/usr/include/libusb-1.0) {
-        error(Install libusb-1.0.0-dev using your package manager.)
+        error(Install libusb-1.0-0-dev using your package manager.)
     }
 }
-
-linux-g++-64 {
-    SOURCES += src/ophid_usbmon_linux.cpp
-    LIBS += -lusb -ludev
-
-    # hidapi library
-    ## rawhid
-    #  SOURCES += hidapi/linux/hid.c
-    ## libusb
-    SOURCES += hidapi/libusb/hid.c
-    LIBS += `pkg-config libusb-1.0 --libs` -lrt -lpthread
-    INCLUDEPATH += /usr/include/libusb-1.0
-#   INCLUDEPATH += `pkg-config libusb-1.0 --cflags`
-    !exists(/usr/include/libusb-1.0) {
-        error(Install libusb-1.0.0-dev using your package manager.)
-    }
-}
-