Index: kernel/genarch/include/genarch/fb/font-8x16.h
===================================================================
--- kernel/genarch/include/genarch/fb/font-8x16.h	(revision c48de9159898ec9161fffbe96e51b3e048feeda2)
+++ kernel/genarch/include/genarch/fb/font-8x16.h	(revision 4db4718dad043fdba9393afca6e05aaf21c99c72)
@@ -42,5 +42,5 @@
 #include <typedefs.h>
 
-extern uint16_t fb_font_glyph(const wchar_t ch);
+extern uint16_t fb_font_glyph(const char32_t ch);
 extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];
 
Index: kernel/genarch/include/genarch/kbrd/scanc.h
===================================================================
--- kernel/genarch/include/genarch/kbrd/scanc.h	(revision c48de9159898ec9161fffbe96e51b3e048feeda2)
+++ kernel/genarch/include/genarch/kbrd/scanc.h	(revision 4db4718dad043fdba9393afca6e05aaf21c99c72)
@@ -41,6 +41,6 @@
 #define SCANCODES  128
 
-extern wchar_t sc_primary_map[SCANCODES];
-extern wchar_t sc_secondary_map[SCANCODES];
+extern char32_t sc_primary_map[SCANCODES];
+extern char32_t sc_secondary_map[SCANCODES];
 
 #endif