diff --git a/src/system.h b/src/system.h
index 856ef8a..e7b4db1 100644
--- a/src/system.h
+++ b/src/system.h
@@ -26,20 +26,11 @@
 
 #include "config.h"
 
-#ifndef HAVE_FUNC
-#ifndef  __GNUC__
-#define __func__ ""
-#else 
-#define __func__ __FUNCTION__
-#endif
-#endif
-
 /* should define in somewhere */ 
 extern void sys_error(char *format, ...);    /* show nessafe and exit system */
 extern void sys_exit(int code);              /* exit system with code */
-extern void sys_message(char *format, ...);  /* show various message */
+extern void sys_message(int lv, char *format, ...);  /* show various message */
 extern void sys_reset();
-extern int  sys_nextdebuglv;                 /* message level */
 
 /*
  DEBUGLEVEL
@@ -56,14 +47,13 @@ extern int  sys_nextdebuglv;                 /* message level */
 #endif /* DEBUG */
 
 #define NOMEMERR()        sys_error("Out of memory at %s()\n", __func__)
-#define NOTICE            sys_nextdebuglv = 2, sys_message
+#define NOTICE(...)       sys_message(2, __VA_ARGS__)
 
-#define WARNING           sys_nextdebuglv = 1, \
-                          sys_message("*WARNING*(%s): ", __func__), sys_message
-
-#define SYSERROR          fprintf(stderr, "*ERROR*(%s): ", __func__), sys_error
-
-#define SACT_DEBUG        sys_nextdebuglv = 5, \
-                          sys_message("%s: ", __func__), sys_message
+#define SYSERROR(fmt, ...) \
+	sys_error("*ERROR*(%s): " fmt, __func__, ##__VA_ARGS__)
+#define WARNING(fmt, ...) \
+	sys_message(1, "*WARNING*(%s): " fmt, __func__, ##__VA_ARGS__)
+#define SACT_DEBUG(fmt, ...) \
+	sys_message(5, "%s: " fmt, __func__, ##__VA_ARGS__)
 
 #endif /* !__SYSTEM__ */
diff --git a/src/xsystem35.c b/src/xsystem35.c
index 1af100a..0f24c7c 100644
--- a/src/xsystem35.c
+++ b/src/xsystem35.c
@@ -84,7 +84,6 @@ static void    check_profile();
 /* for debugging */
 static FILE *fpdebuglog;
 static int debuglv = DEBUGLEVEL;
-int sys_nextdebuglv;
 
 static int audio_buffer_size = 0;
 
@@ -182,8 +181,8 @@ static void sys35_usage(boolean verbose) {
 	exit(1);
 }
 
-void sys_message(char *format, ...) {
-	if (debuglv < sys_nextdebuglv)
+void sys_message(int lv, char *format, ...) {
+	if (debuglv < lv)
 		return;
 
 	va_list args;
@@ -198,10 +197,10 @@ void sys_message(char *format, ...) {
 		ANDROID_LOG_INFO,
 		ANDROID_LOG_VERBOSE,
 	};
-	int prio = prio_table[min(sys_nextdebuglv, 5)];
+	int prio = prio_table[min(lv, 5)];
 	__android_log_vprint(prio, "xsystem35", format, args);
 #elif defined (DEBUG)
-	if (sys_nextdebuglv >= 5) {
+	if (lv >= 5) {
 		vfprintf(fpdebuglog, format, args);
 		fflush(fpdebuglog);
 	} else {
diff --git a/src/xsystem35.h b/src/xsystem35.h
index 7307229..ccabb46 100644
--- a/src/xsystem35.h
+++ b/src/xsystem35.h
@@ -44,11 +44,12 @@
   6: add message(output to terminal or FILE)
 */
 
-#define DEBUG_SHOWSCOADR  sys_message("%d,%x: ", sl_getPage(), sl_getIndex())
 #ifdef DEBUG
-#define DEBUG_COMMAND_YET sys_nextdebuglv = 2, DEBUG_SHOWSCOADR, sys_message
-#define DEBUG_COMMAND     sys_nextdebuglv = 5, DEBUG_SHOWSCOADR, sys_message
-#define DEBUG_MESSAGE     sys_nextdebuglv = 6, sys_message
+#define DEBUG_COMMAND_YET(fmt, ...) \
+	sys_message(2, fmt "%d,%x: ", sl_getPage(), sl_getIndex(), ##__VA_ARGS__)
+#define DEBUG_COMMAND(fmt, ...) \
+	sys_message(5, fmt "%d,%x: ", sl_getPage(), sl_getIndex(), ##__VA_ARGS__)
+#define DEBUG_MESSAGE(...)     sys_message(6, __VA_ARGS__)
 #else
 #define DEBUG_MESSAGE(...)
 #define DEBUG_COMMAND(...)