diff --git a/key.go b/key.go
index 5b5e722..3ae063c 100644
--- a/key.go
+++ b/key.go
@@ -307,9 +307,10 @@ func checkKeyCodes(k string) (key C.MMKeyCode, err error) {
 	}
 
 	if len(k) == 1 {
-		val := C.CString(k)
-		key = C.keyCodeForChar(*val)
-		C.free(unsafe.Pointer(val))
+		val1 := C.CString(k)
+		defer C.free(unsafe.Pointer(val1))
+
+		key = C.keyCodeForChar(*val1)
 		if key == C.K_NOT_A_KEY {
 			err = keyErr
 			return
diff --git a/key/keypress_c.h b/key/keypress_c.h
index e9e0d9f..a6cf987 100644
--- a/key/keypress_c.h
+++ b/key/keypress_c.h
@@ -1,5 +1,5 @@
 #include "keypress.h"
-// #include "../base/deadbeef_rand_c.h"
+#include "../base/deadbeef_rand_c.h"
 #include "../base/microsleep.h"
 
 #include <ctype.h> /* For isupper() */
diff --git a/mouse/mouse_c.h b/mouse/mouse_c.h
index a34e44b..366ae2e 100644
--- a/mouse/mouse_c.h
+++ b/mouse/mouse_c.h
@@ -1,8 +1,5 @@
 #include "mouse.h"
-// #include "../screen/screen.h"
-// #include "../screen/screen_c.h"
-#include "../base/deadbeef_rand_c.h"
-// #include "../deadbeef_rand.h"
+#include "../base/deadbeef_rand.h"
 #include "../base/microsleep.h"
 
 #include <math.h> /* For floor() */