diff --git a/core/config_reader.c b/core/config_reader.c
index 451fc486..803e697c 100644
--- a/core/config_reader.c
+++ b/core/config_reader.c
@@ -3,6 +3,7 @@
  License: GPLv3
  */
 
+#include <stdlib.h>
 #include <string.h>
 #include "config_reader.h"
 #include <xml_defs.h>
diff --git a/core/controller.h b/core/controller.h
index b0db84bc..f0e5a212 100644
--- a/core/controller.h
+++ b/core/controller.h
@@ -82,7 +82,7 @@ typedef struct {
     int mperiod;
 } s_adapter;
 
-int adapter_detect();
+e_gimx_status adapter_detect();
 int adapter_start();
 int adapter_send();
 e_gimx_status adapter_clean();
diff --git a/core/gimx.c b/core/gimx.c
index 700cae94..76b11644 100755
--- a/core/gimx.c
+++ b/core/gimx.c
@@ -7,6 +7,7 @@
 #include <signal.h> //to catch SIGINT
 #include <errno.h> //to print errors
 #include <string.h> //to print errors
+#include <stdlib.h> //free()
 #include <limits.h> //PATH_MAX
 
 #ifndef WIN32