M kernel/driv_text.c → kernel/driv_text.c

@@ -1,6 +1,6 @@
 #include "linker.h"
 #include "assembly.h"
-#include "os_string.h"
+#include "string.h"
 
 #define VGA_TEXTMODE_COLUMNS 80
 #define VGA_TEXTMODE_LINES 25

M kernel/os_paging.c → kernel/os_paging.c

@@ -1,7 +1,7 @@
 #include "os_paging.h"
 #include "linker.h"
 #include "os_page_allocator.h"
-#include "os_string.h"
+#include "string.h"
 
 #define MAKE_PAGE_ENTRY(addr, flags) (uint32_t)(((uint32_t)(addr) & 0xFFFFF000) | (flags))
 

M kernel/os_string.c → kernel/os_string.c

@@ -1,4 +1,5 @@
-#include "os_string.h"
+#include "string.h"
+#include <stdint.h>
 
 void *memcpy (void *destination, const void *source, size_t num) {
     if (destination >= source) {

M kernel/os_string.h → include/string.h

@@ -1,8 +1,8 @@
 /*! \file
  * Defines several functions to manipulate C strings and arrays.
  */
-#ifndef OS_STRING_H
-#define OS_STRING_H
+#ifndef STRING_H
+#define STRING_H
 
 #include <stdint.h>