diff --git a/PAM/ssh/include/rublon/configuration.hpp b/PAM/ssh/include/rublon/configuration.hpp
index 7d8ec7c..3caceef 100644
--- a/PAM/ssh/include/rublon/configuration.hpp
+++ b/PAM/ssh/include/rublon/configuration.hpp
@@ -1,20 +1,13 @@
 #pragma once
 
-#include "tl/expected.hpp"
 #include <rublon/error.hpp>
 #include <rublon/memory.hpp>
 #include <rublon/static_string.hpp>
 #include <rublon/utils.hpp>
 
 #include <cctype>
-#include <fstream>
-#include <optional>
 #include <string>
 
-#include <memory_resource>
-#include <unordered_map>
-#include <utility>
-
 namespace rublon {
 class ConfigurationFactory;
 
diff --git a/PAM/ssh/include/rublon/core_handler.hpp b/PAM/ssh/include/rublon/core_handler.hpp
index 4cda5d4..cf74d6f 100755
--- a/PAM/ssh/include/rublon/core_handler.hpp
+++ b/PAM/ssh/include/rublon/core_handler.hpp
@@ -1,10 +1,5 @@
 #pragma once
 
-#include "rublon/error.hpp"
-#include "rublon/static_string.hpp"
-#include <functional>
-#include <memory>
-#include <optional>
 #include <rublon/configuration.hpp>
 #include <rublon/core_handler_interface.hpp>
 #include <rublon/curl.hpp>
@@ -14,7 +9,6 @@
 #include <rublon/utils.hpp>
 #include <rublon/websockets.hpp>
 
-#include <string_view>
 #include <tl/expected.hpp>
 
 namespace rublon {
diff --git a/PAM/ssh/include/rublon/curl.hpp b/PAM/ssh/include/rublon/curl.hpp
index a6add13..09cc2c7 100644
--- a/PAM/ssh/include/rublon/curl.hpp
+++ b/PAM/ssh/include/rublon/curl.hpp
@@ -1,8 +1,5 @@
 #pragma once
 
-#include "rublon/memory.hpp"
-#include <cstddef>
-#include <functional>
 #include <rublon/configuration.hpp>
 #include <rublon/error.hpp>
 #include <rublon/utils.hpp>
diff --git a/PAM/ssh/include/rublon/error.hpp b/PAM/ssh/include/rublon/error.hpp
index e92bf9d..dd85c40 100755
--- a/PAM/ssh/include/rublon/error.hpp
+++ b/PAM/ssh/include/rublon/error.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <string_view>
-#include <tl/expected.hpp>
 
 #include <rublon/non_owning_ptr.hpp>
 #include <rublon/stdlib.hpp>
diff --git a/PAM/ssh/include/rublon/init.hpp b/PAM/ssh/include/rublon/init.hpp
index ab798e6..65b7343 100644
--- a/PAM/ssh/include/rublon/init.hpp
+++ b/PAM/ssh/include/rublon/init.hpp
@@ -1,14 +1,10 @@
 #pragma once
 
-#include "rublon/memory.hpp"
-#include "rublon/utils.hpp"
-#include <rublon/bits.hpp>
-
 #include <rublon/authentication_step_interface.hpp>
+#include <rublon/bits.hpp>
 #include <rublon/configuration.hpp>
 #include <rublon/json.hpp>
 #include <rublon/method/method_select.hpp>
-
 #include <rublon/session.hpp>
 
 #include <sys/utsname.h>
@@ -26,7 +22,7 @@ class Init : public AuthenticationStep {
         RapidJSONPMRAlloc alloc{&stackResource};
 
         const auto * rublonMethods = JSONPointer{"/result/methods", &alloc}.Get(coreResponse);
-        const auto * rublonTid = JSONPointer{"/result/tid", &alloc}.Get(coreResponse);
+        const auto * rublonTid     = JSONPointer{"/result/tid", &alloc}.Get(coreResponse);
 
         if(not rublonMethods)
             log(LogLevel::Error, "core response has no methods");
@@ -47,7 +43,7 @@ class Init : public AuthenticationStep {
         memory::MonotonicStackResource< 2_kB > memoryResource;
         auto & alloc = coreRequest.GetAllocator();
 
-        const auto os = details::osName(&memoryResource);
+        const auto os   = details::osName(&memoryResource);
         const auto host = details::hostname(&memoryResource);
 
         if(os == "unknown") {
diff --git a/PAM/ssh/include/rublon/pam_action.hpp b/PAM/ssh/include/rublon/pam_action.hpp
index c7aa97f..62ddcda 100644
--- a/PAM/ssh/include/rublon/pam_action.hpp
+++ b/PAM/ssh/include/rublon/pam_action.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "rublon/static_string.hpp"
-#include <optional>
 #include <rublon/stdlib.hpp>
+#include <rublon/static_string.hpp>
 
 namespace rublon {
 
diff --git a/PAM/ssh/include/rublon/session.hpp b/PAM/ssh/include/rublon/session.hpp
index 25dfa7f..cf7d4f0 100644
--- a/PAM/ssh/include/rublon/session.hpp
+++ b/PAM/ssh/include/rublon/session.hpp
@@ -1,15 +1,11 @@
 #pragma once
 
-#include "rublon/memory.hpp"
-#include <memory>
-#include <memory_resource>
-#include <rapidjson/document.h>
+#include <rublon/memory.hpp>
 #include <rublon/bits.hpp>
 #include <rublon/configuration.hpp>
 #include <rublon/json.hpp>
 #include <rublon/utils.hpp>
-#include <string>
-#include <string_view>
+#include <rapidjson/document.h>
 
 
 namespace rublon {
diff --git a/PAM/ssh/include/rublon/utils.hpp b/PAM/ssh/include/rublon/utils.hpp
index ea98f3c..d846fe0 100755
--- a/PAM/ssh/include/rublon/utils.hpp
+++ b/PAM/ssh/include/rublon/utils.hpp
@@ -6,7 +6,6 @@
 
 #include <cstdint>
 #include <limits>
-#include <optional>
 #include <string>
 #include <utility>
 #include <tl/expected.hpp>