2 files changed, 8 insertions, 18 deletions
diff --git a/kernel/include/drivers/serial.h b/kernel/include/drivers/serial.h
index 33947eb..48ed75c 100644
--- a/kernel/include/drivers/serial.h
+++ b/kernel/include/drivers/serial.h
@@ -23,13 +23,8 @@
 
 #define PORT 0x3f8 // COM1
 
-namespace Serial
-{
-
-bool initialize(void);
-void write_char(const char chr);
-void write_string(const char *string);
-
-}
+bool serial_initialize(void);
+void serial_write_char(const char chr);
+void serial_write_string(const char *string);
 
 #endif
diff --git a/kernel/include/drivers/vga_text_buffer.h b/kernel/include/drivers/vga_text_buffer.h
index 389c864..ada5228 100644
--- a/kernel/include/drivers/vga_text_buffer.h
+++ b/kernel/include/drivers/vga_text_buffer.h
@@ -43,9 +43,6 @@
 #define vga_entry(character, color)                                           \
   ((uint16_t) color << 8 | (uint16_t) character)
 
-namespace VGATextBuffer
-{
-
 /* Hardware text mode color constants. */
 typedef enum {
   COLOR_BLACK = 0,
@@ -64,13 +61,11 @@ typedef enum {
   COLOR_LIGHT_MAGENTA = 13,
   COLOR_LIGHT_BROWN = 14,
   COLOR_WHITE = 15
-} colors;
-
-void initialize(void);
-void write_char(const char);
-void write_string(const char *string);
-void printf(const char *string, ...);
+} vgatb_colors;
 
-}
+void vgatb_initialize(void);
+void vgatb_write_char(const char);
+void vgatb_write_string(const char *string);
+void vgatb_printf(const char *string, ...);
 
 #endif