diff --git a/src/logid/CMakeLists.txt b/src/logid/CMakeLists.txt
index 8bb3f03..e283dcd 100644
--- a/src/logid/CMakeLists.txt
+++ b/src/logid/CMakeLists.txt
@@ -83,7 +83,7 @@ find_library(EVDEV_LIBRARY
 set(IPCGULL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../ipcgull/src/include)
 message(${IPCGULL_INCLUDE_DIRS})
 
-include_directories(${EVDEV_INCLUDE_DIR} ${LIBUDEV_INCLUDE_DIRECTORIES} ${IPCGULL_INCLUDE_DIRS})
+include_directories(. ${EVDEV_INCLUDE_DIR} ${LIBUDEV_INCLUDE_DIRECTORIES} ${IPCGULL_INCLUDE_DIRS})
 
 target_link_libraries(logid ${CMAKE_THREAD_LIBS_INIT} ${EVDEV_LIBRARY} config++
         ${LIBUDEV_LIBRARIES} ipcgull)
diff --git a/src/logid/Configuration.cpp b/src/logid/Configuration.cpp
index 4f48c8d..b489cc4 100644
--- a/src/logid/Configuration.cpp
+++ b/src/logid/Configuration.cpp
@@ -16,11 +16,9 @@
  *
  */
 
+#include <Configuration.h>
+#include <util/log.h>
 #include <utility>
-#include <vector>
-
-#include "Configuration.h"
-#include "util/log.h"
 
 using namespace logid;
 using namespace libconfig;
diff --git a/src/logid/Configuration.h b/src/logid/Configuration.h
index 5c90974..0687b5c 100644
--- a/src/logid/Configuration.h
+++ b/src/logid/Configuration.h
@@ -19,14 +19,12 @@
 #ifndef LOGID_CONFIGURATION_H
 #define LOGID_CONFIGURATION_H
 
-#include <map>
+#include <config/schema.h>
+#include <ipcgull/interface.h>
 #include <libconfig.h++>
 #include <memory>
 #include <chrono>
 #include <set>
-#include <ipcgull/interface.h>
-
-#include "config/schema.h"
 
 namespace logid {
     namespace defaults {
diff --git a/src/logid/Device.cpp b/src/logid/Device.cpp
index ae16cb5..b160fbe 100644
--- a/src/logid/Device.cpp
+++ b/src/logid/Device.cpp
@@ -16,19 +16,18 @@
  *
  */
 
+#include <Device.h>
+#include <DeviceManager.h>
+#include <features/SmartShift.h>
+#include <features/DPI.h>
+#include <features/RemapButton.h>
+#include <features/HiresScroll.h>
+#include <features/DeviceStatus.h>
+#include <features/ThumbWheel.h>
+#include <backend/hidpp20/features/Reset.h>
+#include <util/log.h>
 #include <thread>
 #include <utility>
-#include "util/log.h"
-#include "features/DPI.h"
-#include "Device.h"
-#include "DeviceManager.h"
-#include "Receiver.h"
-#include "features/SmartShift.h"
-#include "features/RemapButton.h"
-#include "backend/hidpp20/features/Reset.h"
-#include "features/HiresScroll.h"
-#include "features/DeviceStatus.h"
-#include "features/ThumbWheel.h"
 
 using namespace logid;
 using namespace logid::backend;
diff --git a/src/logid/Device.h b/src/logid/Device.h
index dc01c5e..a356673 100644
--- a/src/logid/Device.h
+++ b/src/logid/Device.h
@@ -19,13 +19,12 @@
 #ifndef LOGID_DEVICE_H
 #define LOGID_DEVICE_H
 
+#include <features/DeviceFeature.h>
+#include <backend/hidpp20/Device.h>
+#include <backend/hidpp/defs.h>
 #include <ipcgull/node.h>
 #include <ipcgull/interface.h>
-#include "backend/hidpp/defs.h"
-#include "backend/hidpp20/Device.h"
-#include "features/DeviceFeature.h"
-#include "Configuration.h"
-#include "util/log.h"
+#include <Configuration.h>
 
 namespace logid {
     class DeviceManager;
@@ -103,8 +102,6 @@ namespace logid {
             try {
                 return std::dynamic_pointer_cast<T>(it->second);
             } catch (std::bad_cast& e) {
-                logPrintf(ERROR, "bad_cast while getting device feature %s: %s",
-                          name.c_str(), e.what());
                 return nullptr;
             }
         }
diff --git a/src/logid/DeviceManager.cpp b/src/logid/DeviceManager.cpp
index 3729514..4a1e448 100644
--- a/src/logid/DeviceManager.cpp
+++ b/src/logid/DeviceManager.cpp
@@ -16,16 +16,13 @@
  *
  */
 
+#include <DeviceManager.h>
+#include <backend/Error.h>
+#include <util/log.h>
+#include <ipcgull/function.h>
 #include <thread>
 #include <sstream>
 #include <utility>
-#include <ipcgull/function.h>
-
-#include "DeviceManager.h"
-#include "Receiver.h"
-#include "util/log.h"
-#include "backend/hidpp10/Error.h"
-#include "backend/Error.h"
 
 using namespace logid;
 using namespace logid::backend;
diff --git a/src/logid/DeviceManager.h b/src/logid/DeviceManager.h
index 2acbda0..248ab07 100644
--- a/src/logid/DeviceManager.h
+++ b/src/logid/DeviceManager.h
@@ -19,17 +19,12 @@
 #ifndef LOGID_DEVICEMANAGER_H
 #define LOGID_DEVICEMANAGER_H
 
-#include <map>
-#include <thread>
-#include <mutex>
+#include <backend/raw/DeviceMonitor.h>
+#include <Device.h>
+#include <Receiver.h>
 #include <ipcgull/node.h>
 #include <ipcgull/interface.h>
 
-#include "backend/raw/DeviceMonitor.h"
-#include "backend/hidpp/Device.h"
-#include "Device.h"
-#include "Receiver.h"
-
 namespace logid {
     class InputDevice;
 
diff --git a/src/logid/InputDevice.cpp b/src/logid/InputDevice.cpp
index 1db7d6c..19d4c8f 100644
--- a/src/logid/InputDevice.cpp
+++ b/src/logid/InputDevice.cpp
@@ -16,10 +16,9 @@
  *
  */
 
+#include <InputDevice.h>
 #include <system_error>
 
-#include "InputDevice.h"
-
 extern "C"
 {
 #include <libevdev/libevdev.h>
diff --git a/src/logid/Receiver.cpp b/src/logid/Receiver.cpp
index b5277a4..5700369 100644
--- a/src/logid/Receiver.cpp
+++ b/src/logid/Receiver.cpp
@@ -16,12 +16,10 @@
  *
  */
 
-#include "Receiver.h"
-#include "DeviceManager.h"
-#include "util/log.h"
-#include "backend/hidpp10/Error.h"
-#include "backend/hidpp20/Error.h"
-#include "backend/Error.h"
+#include <Receiver.h>
+#include <DeviceManager.h>
+#include <backend/Error.h>
+#include <util/log.h>
 
 using namespace logid;
 using namespace logid::backend;
diff --git a/src/logid/Receiver.h b/src/logid/Receiver.h
index dd8e2ee..8cb3de9 100644
--- a/src/logid/Receiver.h
+++ b/src/logid/Receiver.h
@@ -20,8 +20,8 @@
 #define LOGID_RECEIVER_H
 
 #include <string>
-#include "backend/dj/ReceiverMonitor.h"
-#include "Device.h"
+#include <Device.h>
+#include <backend/dj/ReceiverMonitor.h>
 
 namespace logid {
     class ReceiverNickname {
diff --git a/src/logid/actions/Action.cpp b/src/logid/actions/Action.cpp
index d3116c8..efb3113 100644
--- a/src/logid/actions/Action.cpp
+++ b/src/logid/actions/Action.cpp
@@ -16,16 +16,15 @@
  *
  */
 
-#include <algorithm>
-#include "Action.h"
-#include "KeypressAction.h"
-#include "ToggleSmartShift.h"
-#include "ToggleHiresScroll.h"
-#include "GestureAction.h"
-#include "NullAction.h"
-#include "CycleDPI.h"
-#include "ChangeDPI.h"
-#include "ChangeHostAction.h"
+#include <actions/Action.h>
+#include <actions/KeypressAction.h>
+#include <actions/ToggleSmartShift.h>
+#include <actions/ToggleHiresScroll.h>
+#include <actions/GestureAction.h>
+#include <actions/NullAction.h>
+#include <actions/CycleDPI.h>
+#include <actions/ChangeDPI.h>
+#include <actions/ChangeHostAction.h>
 
 using namespace logid;
 using namespace logid::actions;
diff --git a/src/logid/actions/Action.h b/src/logid/actions/Action.h
index 1ef70cd..d3ff2b0 100644
--- a/src/logid/actions/Action.h
+++ b/src/logid/actions/Action.h
@@ -19,13 +19,12 @@
 #define LOGID_ACTION_H
 
 #include <atomic>
-#include <libconfig.h++>
 #include <memory>
 #include <utility>
+#include <shared_mutex>
 #include <ipcgull/node.h>
 #include <ipcgull/interface.h>
-#include <shared_mutex>
-#include "../config/schema.h"
+#include <config/schema.h>
 
 namespace logid {
     class Device;
diff --git a/src/logid/actions/ChangeDPI.cpp b/src/logid/actions/ChangeDPI.cpp
index e1fe3da..88b418d 100644
--- a/src/logid/actions/ChangeDPI.cpp
+++ b/src/logid/actions/ChangeDPI.cpp
@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "ChangeDPI.h"
-#include "../Device.h"
-#include "../util/task.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
+#include <actions/ChangeDPI.h>
+#include <Device.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <util/task.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 
diff --git a/src/logid/actions/ChangeDPI.h b/src/logid/actions/ChangeDPI.h
index 17bde97..2a3a23f 100644
--- a/src/logid/actions/ChangeDPI.h
+++ b/src/logid/actions/ChangeDPI.h
@@ -18,9 +18,8 @@
 #ifndef LOGID_ACTION_CHANGEDPI_H
 #define LOGID_ACTION_CHANGEDPI_H
 
-#include <libconfig.h++>
-#include "Action.h"
-#include "../features/DPI.h"
+#include <actions/Action.h>
+#include <features/DPI.h>
 
 namespace logid::actions {
     class ChangeDPI : public Action {
diff --git a/src/logid/actions/ChangeHostAction.cpp b/src/logid/actions/ChangeHostAction.cpp
index 3b821fd..30840cb 100644
--- a/src/logid/actions/ChangeHostAction.cpp
+++ b/src/logid/actions/ChangeHostAction.cpp
@@ -15,11 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <actions/ChangeHostAction.h>
+#include <Device.h>
+#include <backend/hidpp20/features/ReprogControls.h>
 #include <algorithm>
-#include "ChangeHostAction.h"
-#include "../Device.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
-#include "../util/task.h"
+#include <util/task.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 using namespace logid::backend;
diff --git a/src/logid/actions/ChangeHostAction.h b/src/logid/actions/ChangeHostAction.h
index 4bb9c96..2d13384 100644
--- a/src/logid/actions/ChangeHostAction.h
+++ b/src/logid/actions/ChangeHostAction.h
@@ -18,9 +18,8 @@
 #ifndef LOGID_ACTION_CHANGEHOSTACTION_H
 #define LOGID_ACTION_CHANGEHOSTACTION_H
 
-#include <libconfig.h++>
-#include "Action.h"
-#include "../backend/hidpp20/features/ChangeHost.h"
+#include <actions/Action.h>
+#include <backend/hidpp20/features/ChangeHost.h>
 
 namespace logid::actions {
     class ChangeHostAction : public Action {
diff --git a/src/logid/actions/CycleDPI.cpp b/src/logid/actions/CycleDPI.cpp
index 58c768c..f6ab5ae 100644
--- a/src/logid/actions/CycleDPI.cpp
+++ b/src/logid/actions/CycleDPI.cpp
@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "CycleDPI.h"
-#include "../Device.h"
-#include "../util/task.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
+#include <actions/CycleDPI.h>
+#include <Device.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <util/task.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 using namespace libconfig;
diff --git a/src/logid/actions/CycleDPI.h b/src/logid/actions/CycleDPI.h
index b0cb4d8..828f513 100644
--- a/src/logid/actions/CycleDPI.h
+++ b/src/logid/actions/CycleDPI.h
@@ -18,9 +18,8 @@
 #ifndef LOGID_ACTION_CYCLEDPI_H
 #define LOGID_ACTION_CYCLEDPI_H
 
-#include <libconfig.h++>
-#include "Action.h"
-#include "../features/DPI.h"
+#include <actions/Action.h>
+#include <features/DPI.h>
 
 namespace logid::actions {
     class CycleDPI : public Action {
diff --git a/src/logid/actions/GestureAction.cpp b/src/logid/actions/GestureAction.cpp
index 0ddebf2..b12d9be 100644
--- a/src/logid/actions/GestureAction.cpp
+++ b/src/logid/actions/GestureAction.cpp
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <actions/GestureAction.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <util/log.h>
 #include <algorithm>
-#include "GestureAction.h"
-#include "../Device.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
 
 using namespace logid::actions;
 using namespace logid;
diff --git a/src/logid/actions/GestureAction.h b/src/logid/actions/GestureAction.h
index 9b3859f..7ef8f3a 100644
--- a/src/logid/actions/GestureAction.h
+++ b/src/logid/actions/GestureAction.h
@@ -19,9 +19,8 @@
 #define LOGID_ACTION_GESTUREACTION_H
 
 #include <map>
-#include <libconfig.h++>
-#include "Action.h"
-#include "gesture/Gesture.h"
+#include <actions/Action.h>
+#include <actions/gesture/Gesture.h>
 
 namespace logid::actions {
     class GestureAction : public Action {
diff --git a/src/logid/actions/KeypressAction.cpp b/src/logid/actions/KeypressAction.cpp
index 091b212..ee8d1de 100644
--- a/src/logid/actions/KeypressAction.cpp
+++ b/src/logid/actions/KeypressAction.cpp
@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "KeypressAction.h"
-#include "../Device.h"
-#include "../InputDevice.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
+#include <actions/KeypressAction.h>
+#include <Device.h>
+#include <InputDevice.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 using namespace logid::backend;
diff --git a/src/logid/actions/KeypressAction.h b/src/logid/actions/KeypressAction.h
index ea3ee12..226db94 100644
--- a/src/logid/actions/KeypressAction.h
+++ b/src/logid/actions/KeypressAction.h
@@ -19,8 +19,7 @@
 #define LOGID_ACTION_KEYPRESS_H
 
 #include <vector>
-#include <libconfig.h++>
-#include "Action.h"
+#include <actions/Action.h>
 
 namespace logid::actions {
     class KeypressAction : public Action {
diff --git a/src/logid/actions/NullAction.cpp b/src/logid/actions/NullAction.cpp
index f96f615..0734aa6 100644
--- a/src/logid/actions/NullAction.cpp
+++ b/src/logid/actions/NullAction.cpp
@@ -15,9 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "NullAction.h"
-#include "../Device.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
+#include <actions/NullAction.h>
+#include <backend/hidpp20/features/ReprogControls.h>
 
 using namespace logid::actions;
 
diff --git a/src/logid/actions/NullAction.h b/src/logid/actions/NullAction.h
index 832b2e3..1aeca57 100644
--- a/src/logid/actions/NullAction.h
+++ b/src/logid/actions/NullAction.h
@@ -18,7 +18,7 @@
 #ifndef LOGID_ACTION_NULL_H
 #define LOGID_ACTION_NULL_H
 
-#include "Action.h"
+#include <actions/Action.h>
 
 namespace logid::actions {
     class NullAction : public Action {
diff --git a/src/logid/actions/ToggleHiresScroll.cpp b/src/logid/actions/ToggleHiresScroll.cpp
index d51876e..1345184 100644
--- a/src/logid/actions/ToggleHiresScroll.cpp
+++ b/src/logid/actions/ToggleHiresScroll.cpp
@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "ToggleHiresScroll.h"
-#include "../Device.h"
-#include "../util/task.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
+#include <actions/ToggleHiresScroll.h>
+#include <Device.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <util/task.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 using namespace logid::backend;
diff --git a/src/logid/actions/ToggleHiresScroll.h b/src/logid/actions/ToggleHiresScroll.h
index 6d4b529..3376c4f 100644
--- a/src/logid/actions/ToggleHiresScroll.h
+++ b/src/logid/actions/ToggleHiresScroll.h
@@ -18,8 +18,8 @@
 #ifndef LOGID_ACTION_TOGGLEHIRESSCROLL_H
 #define LOGID_ACTION_TOGGLEHIRESSCROLL_H
 
-#include "Action.h"
-#include "../features/HiresScroll.h"
+#include <actions/Action.h>
+#include <features/HiresScroll.h>
 
 namespace logid::actions {
     class ToggleHiresScroll : public Action {
diff --git a/src/logid/actions/ToggleSmartShift.cpp b/src/logid/actions/ToggleSmartShift.cpp
index e08989c..f6445fe 100644
--- a/src/logid/actions/ToggleSmartShift.cpp
+++ b/src/logid/actions/ToggleSmartShift.cpp
@@ -15,10 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "ToggleSmartShift.h"
-#include "../Device.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
-#include "../util/task.h"
+
+#include <actions/ToggleSmartShift.h>
+#include <Device.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <util/task.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 using namespace logid::backend;
diff --git a/src/logid/actions/ToggleSmartShift.h b/src/logid/actions/ToggleSmartShift.h
index 627e2b4..e987ccd 100644
--- a/src/logid/actions/ToggleSmartShift.h
+++ b/src/logid/actions/ToggleSmartShift.h
@@ -18,9 +18,8 @@
 #ifndef LOGID_ACTION_TOGGLESMARTSHIFT_H
 #define LOGID_ACTION_TOGGLESMARTSHIFT_H
 
-#include <libconfig.h++>
-#include "Action.h"
-#include "../features/SmartShift.h"
+#include <actions/Action.h>
+#include <features/SmartShift.h>
 
 namespace logid::actions {
     class ToggleSmartShift : public Action {
diff --git a/src/logid/actions/gesture/AxisGesture.cpp b/src/logid/actions/gesture/AxisGesture.cpp
index 82711d3..ac4a810 100644
--- a/src/logid/actions/gesture/AxisGesture.cpp
+++ b/src/logid/actions/gesture/AxisGesture.cpp
@@ -16,9 +16,10 @@
  *
  */
 #include <cmath>
-#include "AxisGesture.h"
-#include "../../Device.h"
-#include "../../InputDevice.h"
+#include <actions/gesture/AxisGesture.h>
+#include <Device.h>
+#include <InputDevice.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 
diff --git a/src/logid/actions/gesture/AxisGesture.h b/src/logid/actions/gesture/AxisGesture.h
index af80c01..eccb5fb 100644
--- a/src/logid/actions/gesture/AxisGesture.h
+++ b/src/logid/actions/gesture/AxisGesture.h
@@ -18,7 +18,7 @@
 #ifndef LOGID_ACTION_AXISGESTURE_H
 #define LOGID_ACTION_AXISGESTURE_H
 
-#include "Gesture.h"
+#include <actions/gesture/Gesture.h>
 
 namespace logid::actions {
     class AxisGesture : public Gesture {
diff --git a/src/logid/actions/gesture/Gesture.cpp b/src/logid/actions/gesture/Gesture.cpp
index f5e7180..201474d 100644
--- a/src/logid/actions/gesture/Gesture.cpp
+++ b/src/logid/actions/gesture/Gesture.cpp
@@ -16,13 +16,13 @@
  *
  */
 
+#include <actions/gesture/Gesture.h>
 #include <utility>
-#include "Gesture.h"
-#include "ReleaseGesture.h"
-#include "ThresholdGesture.h"
-#include "IntervalGesture.h"
-#include "AxisGesture.h"
-#include "NullGesture.h"
+#include <actions/gesture/ReleaseGesture.h>
+#include <actions/gesture/ThresholdGesture.h>
+#include <actions/gesture/IntervalGesture.h>
+#include <actions/gesture/AxisGesture.h>
+#include <actions/gesture/NullGesture.h>
 
 using namespace logid;
 using namespace logid::actions;
diff --git a/src/logid/actions/gesture/Gesture.h b/src/logid/actions/gesture/Gesture.h
index 65dab68..13822b6 100644
--- a/src/logid/actions/gesture/Gesture.h
+++ b/src/logid/actions/gesture/Gesture.h
@@ -19,8 +19,7 @@
 #define LOGID_ACTION_GESTURE_H
 
 #include <utility>
-
-#include "../Action.h"
+#include <actions/Action.h>
 
 namespace logid::actions {
     class InvalidGesture : public std::exception {
diff --git a/src/logid/actions/gesture/IntervalGesture.cpp b/src/logid/actions/gesture/IntervalGesture.cpp
index 12d713b..48c61aa 100644
--- a/src/logid/actions/gesture/IntervalGesture.cpp
+++ b/src/logid/actions/gesture/IntervalGesture.cpp
@@ -15,8 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "IntervalGesture.h"
-#include "../../Configuration.h"
+#include <actions/gesture/IntervalGesture.h>
+#include <Configuration.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 
diff --git a/src/logid/actions/gesture/IntervalGesture.h b/src/logid/actions/gesture/IntervalGesture.h
index 95081e0..434e192 100644
--- a/src/logid/actions/gesture/IntervalGesture.h
+++ b/src/logid/actions/gesture/IntervalGesture.h
@@ -18,7 +18,7 @@
 #ifndef LOGID_ACTION_INTERVALGESTURE_H
 #define LOGID_ACTION_INTERVALGESTURE_H
 
-#include "Gesture.h"
+#include <actions/gesture/Gesture.h>
 
 namespace logid::actions {
     class IntervalGesture : public Gesture {
diff --git a/src/logid/actions/gesture/NullGesture.cpp b/src/logid/actions/gesture/NullGesture.cpp
index 7bed193..4be3cd6 100644
--- a/src/logid/actions/gesture/NullGesture.cpp
+++ b/src/logid/actions/gesture/NullGesture.cpp
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "NullGesture.h"
-#include "../../Configuration.h"
+#include <actions/gesture/NullGesture.h>
+#include <Configuration.h>
 
 using namespace logid::actions;
 
diff --git a/src/logid/actions/gesture/NullGesture.h b/src/logid/actions/gesture/NullGesture.h
index 7689836..181ff37 100644
--- a/src/logid/actions/gesture/NullGesture.h
+++ b/src/logid/actions/gesture/NullGesture.h
@@ -18,7 +18,7 @@
 #ifndef LOGID_ACTION_NULLGESTURE_H
 #define LOGID_ACTION_NULLGESTURE_H
 
-#include "Gesture.h"
+#include <actions/gesture/Gesture.h>
 
 namespace logid::actions {
     class NullGesture : public Gesture {
diff --git a/src/logid/actions/gesture/ReleaseGesture.cpp b/src/logid/actions/gesture/ReleaseGesture.cpp
index 568529f..1d0b54c 100644
--- a/src/logid/actions/gesture/ReleaseGesture.cpp
+++ b/src/logid/actions/gesture/ReleaseGesture.cpp
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "ReleaseGesture.h"
-#include "../../Configuration.h"
+#include <actions/gesture/ReleaseGesture.h>
+#include <Configuration.h>
 
 using namespace logid::actions;
 
diff --git a/src/logid/actions/gesture/ReleaseGesture.h b/src/logid/actions/gesture/ReleaseGesture.h
index c8f4c5b..f417d83 100644
--- a/src/logid/actions/gesture/ReleaseGesture.h
+++ b/src/logid/actions/gesture/ReleaseGesture.h
@@ -18,7 +18,7 @@
 #ifndef LOGID_ACTION_RELEASEGESTURE_H
 #define LOGID_ACTION_RELEASEGESTURE_H
 
-#include "Gesture.h"
+#include <actions/gesture/Gesture.h>
 
 namespace logid::actions {
     class ReleaseGesture : public Gesture {
diff --git a/src/logid/actions/gesture/ThresholdGesture.cpp b/src/logid/actions/gesture/ThresholdGesture.cpp
index 0c2bfd6..5dbaba8 100644
--- a/src/logid/actions/gesture/ThresholdGesture.cpp
+++ b/src/logid/actions/gesture/ThresholdGesture.cpp
@@ -15,8 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "ThresholdGesture.h"
-#include "../../Configuration.h"
+#include <actions/gesture/ThresholdGesture.h>
+#include <Configuration.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 
diff --git a/src/logid/actions/gesture/ThresholdGesture.h b/src/logid/actions/gesture/ThresholdGesture.h
index d401c6a..c5a90f1 100644
--- a/src/logid/actions/gesture/ThresholdGesture.h
+++ b/src/logid/actions/gesture/ThresholdGesture.h
@@ -18,7 +18,7 @@
 #ifndef LOGID_ACTION_THRESHOLDGESTURE_H
 #define LOGID_ACTION_THRESHOLDGESTURE_H
 
-#include "Gesture.h"
+#include <actions/gesture/Gesture.h>
 
 namespace logid::actions {
     class ThresholdGesture : public Gesture {
diff --git a/src/logid/backend/Error.cpp b/src/logid/backend/Error.cpp
index 5c9227d..8cb841b 100644
--- a/src/logid/backend/Error.cpp
+++ b/src/logid/backend/Error.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "Error.h"
+#include <backend/Error.h>
 
 const char* logid::backend::TimeoutError::what() const noexcept {
     return "Device timed out";
diff --git a/src/logid/backend/dj/Error.cpp b/src/logid/backend/dj/Error.cpp
index c24b5c2..8ee6d4e 100644
--- a/src/logid/backend/dj/Error.cpp
+++ b/src/logid/backend/dj/Error.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "Error.h"
+#include <backend/dj/Error.h>
 
 using namespace logid::backend::dj;
 
diff --git a/src/logid/backend/dj/Receiver.cpp b/src/logid/backend/dj/Receiver.cpp
index 6f47ecd..b51efe9 100644
--- a/src/logid/backend/dj/Receiver.cpp
+++ b/src/logid/backend/dj/Receiver.cpp
@@ -16,10 +16,9 @@
  *
  */
 
+#include <backend/dj/Receiver.h>
 #include <cassert>
-#include "Report.h"
-#include "Receiver.h"
-#include "Error.h"
+#include <backend/dj/Error.h>
 
 using namespace logid::backend::dj;
 using namespace logid::backend;
diff --git a/src/logid/backend/dj/Receiver.h b/src/logid/backend/dj/Receiver.h
index e26a8c4..d21c6c1 100644
--- a/src/logid/backend/dj/Receiver.h
+++ b/src/logid/backend/dj/Receiver.h
@@ -20,10 +20,10 @@
 #define LOGID_BACKEND_DJ_RECEIVER_H
 
 #include <cstdint>
-#include "../raw/RawDevice.h"
-#include "Report.h"
-#include "../hidpp/Report.h"
-#include "../hidpp10/Device.h"
+#include <backend/raw/RawDevice.h>
+#include <backend/dj/Report.h>
+#include <backend/hidpp/Report.h>
+#include <backend/hidpp10/Device.h>
 
 namespace logid::backend::dj {
     struct EventHandler {
diff --git a/src/logid/backend/dj/ReceiverMonitor.cpp b/src/logid/backend/dj/ReceiverMonitor.cpp
index 71a3ff8..8570cfa 100644
--- a/src/logid/backend/dj/ReceiverMonitor.cpp
+++ b/src/logid/backend/dj/ReceiverMonitor.cpp
@@ -16,12 +16,11 @@
  *
  */
 
-#include "ReceiverMonitor.h"
-#include "../../util/task.h"
-#include "../../util/log.h"
-
+#include <backend/dj/ReceiverMonitor.h>
 #include <utility>
 #include <cassert>
+#include <util/task.h>
+#include <util/log.h>
 
 using namespace logid::backend::dj;
 
diff --git a/src/logid/backend/dj/ReceiverMonitor.h b/src/logid/backend/dj/ReceiverMonitor.h
index bbecc51..59ce595 100644
--- a/src/logid/backend/dj/ReceiverMonitor.h
+++ b/src/logid/backend/dj/ReceiverMonitor.h
@@ -21,8 +21,8 @@
 
 #include <cstdint>
 #include <string>
-#include "Receiver.h"
-#include "../hidpp/defs.h"
+#include <backend/dj/Receiver.h>
+#include <backend/hidpp/defs.h>
 
 namespace logid::backend::dj {
     // This class will run on the RawDevice thread,
diff --git a/src/logid/backend/dj/Report.cpp b/src/logid/backend/dj/Report.cpp
index 6d33ab9..8be886a 100644
--- a/src/logid/backend/dj/Report.cpp
+++ b/src/logid/backend/dj/Report.cpp
@@ -16,10 +16,10 @@
  *
  */
 
-#include <array>
+#include <backend/dj/Report.h>
 #include <algorithm>
+#include <array>
 #include <cassert>
-#include "Report.h"
 
 using namespace logid::backend::dj;
 using namespace logid::backend;
diff --git a/src/logid/backend/dj/Report.h b/src/logid/backend/dj/Report.h
index 46ad821..8ddae8b 100644
--- a/src/logid/backend/dj/Report.h
+++ b/src/logid/backend/dj/Report.h
@@ -20,9 +20,9 @@
 #define LOGID_BACKEND_DJ_REPORT_H
 
 #include <cstdint>
-#include "../raw/RawDevice.h"
-#include "defs.h"
-#include "../hidpp/defs.h"
+#include <vector>
+#include <backend/dj/defs.h>
+#include <backend/hidpp/defs.h>
 
 namespace logid::backend::dj {
     namespace Offset {
diff --git a/src/logid/backend/hidpp/Device.cpp b/src/logid/backend/hidpp/Device.cpp
index 96472e2..ef46cd0 100644
--- a/src/logid/backend/hidpp/Device.cpp
+++ b/src/logid/backend/hidpp/Device.cpp
@@ -16,15 +16,15 @@
  *
  */
 
+#include <backend/hidpp20/Device.h>
+#include <backend/hidpp20/features/Root.h>
+#include <backend/hidpp20/features/DeviceName.h>
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp10/Error.h>
+#include <backend/dj/Receiver.h>
+#include <backend/Error.h>
 #include <cassert>
 #include <utility>
-#include "Device.h"
-#include "Report.h"
-#include "../hidpp20/features/Root.h"
-#include "../hidpp20/features/DeviceName.h"
-#include "../hidpp10/Error.h"
-#include "../Error.h"
-#include "../dj/Receiver.h"
 
 using namespace logid::backend;
 using namespace logid::backend::hidpp;
diff --git a/src/logid/backend/hidpp/Device.h b/src/logid/backend/hidpp/Device.h
index 9536a73..9c286f3 100644
--- a/src/logid/backend/hidpp/Device.h
+++ b/src/logid/backend/hidpp/Device.h
@@ -25,9 +25,9 @@
 #include <memory>
 #include <functional>
 #include <map>
-#include "../raw/RawDevice.h"
-#include "Report.h"
-#include "defs.h"
+#include <backend/raw/RawDevice.h>
+#include <backend/hidpp/Report.h>
+#include <backend/hidpp/defs.h>
 
 namespace logid::backend::dj {
     // Need to define here for a constructor
diff --git a/src/logid/backend/hidpp/Report.cpp b/src/logid/backend/hidpp/Report.cpp
index 9c53499..d1606ee 100644
--- a/src/logid/backend/hidpp/Report.cpp
+++ b/src/logid/backend/hidpp/Report.cpp
@@ -16,12 +16,12 @@
  *
  */
 
+#include <backend/hidpp/Report.h>
 #include <array>
 #include <algorithm>
 #include <cassert>
-#include "Report.h"
-#include "../hidpp10/Error.h"
-#include "../hidpp20/Error.h"
+#include <backend/hidpp10/Error.h>
+#include <backend/hidpp20/Error.h>
 
 using namespace logid::backend::hidpp;
 using namespace logid::backend;
diff --git a/src/logid/backend/hidpp/Report.h b/src/logid/backend/hidpp/Report.h
index fbe2e73..38f155e 100644
--- a/src/logid/backend/hidpp/Report.h
+++ b/src/logid/backend/hidpp/Report.h
@@ -19,9 +19,9 @@
 #ifndef LOGID_BACKEND_HIDPP_REPORT_H
 #define LOGID_BACKEND_HIDPP_REPORT_H
 
+#include <backend/raw/RawDevice.h>
+#include <backend/hidpp/defs.h>
 #include <cstdint>
-#include "../raw/RawDevice.h"
-#include "defs.h"
 
 /* Some devices only support a subset of these reports */
 #define HIDPP_REPORT_SHORT_SUPPORTED      1U
diff --git a/src/logid/backend/hidpp10/Device.cpp b/src/logid/backend/hidpp10/Device.cpp
index 4ec4af9..ae643cd 100644
--- a/src/logid/backend/hidpp10/Device.cpp
+++ b/src/logid/backend/hidpp10/Device.cpp
@@ -16,11 +16,10 @@
  *
  */
 
+#include <backend/hidpp10/Device.h>
+#include <backend/Error.h>
 #include <cassert>
 #include <utility>
-#include "Device.h"
-#include "defs.h"
-#include "../Error.h"
 
 using namespace logid::backend;
 using namespace logid::backend::hidpp10;
diff --git a/src/logid/backend/hidpp10/Device.h b/src/logid/backend/hidpp10/Device.h
index 9dc8034..a63222f 100644
--- a/src/logid/backend/hidpp10/Device.h
+++ b/src/logid/backend/hidpp10/Device.h
@@ -21,10 +21,9 @@
 
 #include <optional>
 #include <variant>
-
-#include "../hidpp/Device.h"
-#include "Error.h"
-#include "defs.h"
+#include <backend/hidpp/Device.h>
+#include <backend/hidpp10/Error.h>
+#include <backend/hidpp10/defs.h>
 
 namespace logid::backend::hidpp10 {
     class Device : public hidpp::Device {
diff --git a/src/logid/backend/hidpp10/Error.cpp b/src/logid/backend/hidpp10/Error.cpp
index f88f369..ed3aa3d 100644
--- a/src/logid/backend/hidpp10/Error.cpp
+++ b/src/logid/backend/hidpp10/Error.cpp
@@ -16,9 +16,8 @@
  *
  */
 
+#include <backend/hidpp10/Error.h>
 #include <cassert>
-#include <string>
-#include "Error.h"
 
 using namespace logid::backend::hidpp10;
 
diff --git a/src/logid/backend/hidpp20/Device.cpp b/src/logid/backend/hidpp20/Device.cpp
index defaabb..bcf5aeb 100644
--- a/src/logid/backend/hidpp20/Device.cpp
+++ b/src/logid/backend/hidpp20/Device.cpp
@@ -17,10 +17,9 @@
  */
 
 #include <cassert>
-
-#include "Device.h"
-#include "../Error.h"
-#include "../dj/Receiver.h"
+#include <backend/hidpp20/Device.h>
+#include <backend/Error.h>
+#include <backend/dj/Receiver.h>
 
 using namespace logid::backend;
 using namespace logid::backend::hidpp20;
diff --git a/src/logid/backend/hidpp20/Device.h b/src/logid/backend/hidpp20/Device.h
index 4a0e3ae..cb9f55f 100644
--- a/src/logid/backend/hidpp20/Device.h
+++ b/src/logid/backend/hidpp20/Device.h
@@ -22,9 +22,8 @@
 #include <cstdint>
 #include <optional>
 #include <variant>
-
-#include "../hidpp/Device.h"
-#include "Error.h"
+#include <backend/hidpp20/Error.h>
+#include <backend/hidpp/Device.h>
 
 namespace logid::backend::hidpp20 {
     class Device : public hidpp::Device {
diff --git a/src/logid/backend/hidpp20/Error.cpp b/src/logid/backend/hidpp20/Error.cpp
index 4f19577..355a888 100644
--- a/src/logid/backend/hidpp20/Error.cpp
+++ b/src/logid/backend/hidpp20/Error.cpp
@@ -16,8 +16,8 @@
  *
  */
 
+#include <backend/hidpp20/Error.h>
 #include <cassert>
-#include "Error.h"
 
 using namespace logid::backend::hidpp20;
 
diff --git a/src/logid/backend/hidpp20/EssentialFeature.cpp b/src/logid/backend/hidpp20/EssentialFeature.cpp
index 3eadfcb..1d836bf 100644
--- a/src/logid/backend/hidpp20/EssentialFeature.cpp
+++ b/src/logid/backend/hidpp20/EssentialFeature.cpp
@@ -16,11 +16,11 @@
  *
  */
 
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/EssentialFeature.h>
+#include <backend/hidpp20/features/Root.h>
+#include <backend/hidpp20/Error.h>
 #include <cassert>
-#include "EssentialFeature.h"
-#include "feature_defs.h"
-#include "features/Root.h"
-#include "Error.h"
 
 using namespace logid::backend::hidpp20;
 
diff --git a/src/logid/backend/hidpp20/EssentialFeature.h b/src/logid/backend/hidpp20/EssentialFeature.h
index 9dbe433..3247d78 100644
--- a/src/logid/backend/hidpp20/EssentialFeature.h
+++ b/src/logid/backend/hidpp20/EssentialFeature.h
@@ -25,7 +25,7 @@
  * hidpp::Device class. No version checks are provided here
  */
 
-#include "Device.h"
+#include <backend/hidpp/Device.h>
 
 namespace logid::backend::hidpp20 {
     class EssentialFeature {
diff --git a/src/logid/backend/hidpp20/Feature.cpp b/src/logid/backend/hidpp20/Feature.cpp
index ae9fb0d..a810c6d 100644
--- a/src/logid/backend/hidpp20/Feature.cpp
+++ b/src/logid/backend/hidpp20/Feature.cpp
@@ -16,10 +16,9 @@
  *
  */
 
-#include "Error.h"
-#include "Feature.h"
-#include "feature_defs.h"
-#include "features/Root.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/Device.h>
+#include <backend/hidpp20/features/Root.h>
 
 using namespace logid::backend::hidpp20;
 
@@ -64,6 +63,6 @@ Feature::Feature(Device* dev, uint16_t _id) : _device(dev) {
     }
 }
 
-uint8_t Feature::featureIndex() {
+uint8_t Feature::featureIndex() const {
     return _index;
 }
\ No newline at end of file
diff --git a/src/logid/backend/hidpp20/Feature.h b/src/logid/backend/hidpp20/Feature.h
index a969500..8aff48d 100644
--- a/src/logid/backend/hidpp20/Feature.h
+++ b/src/logid/backend/hidpp20/Feature.h
@@ -20,9 +20,12 @@
 #define LOGID_BACKEND_HIDPP20_FEATURE_H
 
 #include <cstdint>
-#include "Device.h"
+#include <exception>
+#include <vector>
 
 namespace logid::backend::hidpp20 {
+    class Device;
+
     class UnsupportedFeature : public std::exception {
     public:
         explicit UnsupportedFeature(uint16_t ID) : _f_id(ID) {}
@@ -41,7 +44,7 @@ namespace logid::backend::hidpp20 {
 
         virtual uint16_t getID() = 0;
 
-        uint8_t featureIndex();
+        [[nodiscard]] uint8_t featureIndex() const;
 
         virtual ~Feature() = default;
 
diff --git a/src/logid/backend/hidpp20/features/AdjustableDPI.cpp b/src/logid/backend/hidpp20/features/AdjustableDPI.cpp
index a9ceb72..15dcd2b 100644
--- a/src/logid/backend/hidpp20/features/AdjustableDPI.cpp
+++ b/src/logid/backend/hidpp20/features/AdjustableDPI.cpp
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "AdjustableDPI.h"
+#include <backend/hidpp20/features/AdjustableDPI.h>
 
 using namespace logid::backend::hidpp20;
 
diff --git a/src/logid/backend/hidpp20/features/AdjustableDPI.h b/src/logid/backend/hidpp20/features/AdjustableDPI.h
index 1078039..a7a7fdb 100644
--- a/src/logid/backend/hidpp20/features/AdjustableDPI.h
+++ b/src/logid/backend/hidpp20/features/AdjustableDPI.h
@@ -18,8 +18,8 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_ADJUSTABLEDPI_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_ADJUSTABLEDPI_H
 
-#include "../feature_defs.h"
-#include "../Feature.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/feature_defs.h>
 
 namespace logid::backend::hidpp20 {
     class AdjustableDPI : public Feature {
diff --git a/src/logid/backend/hidpp20/features/ChangeHost.cpp b/src/logid/backend/hidpp20/features/ChangeHost.cpp
index 69ff476..bcf9fe9 100644
--- a/src/logid/backend/hidpp20/features/ChangeHost.cpp
+++ b/src/logid/backend/hidpp20/features/ChangeHost.cpp
@@ -15,7 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "ChangeHost.h"
+#include <backend/hidpp20/features/ChangeHost.h>
+#include <backend/hidpp20/Error.h>
 
 using namespace logid::backend::hidpp20;
 
diff --git a/src/logid/backend/hidpp20/features/ChangeHost.h b/src/logid/backend/hidpp20/features/ChangeHost.h
index 2229e87..559a6bb 100644
--- a/src/logid/backend/hidpp20/features/ChangeHost.h
+++ b/src/logid/backend/hidpp20/features/ChangeHost.h
@@ -18,8 +18,8 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_CHANGEHOST_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_CHANGEHOST_H
 
-#include "../feature_defs.h"
-#include "../Feature.h"
+#include <backend/hidpp20/feature_defs.h>
+#include <backend/hidpp20/Feature.h>
 
 namespace logid::backend::hidpp20 {
     class ChangeHost : public Feature {
diff --git a/src/logid/backend/hidpp20/features/DeviceName.cpp b/src/logid/backend/hidpp20/features/DeviceName.cpp
index 6ac9d64..3cf94f8 100644
--- a/src/logid/backend/hidpp20/features/DeviceName.cpp
+++ b/src/logid/backend/hidpp20/features/DeviceName.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "DeviceName.h"
+#include <backend/hidpp20/features/DeviceName.h>
 
 using namespace logid::backend;
 using namespace logid::backend::hidpp20;
diff --git a/src/logid/backend/hidpp20/features/DeviceName.h b/src/logid/backend/hidpp20/features/DeviceName.h
index 0b68e0d..71a8c11 100644
--- a/src/logid/backend/hidpp20/features/DeviceName.h
+++ b/src/logid/backend/hidpp20/features/DeviceName.h
@@ -19,9 +19,8 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_DEVICENAME_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_DEVICENAME_H
 
-#include "../Feature.h"
-#include "../feature_defs.h"
-#include "../EssentialFeature.h"
+#include <backend/hidpp20/EssentialFeature.h>
+#include <backend/hidpp20/feature_defs.h>
 
 namespace logid::backend::hidpp20 {
     class DeviceName : public EssentialFeature {
diff --git a/src/logid/backend/hidpp20/features/FeatureSet.cpp b/src/logid/backend/hidpp20/features/FeatureSet.cpp
index 0c9af9c..f626bbb 100644
--- a/src/logid/backend/hidpp20/features/FeatureSet.cpp
+++ b/src/logid/backend/hidpp20/features/FeatureSet.cpp
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "FeatureSet.h"
+#include <backend/hidpp20/features/FeatureSet.h>
 
 using namespace logid::backend::hidpp20;
 
diff --git a/src/logid/backend/hidpp20/features/FeatureSet.h b/src/logid/backend/hidpp20/features/FeatureSet.h
index 61c7a13..d8692a3 100644
--- a/src/logid/backend/hidpp20/features/FeatureSet.h
+++ b/src/logid/backend/hidpp20/features/FeatureSet.h
@@ -18,8 +18,9 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_FEATURESET_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_FEATURESET_H
 
-#include "../Feature.h"
-#include "../feature_defs.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/feature_defs.h>
+#include <map>
 
 namespace logid::backend::hidpp20 {
     class FeatureSet : public Feature {
diff --git a/src/logid/backend/hidpp20/features/HiresScroll.cpp b/src/logid/backend/hidpp20/features/HiresScroll.cpp
index 9d91f09..2a03190 100644
--- a/src/logid/backend/hidpp20/features/HiresScroll.cpp
+++ b/src/logid/backend/hidpp20/features/HiresScroll.cpp
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <backend/hidpp20/features/HiresScroll.h>
 #include <cassert>
-#include "HiresScroll.h"
 
 using namespace logid::backend::hidpp20;
 
diff --git a/src/logid/backend/hidpp20/features/HiresScroll.h b/src/logid/backend/hidpp20/features/HiresScroll.h
index 3c0db58..56eb0d4 100644
--- a/src/logid/backend/hidpp20/features/HiresScroll.h
+++ b/src/logid/backend/hidpp20/features/HiresScroll.h
@@ -18,8 +18,9 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_HIRESSCROLL_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_HIRESSCROLL_H
 
-#include "../Feature.h"
-#include "../feature_defs.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/feature_defs.h>
+#include <backend/hidpp/Report.h>
 
 namespace logid::backend::hidpp20 {
     class HiresScroll : public Feature {
diff --git a/src/logid/backend/hidpp20/features/ReprogControls.cpp b/src/logid/backend/hidpp20/features/ReprogControls.cpp
index 8ea4d72..dd3a7f9 100644
--- a/src/logid/backend/hidpp20/features/ReprogControls.cpp
+++ b/src/logid/backend/hidpp20/features/ReprogControls.cpp
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <backend/hidpp20/Error.h>
 #include <cassert>
-#include "../Error.h"
-#include "ReprogControls.h"
 
 using namespace logid::backend::hidpp20;
 
diff --git a/src/logid/backend/hidpp20/features/ReprogControls.h b/src/logid/backend/hidpp20/features/ReprogControls.h
index 0c0d769..d464110 100644
--- a/src/logid/backend/hidpp20/features/ReprogControls.h
+++ b/src/logid/backend/hidpp20/features/ReprogControls.h
@@ -18,10 +18,12 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_REPROGCONTROLS_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_REPROGCONTROLS_H
 
+#include <backend/hidpp20/feature_defs.h>
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp/Report.h>
 #include <map>
-
-#include "../feature_defs.h"
-#include "../Feature.h"
+#include <set>
+#include <memory>
 
 namespace logid::backend::hidpp20 {
     class ReprogControls : public Feature {
diff --git a/src/logid/backend/hidpp20/features/Reset.cpp b/src/logid/backend/hidpp20/features/Reset.cpp
index bb8e6ea..7cc0447 100644
--- a/src/logid/backend/hidpp20/features/Reset.cpp
+++ b/src/logid/backend/hidpp20/features/Reset.cpp
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "Reset.h"
+#include <backend/hidpp20/features/Reset.h>
 
 using namespace logid::backend::hidpp20;
 
diff --git a/src/logid/backend/hidpp20/features/Reset.h b/src/logid/backend/hidpp20/features/Reset.h
index c737f00..4bdb848 100644
--- a/src/logid/backend/hidpp20/features/Reset.h
+++ b/src/logid/backend/hidpp20/features/Reset.h
@@ -18,8 +18,8 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_RESET_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_RESET_H
 
-#include "../Feature.h"
-#include "../feature_defs.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/feature_defs.h>
 
 namespace logid::backend::hidpp20 {
     class Reset : public Feature {
diff --git a/src/logid/backend/hidpp20/features/Root.cpp b/src/logid/backend/hidpp20/features/Root.cpp
index 662036a..68e0267 100644
--- a/src/logid/backend/hidpp20/features/Root.cpp
+++ b/src/logid/backend/hidpp20/features/Root.cpp
@@ -16,7 +16,9 @@
  *
  */
 
-#include "Root.h"
+#include <backend/hidpp20/features/Root.h>
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/Error.h>
 
 using namespace logid::backend::hidpp20;
 
diff --git a/src/logid/backend/hidpp20/features/Root.h b/src/logid/backend/hidpp20/features/Root.h
index 2ef243f..a1112ed 100644
--- a/src/logid/backend/hidpp20/features/Root.h
+++ b/src/logid/backend/hidpp20/features/Root.h
@@ -19,9 +19,8 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_ROOT_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_ROOT_H
 
-#include "../Feature.h"
-#include "../EssentialFeature.h"
-#include "../feature_defs.h"
+#include <backend/hidpp20/EssentialFeature.h>
+#include <backend/hidpp20/feature_defs.h>
 
 namespace logid::backend::hidpp20 {
 
diff --git a/src/logid/backend/hidpp20/features/SmartShift.cpp b/src/logid/backend/hidpp20/features/SmartShift.cpp
index c67733a..a5db620 100644
--- a/src/logid/backend/hidpp20/features/SmartShift.cpp
+++ b/src/logid/backend/hidpp20/features/SmartShift.cpp
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "SmartShift.h"
+#include <backend/hidpp20/features/SmartShift.h>
 
 using namespace logid::backend::hidpp20;
 
diff --git a/src/logid/backend/hidpp20/features/SmartShift.h b/src/logid/backend/hidpp20/features/SmartShift.h
index f2f8a5f..cdcfb7d 100644
--- a/src/logid/backend/hidpp20/features/SmartShift.h
+++ b/src/logid/backend/hidpp20/features/SmartShift.h
@@ -18,8 +18,8 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_SMARTSHIFT_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_SMARTSHIFT_H
 
-#include "../feature_defs.h"
-#include "../Feature.h"
+#include <backend/hidpp20/feature_defs.h>
+#include <backend/hidpp20/Feature.h>
 
 namespace logid::backend::hidpp20 {
     class SmartShift : public Feature {
diff --git a/src/logid/backend/hidpp20/features/ThumbWheel.cpp b/src/logid/backend/hidpp20/features/ThumbWheel.cpp
index 9ee1b7b..fe0c3ba 100644
--- a/src/logid/backend/hidpp20/features/ThumbWheel.cpp
+++ b/src/logid/backend/hidpp20/features/ThumbWheel.cpp
@@ -16,8 +16,8 @@
  *
  */
 
+#include <backend/hidpp20/features/ThumbWheel.h>
 #include <cassert>
-#include "ThumbWheel.h"
 
 using namespace logid::backend::hidpp20;
 
diff --git a/src/logid/backend/hidpp20/features/ThumbWheel.h b/src/logid/backend/hidpp20/features/ThumbWheel.h
index 708da5e..12b95a1 100644
--- a/src/logid/backend/hidpp20/features/ThumbWheel.h
+++ b/src/logid/backend/hidpp20/features/ThumbWheel.h
@@ -18,8 +18,9 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_THUMBWHEEL_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_THUMBWHEEL_H
 
-#include "../feature_defs.h"
-#include "../Feature.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/feature_defs.h>
+#include <backend/hidpp/Report.h>
 
 namespace logid::backend::hidpp20 {
     class ThumbWheel : public Feature {
diff --git a/src/logid/backend/hidpp20/features/WirelessDeviceStatus.cpp b/src/logid/backend/hidpp20/features/WirelessDeviceStatus.cpp
index 50fef29..42c36a9 100644
--- a/src/logid/backend/hidpp20/features/WirelessDeviceStatus.cpp
+++ b/src/logid/backend/hidpp20/features/WirelessDeviceStatus.cpp
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <backend/hidpp20/features/WirelessDeviceStatus.h>
 #include <cassert>
-#include "WirelessDeviceStatus.h"
 
 using namespace logid::backend::hidpp20;
 
diff --git a/src/logid/backend/hidpp20/features/WirelessDeviceStatus.h b/src/logid/backend/hidpp20/features/WirelessDeviceStatus.h
index a6712dd..74ec8c9 100644
--- a/src/logid/backend/hidpp20/features/WirelessDeviceStatus.h
+++ b/src/logid/backend/hidpp20/features/WirelessDeviceStatus.h
@@ -18,8 +18,9 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_WIRELESSDEVICESTATUS_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_WIRELESSDEVICESTATUS_H
 
-#include "../Feature.h"
-#include "../feature_defs.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/feature_defs.h>
+#include <backend/hidpp/Report.h>
 
 namespace logid::backend::hidpp20 {
     class WirelessDeviceStatus : public Feature {
diff --git a/src/logid/backend/raw/DeviceMonitor.cpp b/src/logid/backend/raw/DeviceMonitor.cpp
index c53f474..7e77fab 100644
--- a/src/logid/backend/raw/DeviceMonitor.cpp
+++ b/src/logid/backend/raw/DeviceMonitor.cpp
@@ -16,12 +16,12 @@
  *
  */
 
-#include "DeviceMonitor.h"
-#include "../../util/task.h"
-#include "../../util/log.h"
-#include "RawDevice.h"
-#include "../hidpp/Device.h"
-
+#include <backend/raw/DeviceMonitor.h>
+#include <backend/raw/IOMonitor.h>
+#include <backend/raw/RawDevice.h>
+#include <backend/hidpp/Device.h>
+#include <util/task.h>
+#include <util/log.h>
 #include <system_error>
 
 extern "C"
diff --git a/src/logid/backend/raw/DeviceMonitor.h b/src/logid/backend/raw/DeviceMonitor.h
index 84d8ee0..5ef710b 100644
--- a/src/logid/backend/raw/DeviceMonitor.h
+++ b/src/logid/backend/raw/DeviceMonitor.h
@@ -23,7 +23,6 @@
 #include <mutex>
 #include <atomic>
 #include <memory>
-#include "IOMonitor.h"
 
 extern "C"
 {
@@ -32,6 +31,8 @@ struct udev_monitor;
 }
 
 namespace logid::backend::raw {
+    class IOMonitor;
+
     static constexpr int ready_wait = 2000;
 
     class DeviceMonitor {
diff --git a/src/logid/backend/raw/IOMonitor.cpp b/src/logid/backend/raw/IOMonitor.cpp
index 11bce03..0d9281e 100644
--- a/src/logid/backend/raw/IOMonitor.cpp
+++ b/src/logid/backend/raw/IOMonitor.cpp
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <backend/raw/IOMonitor.h>
 #include <cassert>
-#include "IOMonitor.h"
 
 extern "C"
 {
diff --git a/src/logid/backend/raw/RawDevice.cpp b/src/logid/backend/raw/RawDevice.cpp
index 9f5497c..efb67f9 100644
--- a/src/logid/backend/raw/RawDevice.cpp
+++ b/src/logid/backend/raw/RawDevice.cpp
@@ -16,10 +16,10 @@
  *
  */
 
-#include "RawDevice.h"
-#include "DeviceMonitor.h"
-#include "IOMonitor.h"
-#include "../../util/log.h"
+#include <backend/raw/RawDevice.h>
+#include <backend/raw/DeviceMonitor.h>
+#include <backend/raw/IOMonitor.h>
+#include <util/log.h>
 
 #include <string>
 #include <system_error>
diff --git a/src/logid/backend/raw/RawDevice.h b/src/logid/backend/raw/RawDevice.h
index ee4e2c9..d41d0c9 100644
--- a/src/logid/backend/raw/RawDevice.h
+++ b/src/logid/backend/raw/RawDevice.h
@@ -26,8 +26,7 @@
 #include <future>
 #include <set>
 #include <list>
-
-#include "EventHandler.h"
+#include <backend/raw/EventHandler.h>
 
 namespace logid::backend::raw {
     class DeviceMonitor;
diff --git a/src/logid/config/group.h b/src/logid/config/group.h
index d6b9b9d..79bcc25 100644
--- a/src/logid/config/group.h
+++ b/src/logid/config/group.h
@@ -22,7 +22,6 @@
 #include <type_traits>
 #include <functional>
 #include <utility>
-#include "../util/log.h"
 
 namespace logid::config {
     template<typename T>
diff --git a/src/logid/config/map.h b/src/logid/config/map.h
index 05a5891..b5d109e 100644
--- a/src/logid/config/map.h
+++ b/src/logid/config/map.h
@@ -18,7 +18,7 @@
 #ifndef LOGID_CONFIG_MAP_H
 #define LOGID_CONFIG_MAP_H
 
-#include "group.h"
+#include <config/group.h>
 #include <map>
 #include <optional>
 #include <utility>
diff --git a/src/logid/config/schema.h b/src/logid/config/schema.h
index 45f41e4..97b8b39 100644
--- a/src/logid/config/schema.h
+++ b/src/logid/config/schema.h
@@ -18,7 +18,7 @@
 #ifndef LOGID_CONFIG_SCHEMA_H
 #define LOGID_CONFIG_SCHEMA_H
 
-#include "types.h"
+#include <config/types.h>
 
 namespace logid::actions {
     class ChangeDPI;
diff --git a/src/logid/config/types.h b/src/logid/config/types.h
index b74a161..69c2fc5 100644
--- a/src/logid/config/types.h
+++ b/src/logid/config/types.h
@@ -18,16 +18,15 @@
 #ifndef LOGID_CONFIG_PRIMITIVE_H
 #define LOGID_CONFIG_PRIMITIVE_H
 
+#include <config/map.h>
+#include <config/group.h>
+#include <ipcgull/property.h>
 #include <libconfig.h++>
 #include <type_traits>
 #include <optional>
 #include <variant>
 #include <list>
 #include <set>
-#include <ipcgull/property.h>
-#include "group.h"
-#include "map.h"
-#include "../util/log.h"
 
 /// TODO: A single element failing should not cause the container to be invalid.
 
diff --git a/src/logid/features/DPI.cpp b/src/logid/features/DPI.cpp
index 2128576..c6986cb 100644
--- a/src/logid/features/DPI.cpp
+++ b/src/logid/features/DPI.cpp
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <features/DPI.h>
+#include <Device.h>
 #include <algorithm>
 #include <cmath>
-#include "DPI.h"
-#include "../Device.h"
 
 using namespace logid::features;
 using namespace logid::backend;
diff --git a/src/logid/features/DPI.h b/src/logid/features/DPI.h
index 365013f..101981b 100644
--- a/src/logid/features/DPI.h
+++ b/src/logid/features/DPI.h
@@ -18,9 +18,9 @@
 #ifndef LOGID_FEATURE_DPI_H
 #define LOGID_FEATURE_DPI_H
 
-#include "../backend/hidpp20/features/AdjustableDPI.h"
-#include "DeviceFeature.h"
-#include "../config/schema.h"
+#include <backend/hidpp20/features/AdjustableDPI.h>
+#include <features/DeviceFeature.h>
+#include <config/schema.h>
 
 namespace logid::features {
     class DPI : public DeviceFeature {
diff --git a/src/logid/features/DeviceStatus.cpp b/src/logid/features/DeviceStatus.cpp
index 5f16921..b26bb61 100644
--- a/src/logid/features/DeviceStatus.cpp
+++ b/src/logid/features/DeviceStatus.cpp
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "DeviceStatus.h"
-#include "../util/task.h"
+#include <features/DeviceStatus.h>
+#include <util/task.h>
 
 using namespace logid::features;
 using namespace logid::backend;
diff --git a/src/logid/features/DeviceStatus.h b/src/logid/features/DeviceStatus.h
index 126328f..d98122f 100644
--- a/src/logid/features/DeviceStatus.h
+++ b/src/logid/features/DeviceStatus.h
@@ -19,9 +19,9 @@
 #define LOGID_FEATURE_DEVICESTATUS_H
 
 
-#include "DeviceFeature.h"
-#include "../Device.h"
-#include "../backend/hidpp20/features/WirelessDeviceStatus.h"
+#include <features/DeviceFeature.h>
+#include <Device.h>
+#include <backend/hidpp20/features/WirelessDeviceStatus.h>
 
 namespace logid::features {
     class DeviceStatus : public DeviceFeature {
diff --git a/src/logid/features/HiresScroll.cpp b/src/logid/features/HiresScroll.cpp
index 3e19b03..a8d2bc4 100644
--- a/src/logid/features/HiresScroll.cpp
+++ b/src/logid/features/HiresScroll.cpp
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "HiresScroll.h"
-#include "../Device.h"
-#include "../InputDevice.h"
-#include "../actions/gesture/AxisGesture.h"
+#include <features/HiresScroll.h>
+#include <actions/gesture/AxisGesture.h>
+#include <Device.h>
+#include <InputDevice.h>
 
 using namespace logid::features;
 using namespace logid::backend;
diff --git a/src/logid/features/HiresScroll.h b/src/logid/features/HiresScroll.h
index ce8fd0e..982666b 100644
--- a/src/logid/features/HiresScroll.h
+++ b/src/logid/features/HiresScroll.h
@@ -18,9 +18,14 @@
 #ifndef LOGID_FEATURE_HIRESSCROLL_H
 #define LOGID_FEATURE_HIRESSCROLL_H
 
-#include "../backend/hidpp20/features/HiresScroll.h"
-#include "DeviceFeature.h"
-#include "../actions/gesture/Gesture.h"
+#include <features/DeviceFeature.h>
+#include <actions/gesture/Gesture.h>
+#include <backend/hidpp20/features/HiresScroll.h>
+#include <backend/hidpp/Device.h>
+#include <memory>
+#include <optional>
+#include <variant>
+#include <chrono>
 
 namespace logid::features {
     class HiresScroll : public DeviceFeature {
diff --git a/src/logid/features/RemapButton.cpp b/src/logid/features/RemapButton.cpp
index be898f5..9fa0cb7 100644
--- a/src/logid/features/RemapButton.cpp
+++ b/src/logid/features/RemapButton.cpp
@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <features/RemapButton.h>
+#include <actions/GestureAction.h>
+#include <Device.h>
 #include <sstream>
-#include "../actions/GestureAction.h"
-#include "../Device.h"
-#include "RemapButton.h"
+#include <util/log.h>
 
 using namespace logid::features;
 using namespace logid::backend;
@@ -55,10 +56,8 @@ RemapButton::RemapButton(Device* dev) : DeviceFeature(dev),
                      hidpp20::ReprogControls::RawXYDiverted) &&
                     (!_reprog_controls->supportsRawXY() ||
                      !(info.additionalFlags & hidpp20::ReprogControls::RawXY)))
-                    logPrintf(WARN,
-                              "%s: Cannot divert raw XY movements for CID "
-                              "0x%02x", _device->name().c_str(),
-                              info.controlID);
+                    logPrintf(WARN, "%s: Cannot divert raw XY movements for CID 0x%02x",
+                              _device->name().c_str(), info.controlID);
 
                 report.flags |= action->reprogFlags();
             }
diff --git a/src/logid/features/RemapButton.h b/src/logid/features/RemapButton.h
index 88ba3ab..4870972 100644
--- a/src/logid/features/RemapButton.h
+++ b/src/logid/features/RemapButton.h
@@ -18,9 +18,10 @@
 #ifndef LOGID_FEATURE_REMAPBUTTON_H
 #define LOGID_FEATURE_REMAPBUTTON_H
 
-#include "../backend/hidpp20/features/ReprogControls.h"
-#include "DeviceFeature.h"
-#include "../actions/Action.h"
+#include <features/DeviceFeature.h>
+#include <actions/Action.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <backend/hidpp/Device.h>
 
 namespace logid::features {
     class RemapButton;
diff --git a/src/logid/features/SmartShift.cpp b/src/logid/features/SmartShift.cpp
index b41f6ba..39cf478 100644
--- a/src/logid/features/SmartShift.cpp
+++ b/src/logid/features/SmartShift.cpp
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "SmartShift.h"
-#include "../Device.h"
+#include <features/SmartShift.h>
+#include <Device.h>
 
 using namespace logid::features;
 using namespace logid::backend;
diff --git a/src/logid/features/SmartShift.h b/src/logid/features/SmartShift.h
index a3a2d77..d87828d 100644
--- a/src/logid/features/SmartShift.h
+++ b/src/logid/features/SmartShift.h
@@ -18,10 +18,10 @@
 #ifndef LOGID_FEATURE_SMARTSHIFT_H
 #define LOGID_FEATURE_SMARTSHIFT_H
 
+#include <features/DeviceFeature.h>
+#include <backend/hidpp20/features/SmartShift.h>
 #include <ipcgull/interface.h>
-#include "../backend/hidpp20/features/SmartShift.h"
-#include "DeviceFeature.h"
-#include "../config/schema.h"
+#include <config/schema.h>
 
 namespace logid::features {
     class SmartShift : public DeviceFeature {
diff --git a/src/logid/features/ThumbWheel.cpp b/src/logid/features/ThumbWheel.cpp
index b56dbe0..19c15ae 100644
--- a/src/logid/features/ThumbWheel.cpp
+++ b/src/logid/features/ThumbWheel.cpp
@@ -16,9 +16,10 @@
  *
  */
 
-#include "ThumbWheel.h"
-#include "../Device.h"
-#include "../actions/gesture/AxisGesture.h"
+#include <features/ThumbWheel.h>
+#include <actions/gesture/AxisGesture.h>
+#include <Device.h>
+#include <util/log.h>
 
 using namespace logid::features;
 using namespace logid::backend;
diff --git a/src/logid/features/ThumbWheel.h b/src/logid/features/ThumbWheel.h
index 21a859c..7cd1d07 100644
--- a/src/logid/features/ThumbWheel.h
+++ b/src/logid/features/ThumbWheel.h
@@ -18,10 +18,10 @@
 #ifndef LOGID_FEATURE_THUMBWHEEL_H
 #define LOGID_FEATURE_THUMBWHEEL_H
 
-#include "../backend/hidpp20/features/ThumbWheel.h"
-#include "DeviceFeature.h"
-#include "../actions/gesture/Gesture.h"
-#include "../config/schema.h"
+#include <features/DeviceFeature.h>
+#include <actions/gesture/Gesture.h>
+#include <backend/hidpp20/features/ThumbWheel.h>
+#include <backend/hidpp/Device.h>
 
 namespace logid::features {
     class ThumbWheel : public DeviceFeature {
diff --git a/src/logid/logid.cpp b/src/logid/logid.cpp
index c8e1ce0..c1b454b 100644
--- a/src/logid/logid.cpp
+++ b/src/logid/logid.cpp
@@ -16,15 +16,10 @@
  *
  */
 
+#include <DeviceManager.h>
+#include <InputDevice.h>
+#include <util/log.h>
 #include <algorithm>
-#include <cstdio>
-#include <cstdlib>
-#include <mutex>
-#include <ipcgull/exception.h>
-
-#include "util/log.h"
-#include "DeviceManager.h"
-#include "InputDevice.h"
 
 #define LOGID_VIRTUAL_INPUT_NAME "LogiOps Virtual Input"
 #define DEFAULT_CONFIG_FILE "/etc/logid.cfg"
@@ -50,21 +45,6 @@ enum class Option {
     Version
 };
 
-/*
-void logid::reload()
-{
-    log_printf(INFO, "Reloading logid...");
-    finder_reloading.lock();
-    finder->_stop();
-    Configuration* old_config = global_config;
-    global_config = new Configuration(config_file.c_str());
-    delete(old_config);
-    delete(finder);
-    finder = new DeviceMonitor();
-    finder_reloading.unlock();
-}
- */
-
 void readCliOptions(const int argc, char** argv, CmdlineOptions& options) {
     for (int i = 1; i < argc; i++) {
         Option option = Option::None;
diff --git a/src/logid/util/ExceptionHandler.cpp b/src/logid/util/ExceptionHandler.cpp
index 7f3ab37..8160836 100644
--- a/src/logid/util/ExceptionHandler.cpp
+++ b/src/logid/util/ExceptionHandler.cpp
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <util/ExceptionHandler.h>
 #include <system_error>
-#include "log.h"
-#include "ExceptionHandler.h"
-#include "../backend/hidpp10/Error.h"
-#include "../backend/hidpp20/Error.h"
+#include <util/log.h>
+#include <backend/hidpp10/Error.h>
+#include <backend/hidpp20/Error.h>
 
 using namespace logid;
 
diff --git a/src/logid/util/log.cpp b/src/logid/util/log.cpp
index 7ba06a3..a6bee22 100644
--- a/src/logid/util/log.cpp
+++ b/src/logid/util/log.cpp
@@ -16,12 +16,11 @@
  *
  */
 
+#include <util/log.h>
 #include <cstdio>
-#include <string>
 #include <cstdarg>
 #include <algorithm>
 #include <stdexcept>
-#include "log.h"
 
 using namespace logid;
 
diff --git a/src/logid/util/task.cpp b/src/logid/util/task.cpp
index 0c8eb19..4eaacf3 100644
--- a/src/logid/util/task.cpp
+++ b/src/logid/util/task.cpp
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "task.h"
+#include <util/task.h>
 
 using namespace logid;
 
diff --git a/src/logid/util/task.h b/src/logid/util/task.h
index a3574b9..a48468f 100644
--- a/src/logid/util/task.h
+++ b/src/logid/util/task.h
@@ -18,10 +18,10 @@
 #ifndef LOGID_TASK_H
 #define LOGID_TASK_H
 
+#include <util/ExceptionHandler.h>
 #include <functional>
 #include <memory>
 #include <future>
-#include "ExceptionHandler.h"
 
 namespace logid {
     /* This function spawns a new task into the least used worker queue