diff --git a/src/main/c/compile.sh b/src/main/c/compile.sh
index 608216b..16ee660 100644
--- a/src/main/c/compile.sh
+++ b/src/main/c/compile.sh
@@ -41,15 +41,20 @@ rm -f ./*.dll
 
 
 #compile object files
-# COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -msse -msse2 -msse3 -mmmx -m3dnow"
-# INPUT_FILES="./densitystep.c"
-# OUTPUT_FILE="./densitystep.o"
-# gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE
+COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -msse -msse2 -msse3 -mmmx -m3dnow"
+INPUT_FILES="./src/densitystep.c"
+OUTPUT_FILE="./densitystep.o"
+gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE
 
-# COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -msse -msse2 -msse3 -mmmx -m3dnow"
-# INPUT_FILES="./velocitystep.c"
-# OUTPUT_FILE="./velocitystep.o"
-# gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE
+COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -msse -msse2 -msse3 -mmmx -m3dnow"
+INPUT_FILES="./src/velocitystep.c"
+OUTPUT_FILE="./velocitystep.o"
+gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE
+
+COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -msse -msse2 -msse3 -mmmx -m3dnow"
+INPUT_FILES="./src/chunkmask.c"
+OUTPUT_FILE="./chunkmask.o"
+gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE
 
 COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -msse -msse2 -msse3 -mmmx -m3dnow"
 INPUT_FILES="./src/javainterface.c"
@@ -66,7 +71,7 @@ gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OU
 #compile shared object file
 OUTPUT_FILE="libfluidsim$LIB_ENDING"
 COMPILE_FLAGS="-shared"
-INPUT_FILES="fluidsim.o javainterface.o"
+INPUT_FILES="fluidsim.o javainterface.o chunkmask.o velocitystep.o densitystep.o"
 gcc $COMPILE_FLAGS $INPUT_FILES -o $OUTPUT_FILE
 
 #move to resources
diff --git a/src/main/c/src/fluidsim.c b/src/main/c/src/fluidsim.c
index 133d191..124a41a 100644
--- a/src/main/c/src/fluidsim.c
+++ b/src/main/c/src/fluidsim.c
@@ -5,10 +5,6 @@
 #include "../includes/mainFunctions.h"
 #include "../includes/chunk.h"
 
-#include "./chunkmask.c"
-#include "./velocitystep.c"
-#include "./densitystep.c"
-
 
 #define DIM 18
 #define LINEARSOLVERTIMES 20