diff --git a/src/cobhan_buffer.h b/src/cobhan_buffer.h
index 5dc456f..d8f8351 100644
--- a/src/cobhan_buffer.h
+++ b/src/cobhan_buffer.h
@@ -1,11 +1,11 @@
 #ifndef COBHAN_BUFFER_H
 #define COBHAN_BUFFER_H
 
-#include <cstdint>
+#include <cstdint>   // for int32_t
 #include <cstring>   // for std::memcpy
+#include <iostream>  // for std::cerr, std::terminate
 #include <limits>    // for std::numeric_limits
 #include <stdexcept> // for std::runtime_error, std::invalid_argument
-#include <iostream>  // for std::cerr, std::terminate
 
 class CobhanBuffer {
 public:
diff --git a/src/logging.h b/src/logging.h
index 21feb45..44ab07d 100644
--- a/src/logging.h
+++ b/src/logging.h
@@ -1,17 +1,18 @@
 #ifndef LOGGING_H
 #define LOGGING_H
 #include "hints.h"
-#include <cstdint> // int32_t
-#include <iomanip> // std::setw
+#include <cstdint>  // int32_t
+#include <iomanip>  // std::setw
 #include <iostream> // std::cerr
 #include <napi.h>
 #include <sstream> // std::ostringstream
-#include <string> // std::string
+#include <string>  // std::string
 
 class Logger {
 public:
   Logger(Napi::Env &env, std::string system_name);
-  explicit Logger(Napi::Env &env, std::string system_name, Napi::Function new_log_hook);
+  explicit Logger(Napi::Env &env, std::string system_name,
+                  Napi::Function new_log_hook);
   ~Logger();
 
   void set_log_hook(Napi::Function new_log_hook);
@@ -36,7 +37,7 @@ class Logger {
   void error_log(const char *function_name, const char *message) const;
   void error_log(const char *function_name, const std::string &message) const;
   [[noreturn]] void log_error_and_throw(const char *function_name,
-                           const std::string &error_msg) const;
+                                        const std::string &error_msg) const;
 
 private:
   void stderr_debug_log(const char *function_name, const char *message) const;