diff --git a/src/stdio/fscanf.c b/src/stdio/fscanf.c
index 37d90cf..107874e 100644
--- a/src/stdio/fscanf.c
+++ b/src/stdio/fscanf.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <fxlibc/scanf.h>
+#include "stdio_p.h"
 
 int fscanf(FILE * restrict fp, char const * restrict fmt, ...)
 {
@@ -14,4 +14,4 @@ int fscanf(FILE * restrict fp, char const * restrict fmt, ...)
 
 	va_end(args);
 	return count;
-}
\ No newline at end of file
+}
diff --git a/src/stdio/scanf.c b/src/stdio/scanf.c
index 18fd3c5..50080df 100644
--- a/src/stdio/scanf.c
+++ b/src/stdio/scanf.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <fxlibc/scanf.h>
+#include "stdio_p.h"
 
 int scanf(char const * restrict fmt, ...)
 {
@@ -14,4 +14,4 @@ int scanf(char const * restrict fmt, ...)
 
 	va_end(args);
 	return count;
-}
\ No newline at end of file
+}
diff --git a/src/stdio/scanf/scan.c b/src/stdio/scanf/scan.c
index 061582b..f705ddf 100644
--- a/src/stdio/scanf/scan.c
+++ b/src/stdio/scanf/scan.c
@@ -1,7 +1,7 @@
+#include "../stdio_p.h"
+#include "../../stdlib/stdlib_p.h"
 #include <stdio.h>
 #include <ctype.h>
-#include <fxlibc/scanf.h>
-#include <fxlibc/stdlib_p.h>
 #include <stdbool.h>
 
 void __scanf_start(struct __scanf_input *in)
