diff --git a/src/electricity-logger/database.cpp b/src/electricity-logger/database.cpp
index 58e40cf..7401eae 100644
--- a/src/electricity-logger/database.cpp
+++ b/src/electricity-logger/database.cpp
@@ -1,5 +1,4 @@
 #include <electricity/logger/database.hpp>
-#include <exception>
 #include <iomanip>
 #include <spdlog/spdlog.h>
 #include <sstream>
diff --git a/src/electricity-logger/main.cpp b/src/electricity-logger/main.cpp
index 16abc87..ed7d0a4 100644
--- a/src/electricity-logger/main.cpp
+++ b/src/electricity-logger/main.cpp
@@ -4,6 +4,7 @@
 #include <electricity/logger/serialport.hpp>
 #include <exception>
 #include <fcntl.h>
+#include <iostream>
 #include <optional>
 #include <spdlog/spdlog.h>
 #include <stdexcept>
@@ -34,7 +35,7 @@ std::optional<cxxopts::ParseResult> ExtractArgs(int argc, char ** argv)
         auto const parsed = options.parse(argc, argv);
         return parsed;
     }
-    catch(cxxopts::OptionException const & e)
+    catch(cxxopts::exceptions::exception const & e)
     {
         spdlog::error(e.what());
         return {};
diff --git a/src/solar-logger/database.cpp b/src/solar-logger/database.cpp
index 1a1bef5..86025ca 100644
--- a/src/solar-logger/database.cpp
+++ b/src/solar-logger/database.cpp
@@ -1,6 +1,4 @@
 #include <cmath>
-#include <cstdlib>
-#include <ctime>
 #include <iomanip>
 #include <solar/logger/database.hpp>
 #include <spdlog/spdlog.h>
diff --git a/src/solar-logger/main.cpp b/src/solar-logger/main.cpp
index e2dc96e..f87c210 100644
--- a/src/solar-logger/main.cpp
+++ b/src/solar-logger/main.cpp
@@ -1,12 +1,11 @@
 #include <cstdio>
 #include <cxxopts.hpp>
-#include <iomanip>
+#include <iostream>
 #include <optional>
 #include <solar/logger/database.hpp>
 #include <solar/logger/envoydata.hpp>
 #include <solar/logger/zeverdata.hpp>
 #include <spdlog/spdlog.h>
-#include <sstream>
 #include <string>
 
 namespace detail
@@ -53,7 +52,7 @@ std::optional<cxxopts::ParseResult> ExtractArgs(int argc, char ** argv)
         auto const parsed = options.parse(argc, argv);
         return parsed;
     }
-    catch(cxxopts::OptionException const & e)
+    catch(cxxopts::exceptions::exception const & e)
     {
         spdlog::error(e.what());
         return {};