diff --git a/client/mifarehost.c b/client/mifarehost.c
index aab1ae333..c6f2fe3fa 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -9,7 +9,7 @@
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <stdlib.h> 
 #include "mifarehost.h"
 
 
diff --git a/client/mifarehost.h b/client/mifarehost.h
index ec1117e83..728dc6cc9 100644
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <conio.h>
 #include "common.h"
 #include "cmdmain.h"
 #include "ui.h"
diff --git a/client/util.c b/client/util.c
index 8e7ef01b1..6825d721d 100644
--- a/client/util.c
+++ b/client/util.c
@@ -15,6 +15,8 @@
 #include "util.h"
 
 #ifdef __linux__
+#include <termios.h>
+#include <sys/ioctl.h> 
 int ukbhit(void)
 {
   int cnt = 0;
diff --git a/include/common.h b/include/common.h
index eb519f63d..fd1a6a56c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -12,6 +12,8 @@
 #ifndef __COMMON_H
 #define __COMMON_H
 
+#include <stdint.h>
+
 //-----------------------------------------------------------------------------
 // ISO 14443A
 //-----------------------------------------------------------------------------