diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index 17eeade..2f70483 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -16,10 +16,10 @@
 
 #include "EntityManager.hpp"
 
+#include "Overlay.hpp"
+#include "Utils.hpp"
 #include "VariantVisitors.hpp"
 
-#include <Overlay.hpp>
-#include <Utils.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/src/FruDevice.cpp b/src/FruDevice.cpp
index 8c33a3a..87b7d40 100644
--- a/src/FruDevice.cpp
+++ b/src/FruDevice.cpp
@@ -14,12 +14,13 @@
 // limitations under the License.
 */
 
+#include "Utils.hpp"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
 
-#include <Utils.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/container/flat_map.hpp>
 #include <chrono>
diff --git a/src/Overlay.cpp b/src/Overlay.cpp
index a569f9a..8a9b906 100644
--- a/src/Overlay.cpp
+++ b/src/Overlay.cpp
@@ -14,13 +14,15 @@
 // limitations under the License.
 */
 
-#include <Overlay.hpp>
-#include <Utils.hpp>
+#include "Overlay.hpp"
+
+#include "Utils.hpp"
+#include "devices.hpp"
+
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <boost/process/child.hpp>
-#include <devices.hpp>
 #include <filesystem>
 #include <iomanip>
 #include <iostream>