diff --git a/Makefile b/Makefile
index b3051f3..e8b551f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ CXX      = g++
 CFLAGS   = -Wall -pedantic-errors -std=c++17 -g #-O2
 SRCDIR   = src/main/cpp/src/
 BUILDDIR = target/
-INCDIR   = src/main/cpp/inc/
+INCDIR   = $(BUILDDIR)inc/
 INSTALLDIR = /usr/lib/
 LDFLAGS  = -I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I$(INCDIR) -Iinc/ #-ldl
 NAME     = libplugin.so
@@ -37,7 +37,7 @@ $(BUILDDIR):
 	mkdir -p $@
 
 createhfiles:
-	rm -fr $(INCDIR)
+	$(RM) -r $(INCDIR)
 	javah -d $(INCDIR) -classpath target/classes/:$(HOME)/.m2/repository/org/bukkit/craftbukkit/1.7.10-R0.1-SNAPSHOT/craftbukkit-1.7.10-R0.1-SNAPSHOT.jar de.mrbesen.cppplugins.CppPlugin
 
-.phony: createhfiles clean plugins
+.PHONY: createhfiles clean plugins
diff --git a/src/main/cpp/inc/de_mrbesen_cppplugins_CppPlugin.h b/src/main/cpp/inc/de_mrbesen_cppplugins_CppPlugin.h
deleted file mode 100644
index 75d05af..0000000
--- a/src/main/cpp/inc/de_mrbesen_cppplugins_CppPlugin.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class de_mrbesen_cppplugins_CppPlugin */
-
-#ifndef _Included_de_mrbesen_cppplugins_CppPlugin
-#define _Included_de_mrbesen_cppplugins_CppPlugin
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    init_
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_de_mrbesen_cppplugins_CppPlugin_init_1
-  (JNIEnv *, jobject);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    loadPlugin
- * Signature: (Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_de_mrbesen_cppplugins_CppPlugin_loadPlugin
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    onLoad
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_de_mrbesen_cppplugins_CppPlugin_onLoad
-  (JNIEnv *, jobject);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    onEnable_
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_de_mrbesen_cppplugins_CppPlugin_onEnable_1
-  (JNIEnv *, jobject);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    onDisable_
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_de_mrbesen_cppplugins_CppPlugin_onDisable_1
-  (JNIEnv *, jobject);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    fireEvent
- * Signature: (Lde/mrbesen/cppplugins/CppEvent;I)Lde/mrbesen/cppplugins/CppEvent;
- */
-JNIEXPORT jobject JNICALL Java_de_mrbesen_cppplugins_CppPlugin_fireEvent
-  (JNIEnv *, jobject, jobject, jint);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    onCmd
- * Signature: (Lorg/bukkit/command/CommandSender;Lorg/bukkit/command/Command;Ljava/lang/String;[Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_de_mrbesen_cppplugins_CppPlugin_onCmd
-  (JNIEnv *, jobject, jobject, jobject, jstring, jobjectArray);
-
-/*
- * Class:     de_mrbesen_cppplugins_CppPlugin
- * Method:    getListener
- * Signature: ()[Lde/mrbesen/cppplugins/CppPlugin/CppListener;
- */
-JNIEXPORT jobjectArray JNICALL Java_de_mrbesen_cppplugins_CppPlugin_getListener
-  (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/main/cpp/inc/de_mrbesen_cppplugins_CppPlugin_CppListener.h b/src/main/cpp/inc/de_mrbesen_cppplugins_CppPlugin_CppListener.h
deleted file mode 100644
index a291498..0000000
--- a/src/main/cpp/inc/de_mrbesen_cppplugins_CppPlugin_CppListener.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class de_mrbesen_cppplugins_CppPlugin_CppListener */
-
-#ifndef _Included_de_mrbesen_cppplugins_CppPlugin_CppListener
-#define _Included_de_mrbesen_cppplugins_CppPlugin_CppListener
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif