diff --git a/.gitignore b/.gitignore
index febdaba..d1b9bdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ limine_building/bin/*
 limine_building/iso/*
 bin/
 .vscode/*
-flanterm_build/
\ No newline at end of file
+flanterm_build
+flanterm_build/*
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 18166ef..02e6ba2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-COMPILER=g++
+CPPC=g++
+CC=gcc
 LINKER=gcc
 COMPILER_FLAGS=\
     -Wall \
@@ -16,7 +17,7 @@ COMPILER_FLAGS=\
     -mno-sse2 \
     -mno-red-zone \
 	-O2
-LINKER_FLAGS=-ffreestanding -O2 -nostdlib bin/kernel.o
+LINKER_FLAGS=-ffreestanding -O2 -nostdlib bin/flanterm.o bin/kernel.o
 BIN_LOCATION=bin/AntiniOS.bin
 
 all: prepare kernel linker prepare-limine
@@ -27,8 +28,10 @@ prepare: prepare-libs
 prepare-libs: prepare-flanterm
 
 prepare-flanterm:
-	@mkdir -p flanterm_build/
+	@mkdir -p src/flanterm/backends
 	@git clone https://github.com/mintsuki/flanterm flanterm_build/ --depth=1
+	@cp -r flanterm_build/flanterm.c flanterm_build/flanterm.h src/flanterm/
+	@cp -r flanterm_build/backends/fb.c flanterm_build/backends/fb.h src/flanterm/backends
 
 clean: clean_bin clean_limine
 distclean: clean_bin clean_limine clean_flanterm
@@ -41,9 +44,11 @@ clean_limine:
 
 clean_flanterm:
 	@rm -fr flanterm_build/
+	@rm -fr src/flanterm/
 
 kernel:
-	@$(COMPILER) -c -x c flanterm_build/flanterm.c -x "c++" src/kernel.cpp -o bin/kernel.o $(COMPILER_FLAGS)
+	@$(CPPC) -c -x c -x "c++" src/kernel.cpp -o bin/kernel.o $(COMPILER_FLAGS)
+	@$(CC) -c src/flanterm/flanterm.c -o bin/flanterm.o $(COMPILER_FLAGS)
 
 linker:
 	@$(LINKER) -T src/linker.ld -o bin/AntiniOS.bin $(LINKER_FLAGS)
diff --git a/flanterm_build b/flanterm_build
deleted file mode 160000
index 88740ef..0000000
--- a/flanterm_build
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 88740ef420d44a68679c4f72aaa7ba174dc453ce
diff --git a/src/include/libcpp.cpp b/src/include/libcpp.cpp
index dcb8f02..92b067b 100644
--- a/src/include/libcpp.cpp
+++ b/src/include/libcpp.cpp
@@ -54,7 +54,7 @@ void int_to_string(int value, char* buffer, uint32_t buffer_size)
 
 char* ret_int_to_string(int value)
 {
-    char* buffer;
+    char* buffer = "";
     if (value < 0) {
         value = -value;
         uint_to_string((uint32_t)value, buffer + 1, strlen(buffer) - 1);
diff --git a/src/kernel.cpp b/src/kernel.cpp
index 9026304..f767a38 100644
--- a/src/kernel.cpp
+++ b/src/kernel.cpp
@@ -1,7 +1,7 @@
 #include "include/libcpp.cpp"
 #include "include/limine.hpp"
-#include "flanterm.h"
-#include "fb.h"
+#include "flanterm/flanterm.h"
+#include "flanterm/backends/fb.h"
 
 #include <stdint.h>
 #include <stdbool.h>