@@ -666,4 +666,4 @@ int __scanf(
 
 	__scanf_end( in );
 	return validrets;
-}
\ No newline at end of file
+}
diff --git a/src/stdio/sscanf.c b/src/stdio/sscanf.c
index 9a7e87f..9d60ad2 100644
--- a/src/stdio/sscanf.c
+++ b/src/stdio/sscanf.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <fxlibc/scanf.h>
+#include "stdio_p.h"
 
 int sscanf(const char * restrict str, char const * restrict fmt, ...)
 {
diff --git a/include/fxlibc/scanf.h b/src/stdio/stdio_p.h
similarity index 92%
rename from include/fxlibc/scanf.h
rename to src/stdio/stdio_p.h
index 38c0fee..f393b07 100644
--- a/include/fxlibc/scanf.h
+++ b/src/stdio/stdio_p.h
@@ -1,11 +1,5 @@
-#ifndef __SCANF_H__
-# define __SCANF_H__
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#ifndef __STDIO_P_H__
+# define __STDIO_P_H__
 
 #include <stdio.h>
 #include <stdbool.h>
@@ -69,11 +63,4 @@ static inline int __scanf_peek(struct __scanf_input *__in)
 /* Close the input by unsending the buffer once finished. */
 void __scanf_end(struct __scanf_input *__in);
 
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* __SCANF_H__ */
+#endif /* __STDIO_P_H__ */
diff --git a/src/stdio/vfscanf.c b/src/stdio/vfscanf.c
index 019f94e..d17c455 100644
--- a/src/stdio/vfscanf.c
+++ b/src/stdio/vfscanf.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <fxlibc/scanf.h>
+#include "stdio_p.h"
 
 int vfscanf(FILE * restrict fp, char const * restrict fmt, va_list args)
 {
diff --git a/src/stdio/vscanf.c b/src/stdio/vscanf.c
index e16da94..3185ff9 100644
--- a/src/stdio/vscanf.c
+++ b/src/stdio/vscanf.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <fxlibc/scanf.h>
+#include "stdio_p.h"
 
 int vscanf(char const * restrict fmt, va_list args)
 {
diff --git a/src/stdio/vsscanf.c b/src/stdio/vsscanf.c
index a71243b..c6815e4 100644
--- a/src/stdio/vsscanf.c
+++ b/src/stdio/vsscanf.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <fxlibc/scanf.h>
+#include "stdio_p.h"
 
 int vsscanf(const char * restrict str, char const * restrict fmt, va_list args)
 {
@@ -9,4 +9,4 @@ int vsscanf(const char * restrict str, char const * restrict fmt, va_list args)
 	};
 
 	return __scanf(&in, fmt, &args);
-}
\ No newline at end of file
+}
diff --git a/include/fxlibc/stdlib_p.h b/src/stdlib/stdlib_p.h
similarity index 98%
rename from include/fxlibc/stdlib_p.h
rename to src/stdlib/stdlib_p.h
index 39f60fa..c368086 100644
--- a/include/fxlibc/stdlib_p.h
+++ b/src/stdlib/stdlib_p.h
@@ -3,7 +3,7 @@
 
 #include <stdlib.h>
 #include <stdbool.h>
-#include <fxlibc/scanf.h>
+#include "../stdio/stdio_p.h"
 
 /*
 ** Parse an integer from a string. This is the base function for strtol,
diff --git a/src/stdlib/strto_fp.c b/src/stdlib/strto_fp.c
index b97d44e..72a4fd1 100644
--- a/src/stdlib/strto_fp.c
+++ b/src/stdlib/strto_fp.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdlib_p.h>
+#include "stdlib_p.h"
 #include <stdlib.h>
 #include <stdbool.h>
 
diff --git a/src/stdlib/strto_int.c b/src/stdlib/strto_int.c
index d123153..9a7f397 100644
--- a/src/stdlib/strto_int.c
+++ b/src/stdlib/strto_int.c
@@ -1,9 +1,8 @@
-#include <fxlibc/stdlib_p.h>
+#include "stdlib_p.h"
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
-#include <stdbool.h>
 
 int __strto_int(struct __scanf_input *input, int base, long *outl,
 	long long *outll, bool use_unsigned)
diff --git a/src/stdlib/strtod.c b/src/stdlib/strtod.c
index 76fc462..130233b 100644
--- a/src/stdlib/strtod.c
+++ b/src/stdlib/strtod.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdlib_p.h>
+#include "stdlib_p.h"
 #include <errno.h>
 
 double strtod(char const * restrict ptr, char ** restrict endptr)
diff --git a/src/stdlib/strtof.c b/src/stdlib/strtof.c
index 481cbc8..38240ea 100644
--- a/src/stdlib/strtof.c
+++ b/src/stdlib/strtof.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdlib_p.h>
+#include "stdlib_p.h"
 #include <errno.h>
 
 float strtof(char const * restrict ptr, char ** restrict endptr)
diff --git a/src/stdlib/strtol.c b/src/stdlib/strtol.c
index 81a263e..c0609b3 100644
--- a/src/stdlib/strtol.c
+++ b/src/stdlib/strtol.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdlib_p.h>
+#include "stdlib_p.h"
 #include <errno.h>
 
 long int strtol(char const * restrict ptr, char ** restrict endptr, int base)
diff --git a/src/stdlib/strtold.c b/src/stdlib/strtold.c
index 3f9f6b9..bf6421b 100644
--- a/src/stdlib/strtold.c
+++ b/src/stdlib/strtold.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdlib_p.h>
+#include "stdlib_p.h"
 #include <errno.h>
 
 long double strtold(char const * restrict ptr, char ** restrict endptr)
diff --git a/src/stdlib/strtoll.c b/src/stdlib/strtoll.c
index 12098dc..2defd3d 100644
--- a/src/stdlib/strtoll.c
+++ b/src/stdlib/strtoll.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdlib_p.h>
+#include "stdlib_p.h"
 #include <errno.h>
 
 long long int strtoll(char const * restrict ptr, char ** restrict endptr,
diff --git a/src/stdlib/strtoul.c b/src/stdlib/strtoul.c
index d8e9386..a92c265 100644
--- a/src/stdlib/strtoul.c
+++ b/src/stdlib/strtoul.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdlib_p.h>
+#include "stdlib_p.h"
 #include <errno.h>
 
 unsigned long int strtoul(char const * restrict ptr, char ** restrict endptr,
diff --git a/src/stdlib/strtoull.c b/src/stdlib/strtoull.c
index 1a05f96..aad4bd3 100644
--- a/src/stdlib/strtoull.c
+++ b/src/stdlib/strtoull.c
@@ -1,4 +1,4 @@
-#include <fxlibc/stdlib_p.h>
+#include "stdlib_p.h"
 #include <errno.h>
 
 unsigned long long int strtoull(char const * restrict ptr,