diff --git a/include/ADCSensor.hpp b/include/ADCSensor.hpp
index 331a229..cb595c9 100644
--- a/include/ADCSensor.hpp
+++ b/include/ADCSensor.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <Thresholds.hpp>
+#include "Thresholds.hpp"
+#include "sensor.hpp"
+
 #include <gpiod.hpp>
 #include <optional>
 #include <sdbusplus/asio/object_server.hpp>
-#include <sensor.hpp>
 
 class BridgeGpio
 {
diff --git a/include/CPUSensor.hpp b/include/CPUSensor.hpp
index 7a2819f..01eadc1 100644
--- a/include/CPUSensor.hpp
+++ b/include/CPUSensor.hpp
@@ -1,14 +1,14 @@
 #pragma once
 
+#include "Thresholds.hpp"
 #include "Utils.hpp"
+#include "sensor.hpp"
 
-#include <Thresholds.hpp>
 #include <boost/container/flat_map.hpp>
 #include <filesystem>
 #include <fstream>
 #include <gpiod.hpp>
 #include <sdbusplus/asio/object_server.hpp>
-#include <sensor.hpp>
 
 class CPUSensor : public Sensor
 {
diff --git a/include/HwmonTempSensor.hpp b/include/HwmonTempSensor.hpp
index 795c02d..b5d80e3 100644
--- a/include/HwmonTempSensor.hpp
+++ b/include/HwmonTempSensor.hpp
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <Thresholds.hpp>
+#include "Thresholds.hpp"
+#include "sensor.hpp"
+
 #include <sdbusplus/asio/object_server.hpp>
-#include <sensor.hpp>
 
 class HwmonTempSensor : public Sensor
 {
@@ -25,4 +26,4 @@
     void setupRead(void);
     void handleResponse(const boost::system::error_code& err);
     void checkThresholds(void) override;
-};
\ No newline at end of file
+};
diff --git a/include/PSUSensor.hpp b/include/PSUSensor.hpp
index 370ded9..f7ed88f 100644
--- a/include/PSUSensor.hpp
+++ b/include/PSUSensor.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <PwmSensor.hpp>
-#include <Thresholds.hpp>
+#include "PwmSensor.hpp"
+#include "Thresholds.hpp"
+#include "sensor.hpp"
+
 #include <sdbusplus/asio/object_server.hpp>
-#include <sensor.hpp>
 
 class PSUSensor : public Sensor
 {
diff --git a/include/TachSensor.hpp b/include/TachSensor.hpp
index f79fb4d..8ab1083 100644
--- a/include/TachSensor.hpp
+++ b/include/TachSensor.hpp
@@ -1,12 +1,13 @@
 #pragma once
 
+#include "Thresholds.hpp"
+#include "sensor.hpp"
+
 #include <systemd/sd-journal.h>
 
-#include <Thresholds.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <sdbusplus/asio/object_server.hpp>
-#include <sensor.hpp>
 
 class PresenceSensor
 {
diff --git a/include/Thresholds.hpp b/include/Thresholds.hpp
index 37ce108..f1e7cc6 100644
--- a/include/Thresholds.hpp
+++ b/include/Thresholds.hpp
@@ -1,5 +1,6 @@
 #pragma once
-#include <Utils.hpp>
+#include "Utils.hpp"
+
 #include <boost/asio/io_service.hpp>
 #include <nlohmann/json.hpp>
 
diff --git a/include/sensor.hpp b/include/sensor.hpp
index 21474b1..aad8548 100644
--- a/include/sensor.hpp
+++ b/include/sensor.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <Thresholds.hpp>
+#include "Thresholds.hpp"
+
 #include <sdbusplus/asio/object_server.hpp>
 
 constexpr size_t sensorFailedPollTimeMs = 5000;
diff --git a/src/ADCSensor.cpp b/src/ADCSensor.cpp
index 330de52..4d3628d 100644
--- a/src/ADCSensor.cpp
+++ b/src/ADCSensor.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
+#include "ADCSensor.hpp"
+
 #include <unistd.h>
 
-#include <ADCSensor.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/src/ADCSensorMain.cpp b/src/ADCSensorMain.cpp
index 8ce56b5..53d09c2 100644
--- a/src/ADCSensorMain.cpp
+++ b/src/ADCSensorMain.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
-#include <ADCSensor.hpp>
-#include <Utils.hpp>
-#include <VariantVisitors.hpp>
+#include "ADCSensor.hpp"
+#include "Utils.hpp"
+#include "VariantVisitors.hpp"
+
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
diff --git a/src/CPUSensor.cpp b/src/CPUSensor.cpp
index 0ec4bf5..5aedf4b 100644
--- a/src/CPUSensor.cpp
+++ b/src/CPUSensor.cpp
@@ -14,10 +14,12 @@
 // limitations under the License.
 */
 
+#include "CPUSensor.hpp"
+
+#include "Utils.hpp"
+
 #include <unistd.h>
 
-#include <CPUSensor.hpp>
-#include <Utils.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/src/CPUSensorMain.cpp b/src/CPUSensorMain.cpp
index 2a3ff16..7e8c7b0 100644
--- a/src/CPUSensorMain.cpp
+++ b/src/CPUSensorMain.cpp
@@ -14,11 +14,12 @@
 // limitations under the License.
 */
 
+#include "CPUSensor.hpp"
+#include "Utils.hpp"
+#include "VariantVisitors.hpp"
+
 #include <fcntl.h>
 
-#include <CPUSensor.hpp>
-#include <Utils.hpp>
-#include <VariantVisitors.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_set.hpp>
diff --git a/src/ChassisIntrusionSensor.cpp b/src/ChassisIntrusionSensor.cpp
index f10e9b9..680d9e6 100644
--- a/src/ChassisIntrusionSensor.cpp
+++ b/src/ChassisIntrusionSensor.cpp
@@ -14,12 +14,13 @@
 // limitations under the License.
 */
 
+#include "ChassisIntrusionSensor.hpp"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include <ChassisIntrusionSensor.hpp>
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
 #include <chrono>
diff --git a/src/FanMain.cpp b/src/FanMain.cpp
index 7c5b60a..a1868e2 100644
--- a/src/FanMain.cpp
+++ b/src/FanMain.cpp
@@ -14,10 +14,11 @@
 // limitations under the License.
 */
 
-#include <PwmSensor.hpp>
-#include <TachSensor.hpp>
-#include <Utils.hpp>
-#include <VariantVisitors.hpp>
+#include "PwmSensor.hpp"
+#include "TachSensor.hpp"
+#include "Utils.hpp"
+#include "VariantVisitors.hpp"
+
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_set.hpp>
diff --git a/src/HwmonTempMain.cpp b/src/HwmonTempMain.cpp
index 19e3505..b44fa10 100644
--- a/src/HwmonTempMain.cpp
+++ b/src/HwmonTempMain.cpp
@@ -14,8 +14,9 @@
 // limitations under the License.
 */
 
-#include <HwmonTempSensor.hpp>
-#include <Utils.hpp>
+#include "HwmonTempSensor.hpp"
+#include "Utils.hpp"
+
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_set.hpp>
diff --git a/src/HwmonTempSensor.cpp b/src/HwmonTempSensor.cpp
index d4ed57f..dd6ba7c 100644
--- a/src/HwmonTempSensor.cpp
+++ b/src/HwmonTempSensor.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
+#include "HwmonTempSensor.hpp"
+
 #include <unistd.h>
 
-#include <HwmonTempSensor.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
@@ -151,4 +152,4 @@
 void HwmonTempSensor::checkThresholds(void)
 {
     thresholds::checkThresholds(this);
-}
\ No newline at end of file
+}
diff --git a/src/IntrusionSensorMain.cpp b/src/IntrusionSensorMain.cpp
index fe4a79f..dab04ef 100644
--- a/src/IntrusionSensorMain.cpp
+++ b/src/IntrusionSensorMain.cpp
@@ -14,10 +14,11 @@
 // limitations under the License.
 */
 
+#include "ChassisIntrusionSensor.hpp"
+#include "Utils.hpp"
+
 #include <systemd/sd-journal.h>
 
-#include <ChassisIntrusionSensor.hpp>
-#include <Utils.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio.hpp>
 #include <chrono>
diff --git a/src/PSUEvent.cpp b/src/PSUEvent.cpp
index cc7374c..d40dc54 100644
--- a/src/PSUEvent.cpp
+++ b/src/PSUEvent.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
+#include "PSUEvent.hpp"
+
 #include <systemd/sd-journal.h>
 
-#include <PSUEvent.hpp>
 #include <iostream>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
diff --git a/src/PSUSensor.cpp b/src/PSUSensor.cpp
index bf02692..68c7a0e 100644
--- a/src/PSUSensor.cpp
+++ b/src/PSUSensor.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
+#include "PSUSensor.hpp"
+
 #include <unistd.h>
 
-#include <PSUSensor.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
index d0e225b..9abde11 100644
--- a/src/PSUSensorMain.cpp
+++ b/src/PSUSensorMain.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
-#include <PSUEvent.hpp>
-#include <PSUSensor.hpp>
-#include <Utils.hpp>
+#include "PSUEvent.hpp"
+#include "PSUSensor.hpp"
+#include "Utils.hpp"
+
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_set.hpp>
diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp
index ca6a0a1..72697de 100644
--- a/src/Thresholds.cpp
+++ b/src/Thresholds.cpp
@@ -1,11 +1,13 @@
-#include <Thresholds.hpp>
-#include <VariantVisitors.hpp>
+#include "Thresholds.hpp"
+
+#include "VariantVisitors.hpp"
+#include "sensor.hpp"
+
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/lexical_cast.hpp>
 #include <cmath>
 #include <fstream>
 #include <iostream>
-#include <sensor.hpp>
 
 static constexpr bool DEBUG = false;
 namespace thresholds
diff --git a/src/Utils.cpp b/src/Utils.cpp
index f7a2ebe..833b141 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -14,7 +14,8 @@
 // limitations under the License.
 */
 
-#include <Utils.hpp>
+#include "Utils.hpp"
+
 #include <boost/algorithm/string/predicate.hpp>
 #include <filesystem>
 #include <fstream>