--- np2/x11/kbdmng.h	2003/12/19 16:08:01	1.3
+++ np2/x11/kbdmng.h	2011/01/15 19:16:58	1.6
@@ -10,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -28,9 +26,9 @@
 #ifndef	NP2_X11_KBDMNG_H__
 #define	NP2_X11_KBDMNG_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "keystat.h"
+
+G_BEGIN_DECLS
 
 enum {
 	KEY_KEY106,
@@ -46,8 +44,6 @@ BOOL kbdmng_init(void);
 BYTE kbdmng_getf12key(void);
 void kbdmng_resetf12(void);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif	/* NP2_X11_KBDMNG_H__ */