diff --git a/sunshine/httpcommon.cpp b/sunshine/httpcommon.cpp
index 9dda7a00..b6f7ac0a 100644
--- a/sunshine/httpcommon.cpp
+++ b/sunshine/httpcommon.cpp
@@ -2,9 +2,9 @@
 
 #include <filesystem>
 
-#include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
+#include <boost/property_tree/json_parser.hpp>
 
 #include <boost/asio/ssl/context.hpp>
 
@@ -13,15 +13,15 @@
 #include <boost/asio/ssl/context_base.hpp>
 
 #include "config.h"
+#include "utility.h"
+#include "rtsp.h"
 #include "crypto.h"
-#include "httpcommon.h"
-#include "main.h"
-#include "network.h"
 #include "nvhttp.h"
 #include "platform/common.h"
-#include "rtsp.h"
-#include "utility.h"
+#include "network.h"
 #include "uuid.h"
+#include "main.h"
+#include "httpcommon.h"
 
 namespace http {
 using namespace std::literals;
diff --git a/sunshine/main.cpp b/sunshine/main.cpp
index 1d1693ea..70301297 100644
--- a/sunshine/main.cpp
+++ b/sunshine/main.cpp
@@ -15,9 +15,9 @@
 #include <boost/log/sources/severity_logger.hpp>
 
 #include "config.h"
-#include "confighttp.h"
-#include "httpcommon.h"
 #include "nvhttp.h"
+#include "httpcommon.h"
+#include "confighttp.h"
 #include "rtsp.h"
 #include "thread_pool.h"
 #include "video.h"
diff --git a/sunshine/nvhttp.cpp b/sunshine/nvhttp.cpp
index e1dc5c0c..1793b060 100644
--- a/sunshine/nvhttp.cpp
+++ b/sunshine/nvhttp.cpp
@@ -18,9 +18,9 @@
 #include <Simple-Web-Server/server_https.hpp>
 #include <boost/asio/ssl/context_base.hpp>
 
+
 #include "config.h"
 #include "crypto.h"
-#include "httpcommon.h"
 #include "main.h"
 #include "network.h"
 #include "nvhttp.h"
@@ -28,7 +28,8 @@
 #include "rtsp.h"
 #include "utility.h"
 #include "uuid.h"
-
+#include "main.h"
+#include "httpcommon.h" 
 
 namespace nvhttp {
 using namespace std::literals;
diff --git a/sunshine/nvhttp.h b/sunshine/nvhttp.h
index 18aaa969..db995fc8 100644
--- a/sunshine/nvhttp.h
+++ b/sunshine/nvhttp.h
@@ -5,11 +5,11 @@
 #ifndef SUNSHINE_NVHTTP_H
 #define SUNSHINE_NVHTTP_H
 
-#include "thread_safe.h"
-#include <Simple-Web-Server/server_http.hpp>
-#include <Simple-Web-Server/server_https.hpp>
 #include <functional>
 #include <string>
+#include <Simple-Web-Server/server_http.hpp>
+#include <Simple-Web-Server/server_https.hpp>
+#include "thread_safe.h"
 
 #define CA_DIR SUNSHINE_ASSETS_DIR "/demoCA"
 #define PRIVATE_KEY_FILE CA_DIR "/cakey.pem"