diff --git a/app/main.c b/app/main.c
index 3deb0a34a9..6553f3c940 100644
--- a/app/main.c
+++ b/app/main.c
@@ -54,8 +54,8 @@
 #ifdef G_OS_WIN32
 #include <windows.h>
 #else
-void              on_signal       (gint);
-void              on_sig_child    (gint);
+static void       on_signal       (gint);
+static void       on_sig_child    (gint);
 #endif
 
 static void       init            (void);
@@ -65,15 +65,15 @@ static void	  on_error        (const gchar    *domain,
 				   gpointer        user_data);
 
 /* GLOBAL data */
-gint no_interface      = FALSE;
-gint no_data           = FALSE;
-gint no_splash         = FALSE;
-gint no_splash_image   = FALSE;
-gint be_verbose        = FALSE;
-gint use_shm           = FALSE;
-gint use_debug_handler = FALSE;
-gint console_messages  = FALSE;
-gint restore_session   = FALSE;
+gboolean no_interface      = FALSE;
+gboolean no_data           = FALSE;
+gboolean no_splash         = FALSE;
+gboolean no_splash_image   = FALSE;
+gboolean be_verbose        = FALSE;
+gboolean use_shm           = FALSE;
+gboolean use_debug_handler = FALSE;
+gboolean console_messages  = FALSE;
+gboolean restore_session   = FALSE;
 
 GimpSet *image_context = NULL;
 
@@ -114,8 +114,8 @@ int
 main (int    argc,
       char **argv)
 {
-  gint show_version = FALSE;
-  gint show_help    = FALSE;
+  gboolean show_version = FALSE;
+  gboolean show_help    = FALSE;
   gint i, j;
 #ifdef HAVE_PUTENV
   gchar *display_env;
diff --git a/libgimp/gimpsignal.h b/libgimp/gimpsignal.h
index 0dd418b79c..5567d3888e 100644
--- a/libgimp/gimpsignal.h
+++ b/libgimp/gimpsignal.h
@@ -30,21 +30,21 @@
 #include <signal.h>
 #include <glib.h>
 
-/* RETSIGTYPE is a reference to a 
- * (signal handler) function that
- * takes a signal ID and returns
- * void. signal(2) returns such 
- * references; so does 
- * gimp_signal_private.
+/* GimpRetSigType is a reference 
+ * to a (signal handler) function 
+ * that takes a signal ID and 
+ * returns void. 
+ * signal(2) returns such references; 
+ * so does gimp_signal_private.
  */
 
-typedef void (*RetSigType)(gint);
+typedef void (*GimpRetSigType)(gint);
 
 /* Internal implementation that can be */
 /* DEFINEd into various flavors of     */
 /* signal(2) lookalikes.               */
 
-RetSigType gimp_signal_private (gint signum, void (*gimp_sighandler)(int), gint sa_flags);
+GimpRetSigType gimp_signal_private (gint signum, void (*gimp_sighandler)(int), gint sa_flags);
 
 /* the gimp_signal_syscallrestart()    */
 /* lookalike looks like signal(2) but  */
diff --git a/libgimpbase/gimpsignal.h b/libgimpbase/gimpsignal.h
index 0dd418b79c..5567d3888e 100644
--- a/libgimpbase/gimpsignal.h
+++ b/libgimpbase/gimpsignal.h
@@ -30,21 +30,21 @@
 #include <signal.h>
 #include <glib.h>
 
-/* RETSIGTYPE is a reference to a 
- * (signal handler) function that
- * takes a signal ID and returns
- * void. signal(2) returns such 
- * references; so does 
- * gimp_signal_private.
+/* GimpRetSigType is a reference 
+ * to a (signal handler) function 
+ * that takes a signal ID and 
+ * returns void. 
+ * signal(2) returns such references; 
+ * so does gimp_signal_private.
  */
 
-typedef void (*RetSigType)(gint);
+typedef void (*GimpRetSigType)(gint);
 
 /* Internal implementation that can be */
 /* DEFINEd into various flavors of     */
 /* signal(2) lookalikes.               */
 
-RetSigType gimp_signal_private (gint signum, void (*gimp_sighandler)(int), gint sa_flags);
+GimpRetSigType gimp_signal_private (gint signum, void (*gimp_sighandler)(int), gint sa_flags);
 
 /* the gimp_signal_syscallrestart()    */
 /* lookalike looks like signal(2) but  */