diff --git a/src/clevo_acpi.c b/src/clevo_acpi.c
index 87f4b30..9c1a5a1 100644
--- a/src/clevo_acpi.c
+++ b/src/clevo_acpi.c
@@ -2,7 +2,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/acpi.h>
-#include "ck.h"
+#include "clevo_interfaces.h"
 
 #define DRIVER_NAME			"clevo_acpi"
 #define CLEVO_ACPI_RESOURCE_HID		"CLV0001"
@@ -129,7 +129,6 @@ void clevo_acpi_notify(struct acpi_device *device, u32 event)
 	// clevo_acpi_driver_data = container_of(&device, struct clevo_acpi_driver_data_t, adev);
 	if (!IS_ERR_OR_NULL(clevo_acpi_interface.event_callb)) {
 		// Execute registered callback
-		pr_debug("calling event addr\n");
 		clevo_acpi_interface.event_callb(event);
 	}
 }
diff --git a/src/ck.h b/src/clevo_interfaces.h
similarity index 68%
rename from src/ck.h
rename to src/clevo_interfaces.h
index f5b7977..418e950 100644
--- a/src/ck.h
+++ b/src/clevo_interfaces.h
@@ -1,5 +1,4 @@
-#include <linux/module.h>
-#include <linux/kernel.h>
+#include <linux/types.h>
 
 #ifndef TUXEDO_KEYBOARD_H
 #define TUXEDO_KEYBOARD_H
@@ -13,6 +12,6 @@ struct clevo_interface_t {
 };
 
 u32 clevo_keyboard_add_interface(struct clevo_interface_t *new_interface);
-u32 clevo_keyboard_remove_interface(struct clevo_interface_t *new_interface);
+u32 clevo_keyboard_remove_interface(struct clevo_interface_t *interface);
 
 #endif
diff --git a/src/clevo_keyboard.h b/src/clevo_keyboard.h
index 8b9f02b..20c6c3f 100644
--- a/src/clevo_keyboard.h
+++ b/src/clevo_keyboard.h
@@ -18,8 +18,7 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 #include "tuxedo_keyboard_common.h"
-#include "tuxedo_keyboard.h"
-#include "ck.h"
+#include "clevo_interfaces.h"
 
 #define CLEVO_EVENT_GUID                "ABBC0F6B-8EA1-11D1-00A0-C90629100000"
 #define CLEVO_EMAIL_GUID                "ABBC0F6C-8EA1-11D1-00A0-C90629100000"
diff --git a/src/tuxedo_keyboard.c b/src/tuxedo_keyboard.c
index b772918..c4f3872 100644
--- a/src/tuxedo_keyboard.c
+++ b/src/tuxedo_keyboard.c
@@ -20,7 +20,6 @@
 
 #define pr_fmt(fmt) "tuxedo_keyboard" ": " fmt
 
-#include "tuxedo_keyboard.h"
 #include "tuxedo_keyboard_common.h"
 #include "clevo_keyboard.h"
 #include "uniwill_keyboard.h"
diff --git a/src/tuxedo_keyboard.h b/src/tuxedo_keyboard.h
deleted file mode 100644
index dfc3b20..0000000
--- a/src/tuxedo_keyboard.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/acpi.h>
-#include <linux/dmi.h>
-#include <linux/platform_device.h>
-#include <linux/input.h>
-#include <linux/input/sparse-keymap.h>
-
-#ifndef TUXEDO_KEYBOARD_H
-#define TUXEDO_KEYBOARD_H
-
-struct clevo_interface_t {
-	char *string_id;
-	void (*event_callb)(u32);
-	u32 (*method_call)(u8, u32, u32*);
-};
-
-u32 clevo_keyboard_add_interface(struct clevo_interface_t *new_interface);
-
-
-#endif
\ No newline at end of file