diff --git a/include/dbus_monitor.hpp b/include/dbus_monitor.hpp
index 094f183..46ef25e 100644
--- a/include/dbus_monitor.hpp
+++ b/include/dbus_monitor.hpp
@@ -3,12 +3,12 @@
 #include "async_resp.hpp"
 #include "dbus_singleton.hpp"
 #include "openbmc_dbus_rest.hpp"
+#include "websocket.hpp"
 
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <sdbusplus/bus/match.hpp>
 #include <sdbusplus/message/types.hpp>
-#include <websocket.hpp>
 
 #include <variant>
 
diff --git a/include/kvm_websocket.hpp b/include/kvm_websocket.hpp
index 942e9c6..8ea3434 100644
--- a/include/kvm_websocket.hpp
+++ b/include/kvm_websocket.hpp
@@ -1,11 +1,11 @@
 #pragma once
 #include "app.hpp"
 #include "async_resp.hpp"
+#include "websocket.hpp"
 
 #include <sys/socket.h>
 
 #include <boost/container/flat_map.hpp>
-#include <websocket.hpp>
 
 namespace crow
 {
diff --git a/include/nbd_proxy.hpp b/include/nbd_proxy.hpp
index e3d4c4b..e4d709b 100644
--- a/include/nbd_proxy.hpp
+++ b/include/nbd_proxy.hpp
@@ -17,12 +17,12 @@
 #include "app.hpp"
 #include "dbus_utility.hpp"
 #include "privileges.hpp"
+#include "websocket.hpp"
 
 #include <boost/asio/local/stream_protocol.hpp>
 #include <boost/asio/write.hpp>
 #include <boost/beast/core/buffers_to_string.hpp>
 #include <boost/container/flat_map.hpp>
-#include <websocket.hpp>
 
 #include <string_view>
 
diff --git a/include/obmc_console.hpp b/include/obmc_console.hpp
index ae8143a..5457b7d 100644
--- a/include/obmc_console.hpp
+++ b/include/obmc_console.hpp
@@ -1,12 +1,12 @@
 #pragma once
 #include "app.hpp"
 #include "async_resp.hpp"
+#include "websocket.hpp"
 
 #include <sys/socket.h>
 
 #include <boost/asio/local/stream_protocol.hpp>
 #include <boost/container/flat_set.hpp>
-#include <websocket.hpp>
 
 namespace crow
 {
diff --git a/include/vm_websocket.hpp b/include/vm_websocket.hpp
index fed3681..1e1b7e1 100644
--- a/include/vm_websocket.hpp
+++ b/include/vm_websocket.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
 #include "app.hpp"
+#include "websocket.hpp"
 
 #include <boost/beast/core/flat_static_buffer.hpp>
 #include <boost/process/async_pipe.hpp>
 #include <boost/process/child.hpp>
 #include <boost/process/io.hpp>
-#include <websocket.hpp>
 
 #include <csignal>