--- np2/x11/gtk2/xnp2.h	2011/01/15 18:43:14	1.7
+++ np2/x11/gtk2/xnp2.h	2011/01/15 19:16:59	1.8
@@ -44,9 +44,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 extern GtkWidget *main_window;
 extern GtkWidget *drawarea;
@@ -67,8 +65,6 @@ gboolean gtk_window_init_fullscreen(GtkW
 void gtk_window_fullscreen_mode(GtkWidget *widget);
 void gtk_window_restore_mode(GtkWidget *widget);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* NP2_GTK2_XNP2_H__ */