diff --git a/modules/NightDemonDemo/ndd.c b/modules/NightDemonDemo/ndd.c
index 0ec011a..d469262 100644
--- a/modules/NightDemonDemo/ndd.c
+++ b/modules/NightDemonDemo/ndd.c
@@ -22,6 +22,7 @@
 /* $Id: ndd.c,v 1.2 2003/11/09 15:06:12 chikama Exp $ */
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "portab.h"
 #include "ags.h"
diff --git a/src/menu.h b/src/menu.h
index c9f7429..8c8a338 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -29,7 +29,7 @@
 typedef struct {
 	char *title;
 	char *oldstring;
-	char *newstring;
+	const char *newstring;
 	int   max;
 	/* for MJ cmd */
 	boolean need_window;
diff --git a/src/menu_callback.c b/src/menu_callback.c
index a0a0a1a..2b1cbce 100644
--- a/src/menu_callback.c
+++ b/src/menu_callback.c
@@ -50,7 +50,7 @@ GtkWidget *menu_label_msgbox;
 GtkWidget *menu_spinbutton;
 GtkWidget *menu_textentry;
 GtkWidget *menu_textentry2;
-gchar     *menu_textentry_string;
+const gchar *menu_textentry_string;
 
 GtkWidget *menu_window_popup; /* popup menu */
 GtkWidget *menu_window_exit;  /* exit window */
diff --git a/src/menu_callback.h b/src/menu_callback.h
index ae8bff3..76f14b0 100644
--- a/src/menu_callback.h
+++ b/src/menu_callback.h
@@ -44,7 +44,7 @@ extern GtkWidget *menu_label_msgbox;
 extern GtkWidget *menu_spinbutton;
 extern GtkWidget *menu_textentry;
 extern GtkWidget *menu_textentry2;
-extern gchar     *menu_textentry_string;
+extern const gchar *menu_textentry_string;
 
 extern GtkWidget *menu_window_popup; /* popup menu */
 extern GtkWidget *menu_window_exit;  /* exit window */
diff --git a/src/midifile.h b/src/midifile.h
index 9c2d19d..f41abb4 100644
--- a/src/midifile.h
+++ b/src/midifile.h
@@ -78,9 +78,9 @@ struct midiinfo {
 	int ceptr; /* current event pointer */
 	
 	/* work info */
-	long curtime;   /* current time */
-	int msgindex;   /* midi message buffer index */
-	int msgsize;    /* size of current allocaed msg */
+	long curtime;    /* current time */
+	size_t msgindex; /* midi message buffer index */
+	size_t msgsize;  /* size of current allocaed msg */
 	unsigned char *msgbuffer; /* message buffer */
 	
 	/* system35 jump info */
diff --git a/src/xcore_cursor.c b/src/xcore_cursor.c
index 9a32cba..c079cbe 100644
--- a/src/xcore_cursor.c
+++ b/src/xcore_cursor.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/src/xcore_draw.c b/src/xcore_draw.c
index d712ea1..5bae52a 100644
--- a/src/xcore_draw.c
+++ b/src/xcore_draw.c
@@ -489,7 +489,7 @@ void Xcore_fadeIn(int step) {
 	}
 }
 
-void Xcore_fadeOut(step) {
+void Xcore_fadeOut(int step) {
 	
 	if (step == 0) {
 		Xcore_sync();
diff --git a/src/xcore_mode.c b/src/xcore_mode.c
index f70bb9b..77a86bb 100644
--- a/src/xcore_mode.c
+++ b/src/xcore_mode.c
@@ -30,7 +30,6 @@
 
 #ifdef HAVE_XF86VMODE
 # include <X11/extensions/xf86vmode.h>
-# include <X11/extensions/xf86vmstr.h>
 #endif
 
 #include "portab.h"