diff --git a/bakara/src/bakara.h b/bakara/src/bakara.h
index 7ec74f6..2237927 100644
--- a/bakara/src/bakara.h
+++ b/bakara/src/bakara.h
@@ -3,5 +3,10 @@
 #include <bakara/math/type.h>
 #include <bakara/core/log.h>
 #include <bakara/core/application.h>
+#include <bakara/events/event.h>
+#include <bakara/events/key_event.h>
+#include <bakara/events/window_event.h>
+#include <bakara/events/app_event.h>
+#include <bakara/core/key_codes.h>
 
 #include <bakara/core/entry.h>
\ No newline at end of file
diff --git a/bakara/src/bkpch.h b/bakara/src/bkpch.h
index 15f1f08..d666384 100644
--- a/bakara/src/bkpch.h
+++ b/bakara/src/bkpch.h
@@ -1,9 +1,15 @@
 #pragma once
 
 #include <iostream>
+#include <ostream>
 #include <utility>
 #include <memory>
 #include <functional>
 #include <string>
+#include <sstream>
+#include <format>
 #include <array>
 #include <vector>
+#include <type_traits>
+#include <exception>
+#include <cctype>