diff --git a/src/conio/ciolib.c b/src/conio/ciolib.c
index 142cad604fd9936842105b19d3f9014dbadb3660..9f4ac3545bbb582aac00b9846f44152220f3d6d7 100644
--- a/src/conio/ciolib.c
+++ b/src/conio/ciolib.c
@@ -553,7 +553,7 @@ void ciolib_gotoxy(int x, int y)
 	cio_api.gotoxy(nx,ny);
 }
 
-void ciolib_textmode(mode)
+void ciolib_textmode(int mode)
 {
 	CIOLIB_INIT();
 	
diff --git a/src/conio/console.c b/src/conio/console.c
index 2c7a6d65ec6b7552add04f27c246f221a1289575..593dcc24937bdce5a9055b4cbf2779e10e69672d 100644
--- a/src/conio/console.c
+++ b/src/conio/console.c
@@ -109,6 +109,7 @@
 
 #define CONSOLE_CLIPBOARD	XA_PRIMARY
 
+#include <threadwrap.h>
 #include <genwrap.h>
 
 #include "console.h"
@@ -377,6 +378,8 @@ struct {
 
 #define	HWM	16
 void resize_window(void);
+int KbdEmpty(void);
+int load_font(char *filename, int width, int height, int scale);
 
 void tty_pause()
 {
@@ -513,7 +516,7 @@ void
 video_update()
 {
 	static clock_t	lastupd=-1;
-	static clock_started=0;
+	static int clock_started=0;
 	clock_t upd;
 
 	upd=msclock();
@@ -1671,7 +1674,7 @@ KbdRead()
 }
 
 int
-KbdEmpty()
+KbdEmpty(void)
 {
 	return(K_NEXT == K_FREE);
 }
diff --git a/src/conio/console.h b/src/conio/console.h
index 2a2fb21be7a1ac6077dd2c67f3f1a750be1f6487..c15a0a73a375212b63ee238112be723ffc076d2d 100644
--- a/src/conio/console.h
+++ b/src/conio/console.h
@@ -82,6 +82,7 @@ int tty_peek(int flag);
 int tty_kbhit(void);
 void tty_beep(void);
 void x_win_title(const char *title);
+int console_init(void);
 
 #define	TTYF_BLOCK	0x00000008
 #define	TTYF_POLL	0x00000010
diff --git a/src/conio/cterm.c b/src/conio/cterm.c
index e9f71dc2e9178237c0fbac8de8252f4756620bbe..678159dc2bbb28e79037c52ef4b3c25c9555a62f 100644
--- a/src/conio/cterm.c
+++ b/src/conio/cterm.c
@@ -31,6 +31,7 @@
  * Note: If this box doesn't appear square, then you need to fix your tabs.	*
  ****************************************************************************/
 
+#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/conio/curs_cio.c b/src/conio/curs_cio.c
index e90ea84c8fd93c2b4729e8c60abd20b84d8fbf62..96f99039f7f3949d7613b6e2ddb08d244b8ed9fc 100644
--- a/src/conio/curs_cio.c
+++ b/src/conio/curs_cio.c
@@ -1125,6 +1125,7 @@ int curs_hidemouse(void)
 		return(-1);
 	#endif
 */
+	return(-1);
 }
 
 int curs_showmouse(void)
@@ -1136,4 +1137,5 @@ int curs_showmouse(void)
 	#endif
 	return(-1);
 */
+	return(-1);
 }
diff --git a/src/conio/mouse.c b/src/conio/mouse.c
index eafba149e9461dc37d45525371785b0ba80ee883..897743950e2762c7755606f2619a4aed3e7a84a9 100644
--- a/src/conio/mouse.c
+++ b/src/conio/mouse.c
@@ -97,7 +97,7 @@ struct mouse_state {
 
 struct mouse_state state;
 int mouse_events=0;
-static mouse_initialized=0;
+static int mouse_initialized=0;
 
 void init_mouse(void)
 {
diff --git a/src/conio/x_cio.c b/src/conio/x_cio.c
index 51686745a7808b737f1ea9c7ae58f6f7afab8c21..8f20295ea46230f6b9dd06bd7151f9fe32bc3928 100644
--- a/src/conio/x_cio.c
+++ b/src/conio/x_cio.c
@@ -33,6 +33,7 @@
 
 #include <stdarg.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include <threadwrap.h>
 
@@ -73,6 +74,7 @@ int x_puttext(int sx, int sy, int ex, int ey, void *fill)
 			vmem[y*DpyCols+x]=sch;
 		}
 	}
+	return(1);
 }
 
 int x_gettext(int sx, int sy, int ex, int ey, void *fill)
@@ -105,6 +107,7 @@ int x_gettext(int sx, int sy, int ex, int ey, void *fill)
 			*(out++)=sch >> 8;
 		}
 	}
+	return(1);
 }
 
 void x_textattr(int attr)
diff --git a/src/conio/x_cio.h b/src/conio/x_cio.h
index ea19d1937dcfa0bd9f1a8e3abcef068f1ff352f7..b3692fdd3e3dfa50aaf7b4a638953ac1588a3614 100644
--- a/src/conio/x_cio.h
+++ b/src/conio/x_cio.h
@@ -33,6 +33,7 @@
 
 #ifdef __unix__
 #include "ciolib.h"
+#include "console.h"
 
 #ifdef __cplusplus
 extern "C" {