diff --git a/src/handler.hpp b/src/handler.hpp
index 9255510f..1bc18072 100644
--- a/src/handler.hpp
+++ b/src/handler.hpp
@@ -2,13 +2,12 @@
 #ifndef HANDLER_HEADER_HPP
 #define HANDLER_HEADER_HPP
 
-#include "../ai_omniscope-v2-communication_sw/src/OmniscopeSampler.hpp"
-#include "languages.hpp"
-
+#include <implot.h>
+#include <set>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
-#include <set>
-#include <implot.h>
+#include "../ai_omniscope-v2-communication_sw/src/OmniscopeSampler.hpp"
+#include "languages.hpp"
 
 struct AxisInfo {
   std::pair<Omniscope::Id, std::vector<std::pair<double, double>> &> data;
diff --git a/src/main.cpp b/src/main.cpp
index 775bf348..fdd17d7c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,10 +1,7 @@
-#include <algorithm>
-#include <cmake_git_version/version.hpp>
-#include <set>
-
 #include "popups.hpp"
 #include "settingspopup.hpp"
 #include "style.hpp"
+#include <cmake_git_version/version.hpp>
 
 int main() {
   const std::string configpath = "config/config.json";