diff --git a/Start_Linux/graphicalGame.o b/Start_Linux/graphicalGame.o
new file mode 100644
index 0000000..23198c4
Binary files /dev/null and b/Start_Linux/graphicalGame.o differ
diff --git a/Start_Linux/input.c b/Start_Linux/input.c
index 1f64a2d..d06f3cc 100644
--- a/Start_Linux/input.c
+++ b/Start_Linux/input.c
@@ -1,6 +1,7 @@
 #include "input.h"
 #include <string.h>
 #include <ctype.h>
+#include <stdlib.h>
 
 // TODO:
 // eine Funktion implementieren, die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt.
diff --git a/Start_Linux/input.o b/Start_Linux/input.o
index f4b99dc..26d1e07 100644
Binary files a/Start_Linux/input.o and b/Start_Linux/input.o differ
diff --git a/Start_Linux/main.o b/Start_Linux/main.o
index 3cf8072..5f075b5 100644
Binary files a/Start_Linux/main.o and b/Start_Linux/main.o differ
diff --git a/Start_Linux/makefile b/Start_Linux/makefile
index 60c75f3..80d238a 100644
--- a/Start_Linux/makefile
+++ b/Start_Linux/makefile
@@ -1,45 +1,42 @@
 CC = gcc
-CFLAGS = -g -Wall
-LDFLAGS = -lGL -lX11 -lm
-BINARIES = ./linux
+CFLAGS = -g -Wall -Wextra
+CPPFLAGS = -I$(raylibfolder) -I$(unityfolder)
+LDFLAGS =
+LDLIBS = -lGL -lX11 -lm
 
+BINARIES = ./linux
 raylibfolder = ./raylib
 unityfolder = ./unity
 
-# --------------------------
-# initiales Spiel bauen
-# --------------------------
-wordsalad_ourversion:
-	$(CC) -o wordsalad_ourversion -L. $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS)
-
-# --------------------------
-# Normales Spiel bauen
-# --------------------------
-wordsalad: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a
-	$(CC) $(CFLAGS) -o wordsalad main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(LDFLAGS)
-
-main.o: main.c
-	$(CC) $(CFLAGS) -c main.c
-
-input.o: input.c
-	$(CC) $(CFLAGS) -c input.c
-
-game.o: game.c
-	$(CC) $(CFLAGS) -c game.c
-
-graphicalGame.o: graphicalGame.c
-	$(CC) $(CFLAGS) -I$(raylibfolder) -c graphicalGame.c
-
-# --------------------------
-# Unit Tests
-# --------------------------
+TARGET = wordsalad
 TEST_BIN = runTests
 
-test: input.o game.o unit_tests.c
-	$(CC) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
+OBJS = main.o input.o game.o graphicalGame.o
+
+.PHONY: all clean test
+
+all: $(TARGET)
+
+wordsalad_ourversion: main.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a
+	$(CC) $(CFLAGS) -o $@ main.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDLIBS)
+
+$(TARGET): $(OBJS) $(BINARIES)/libraylib.a
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(BINARIES)/libraylib.a $(LDLIBS)
+
+main.o: main.c input.h game.h graphicalGame.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
+input.o: input.c input.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
+game.o: game.c game.h input.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
+graphicalGame.o: graphicalGame.c graphicalGame.h game.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
+test: input.o game.o unit_tests.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
 
-# --------------------------
-# Clean
-# --------------------------
 clean:
-	rm -f *.o wordsalad $(TEST_BIN)
+	rm -f *.o $(TARGET) $(TEST_BIN) wordsalad_ourversion
\ No newline at end of file
diff --git a/Start_Linux/runTests b/Start_Linux/runTests
deleted file mode 100755
index 34723a9..0000000
Binary files a/Start_Linux/runTests and /dev/null differ
diff --git a/Start_Linux/wordsalad b/Start_Linux/wordsalad
new file mode 100755
index 0000000..5ee3a08
Binary files /dev/null and b/Start_Linux/wordsalad differ
diff --git a/Start_Linux/wordsalad_ourversion b/Start_Linux/wordsalad_ourversion
deleted file mode 100755
index f4f709e..0000000
Binary files a/Start_Linux/wordsalad_ourversion and /dev/null differ