diff --git a/src/main/c/chunkmask.c b/src/main/c/chunkmask.c
index a588b00..4777300 100644
--- a/src/main/c/chunkmask.c
+++ b/src/main/c/chunkmask.c
@@ -1,4 +1,3 @@
-#include <jni.h>
 #include <stdint.h>
 #include "includes/utilities.h"
 #include "includes/chunkmask.h"
diff --git a/src/main/c/fluidsim.c b/src/main/c/fluidsim.c
index ae84c19..596963d 100644
--- a/src/main/c/fluidsim.c
+++ b/src/main/c/fluidsim.c
@@ -1,4 +1,3 @@
-#include <jni.h>
 #include <stdint.h>
 #include "includes/utilities.h"
 #include "includes/chunkmask.h"
diff --git a/src/main/c/includes/mainFunctions.h b/src/main/c/includes/mainFunctions.h
index 13d4354..39625a1 100644
--- a/src/main/c/includes/mainFunctions.h
+++ b/src/main/c/includes/mainFunctions.h
@@ -1,8 +1,6 @@
 #ifndef MAINFUNC
 #define MAINFUNC
 
-#include <jni.h>
-
 #include "./chunk.h"
 
 void simulate(int numChunks, Chunk ** passedInChunks, jfloat timestep);
diff --git a/src/main/c/includes/utilities.h b/src/main/c/includes/utilities.h
index 992e3a8..05bd973 100644
--- a/src/main/c/includes/utilities.h
+++ b/src/main/c/includes/utilities.h
@@ -1,4 +1,3 @@
-#include <jni.h>
 #include <stdint.h>
 
 #ifndef UTILITIES_H
@@ -7,7 +6,6 @@
 #define SWAP(x0,x) {float *tmp=x0;x0=x;x=tmp;}
 #define IX(i,j,k) ((i)+(N)*(j)+(N*N)*(k))
 #define CK(m,n,o) ((m)+(n)*(3)+(o)*(3)*(3))
-#define GET_ARR(env,src,i) (*env)->GetDirectBufferAddress(env,(*env)->GetObjectArrayElement(env,src,i))
 #define GET_ARR_RAW(env,src,i) src[i]
 #define ARR_EXISTS(chunk_mask,m,n,o) (chunk_mask & CHUNK_INDEX_ARR[CK(m,n,o)]) > 0
 
diff --git a/src/main/c/javainterface.c b/src/main/c/javainterface.c
index cd68b07..3fc2040 100644
--- a/src/main/c/javainterface.c
+++ b/src/main/c/javainterface.c
@@ -19,6 +19,7 @@
 #define getChunk(i) (*env)->CallObjectMethod(env,chunkList,jListGet,i)
 #define getBuffArr(buffId) (*env)->GetObjectField(env,chunkJRaw,buffId)
 #define setBuffArr(buffId,value) (*env)->SetObjectField(env,chunkJRaw,buffId,value)
+#define GET_ARR(env,src,i) (*env)->GetDirectBufferAddress(env,(*env)->GetObjectArrayElement(env,src,i))