diff --git a/inc/f4ll/console_handler.h b/inc/f4ll/console_handler.h
index 210e410..14e15a6 100644
--- a/inc/f4ll/console_handler.h
+++ b/inc/f4ll/console_handler.h
@@ -42,16 +42,16 @@ private:
     void setup_receive(void);
 
     // LL_UsartCore pure virtual function implementations
-    virtual void receiver_idle(void) override;
-    virtual void transmission_complete(void) override;
-    virtual void framing_error(void) override;
-    virtual void overrun(void) override;
-    virtual void rx_dma_transfer_complete(void) override;
-    virtual void rx_dma_half_transfer(void) override;
-    virtual void rx_dma_error(dma_helper::dma_error_type reason) override;
-    virtual void tx_dma_transfer_complete(void) override;
-    virtual void tx_dma_half_transfer(void) override;
-    virtual void tx_dma_error(dma_helper::dma_error_type reason) override;
+    void receiver_idle(void) override;
+    void transmission_complete(void) override;
+    void framing_error(void) override;
+    void overrun(void) override;
+    void rx_dma_transfer_complete(void) override;
+    void rx_dma_half_transfer(void) override;
+    void rx_dma_error(dma_helper::dma_error_type reason) override;
+    void tx_dma_transfer_complete(void) override;
+    void tx_dma_half_transfer(void) override;
+    void tx_dma_error(dma_helper::dma_error_type reason) override;
 
     ringbuffer_ext m_tx_buffer;
     size_type m_bytes_sent = 0;
diff --git a/inc/f4ll/crc_handler.h b/inc/f4ll/crc_handler.h
index 26ae056..fbc7037 100644
--- a/inc/f4ll/crc_handler.h
+++ b/inc/f4ll/crc_handler.h
@@ -6,7 +6,7 @@
  */
 #pragma once
 
-#include <inttypes.h>
+#include <cstdint>
 
 #include <platform/dma_ll.h>
 
diff --git a/inc/f4ll/dma_helper.h b/inc/f4ll/dma_helper.h
index b2d1045..4f52f1e 100644
--- a/inc/f4ll/dma_helper.h
+++ b/inc/f4ll/dma_helper.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <inttypes.h>
+#include <cstdint>
 
 #include <platform/dma_ll.h>
 
diff --git a/inc/f4ll/fault.h b/inc/f4ll/fault.h
index 8bb1f2e..42293c4 100644
--- a/inc/f4ll/fault.h
+++ b/inc/f4ll/fault.h
@@ -5,6 +5,8 @@
 #define FAULT_REASON_BUS_FAULT 3
 #define FAULT_REASON_USAGE_FAULT 4
 
+#include <cstdint>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/inc/f4ll/irq_lock.h b/inc/f4ll/irq_lock.h
index b36ef75..6d4b356 100644
--- a/inc/f4ll/irq_lock.h
+++ b/inc/f4ll/irq_lock.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <inttypes.h>
+#include <cstdint>
 #include <stm32f4xx.h>
 
 namespace f4ll {
diff --git a/inc/f4ll/singleton.h b/inc/f4ll/singleton.h
new file mode 100644
index 0000000..b4278a8
--- /dev/null
+++ b/inc/f4ll/singleton.h
@@ -0,0 +1,23 @@
+#pragma once
+
+namespace f4ll {
+
+template <typename T> class singleton
+{
+public:
+    static T &instance()
+    {
+        static T instance;
+        return instance;
+    }
+
+protected:
+    singleton() = default;
+    singleton(const singleton &) = delete;
+    singleton &operator=(const singleton &) = delete;
+    static T *m_instance;
+};
+
+template <typename T> T *singleton<T>::m_instance = nullptr;
+
+} //  namespace f1ll {
diff --git a/src/fault.cpp b/src/fault.cpp
index d89b280..d26d544 100644
--- a/src/fault.cpp
+++ b/src/fault.cpp
@@ -5,8 +5,6 @@
  *      Author: abody
  *      -c "tpiu config internal <logfile_full_path> uart off <cpufreq>"
  */
-#include <inttypes.h>
-
 #include <f4ll/fault.h>
 #include <f4ll/str_util.h>
 #include <stm32f4xx.h>