diff --git a/risc_v/userspace/Makefile b/risc_v/userspace/Makefile
index 63d0176..29bc8aa 100644
--- a/risc_v/userspace/Makefile
+++ b/risc_v/userspace/Makefile
@@ -1,23 +1,15 @@
-CROSS=riscv64-unknown-linux-gnu-
+CROSS=riscv64-unknown-elf-
 CXX=g++
-OBJCOPY=objcopy
-CXXFLAGS=-Wall -O3 -ffreestanding -nostartfiles -nostdlib -static -march=rv64gc -mabi=lp64d
-LINKER_SCRIPT=-T./startlib/linker.lds
-INCLUDES=-I./startlib
-LIBS=-L./startlib
-LIB=-lstart
+CXXFLAGS=-Wall -O3 -static -I.
 SOURCES=$(wildcard *.cpp)
-OUT=$(patsubst %.cpp,%.elf,$(SOURCES))
-PROGS=$(patsubst %.cpp,%,$(SOURCES))
+OUT=$(patsubst %.cpp,%,$(SOURCES))
 
 all: $(OUT)
 
-%.elf:%.cpp Makefile startlib/linker.lds startlib/*.h
-	$(CROSS)$(CXX) $(CXXFLAGS) $(INCLUDES) $(LIBS) -o $@ $< $(LIB)
-	$(CROSS)$(OBJCOPY) -O binary $@ $@.bin
-	mv $@.bin $(basename $@)
+
+%: %.cpp Makefile
+	$(CROSS)$(CXX) $(CXXFLAGS) -o $@ $<
+
 
 clean:
 	rm -f $(OUT)
-	rm -f *.bin *.elf
-	rm -f $(PROGS)
diff --git a/risc_v/userspace/fb.cpp b/risc_v/userspace/fb.cpp
index 2fa4ae1..9db4692 100644
--- a/risc_v/userspace/fb.cpp
+++ b/risc_v/userspace/fb.cpp
@@ -1,5 +1,4 @@
-#include <printf.h>
-#include <syscall.h>
+#include <cstdio>
 #include <input-event-codes.h>
 
 
diff --git a/risc_v/userspace/helloworld.cpp b/risc_v/userspace/helloworld.cpp
index df66c55..fe632d9 100644
--- a/risc_v/userspace/helloworld.cpp
+++ b/risc_v/userspace/helloworld.cpp
@@ -1,4 +1,4 @@
-#include <printf.h>
+#include <cstdio>
 
 const int SIZE = 100000;
 double myarray[SIZE];