diff --git a/gshutdown/src/detectwm.h b/gshutdown/src/detectwm.h

index 08c69a0..4545848 100644

--- a/gshutdown/src/detectwm.h

+++ b/gshutdown/src/detectwm.h

@@ -21,7 +21,7 @@

 #ifndef __GSHUTDOWN_WMDETECT__

 #define __GSHUTDOWN_WMDETECT__

-#include <glib/gtypes.h>

+#include <glib.h>

 gchar *detect_window_manager();

diff --git a/gshutdown/src/hayro/gshutdown_profile_path/valuesProfile.c b/gshutdown/src/hayro/gshutdown_profile_path/valuesProfile.c

index cdfe49d..5ac4fb2 100644

--- a/gshutdown/src/hayro/gshutdown_profile_path/valuesProfile.c

+++ b/gshutdown/src/hayro/gshutdown_profile_path/valuesProfile.c

@@ -1,7 +1,5 @@

-#include <glib/gstring.h>

+#include <glib.h>

 #include <glib/gstdio.h>

-#include <glib/gkeyfile.h>

-#include <glib/gfileutils.h> /* g_build_path */

 #include "action.h"

 #include "values.h"

 #ifndef __profile__

diff --git a/gshutdown/src/main.c b/gshutdown/src/main.c

index 117f40b..015c9f1 100644

--- a/gshutdown/src/main.c

+++ b/gshutdown/src/main.c

@@ -21,7 +21,7 @@

 #include <stdlib.h>

 #include <signal.h>

 #include <sys/wait.h>

-#include <glib/gutils.h> /* g_atexit() */

+#include <glib.h> /* g_atexit() */

 #include "main.h"

 #include "gui.h"

 #include "misc.h"

@@ -46,7 +46,7 @@ static void gettext_init();

 static void init(int argc, char **argv);

 /*

- * Le remplacement de gettext, quand ENABLE_NLS n'est pas à TRUE.

+ * Le remplacement de gettext, quand ENABLE_NLS n'est pas Г  TRUE.

  */

 #ifndef ENABLE_NLS

 char *internal_ngettext(const char *msgid, const char *msgid_plural,

diff --git a/gshutdown/src/misc.c b/gshutdown/src/misc.c

index 9bd8d4b..94e92ee 100644

--- a/gshutdown/src/misc.c

+++ b/gshutdown/src/misc.c

@@ -21,12 +21,7 @@

 #include <unistd.h> /* X_OK */

 #include <stdlib.h>

 #include <string.h>

-#include <glib/gstdio.h> 

-#include <glib/gstrfuncs.h>   /* g_strdup_printf */

-#include <glib/gmem.h>        /* g_free */

-#include <glib/gutils.h>      /* g_getenv */

-#include <glib/gfileutils.h>  /* g_file_test() */

-#include <glib/gshell.h>      /* g_shell_parse_argv */

+#include <glib.h> 

 #include "config.h"

 #include "misc.h"

 #include "main.h"

diff --git a/gshutdown/src/misc.h b/gshutdown/src/misc.h

index f29bc08..d2a27e3 100644

--- a/gshutdown/src/misc.h

+++ b/gshutdown/src/misc.h

@@ -20,7 +20,7 @@

 #ifndef __GSHUTDOWN_MISC__

 #define __GSHUTDOWN_MISC__

-#include <glib/gtypes.h>      /* gchar */

+#include <glib.h>      /* gchar */

 /* Return a data file path. e.g: gshutdown.glade */

 gchar *data_path(gchar *filename);

diff --git a/gshutdown/src/timer.c b/gshutdown/src/timer.c

index c87bc9d..e793113 100644

--- a/gshutdown/src/timer.c

+++ b/gshutdown/src/timer.c

@@ -18,7 +18,7 @@

  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

  */

-#include <glib/gtypes.h>

+#include <glib.h>

 #include "timer.h"

 #include "values.h"

 #include "gui.h"

diff --git a/gshutdown/src/timer.h b/gshutdown/src/timer.h

index 0b6dc63..7d28ac6 100644

--- a/gshutdown/src/timer.h

+++ b/gshutdown/src/timer.h

@@ -21,7 +21,7 @@

 #ifndef __GSHUTDOWN_TIMER__

 #define __GSHUTDOWN_TIMER__

-#include <glib/gtypes.h>

+#include <glib.h>

 guint time_left();

 gboolean timer_notify();

diff --git a/gshutdown/src/values.c b/gshutdown/src/values.c

index 763c4a2..0f43dd3 100644

--- a/gshutdown/src/values.c

+++ b/gshutdown/src/values.c

@@ -21,8 +21,6 @@

 #include <stdio.h>

 #include <string.h>

 #include <glib.h>

-#include <glib/gkeyfile.h>

-#include <glib/gfileutils.h> /* g_build_path */

 #include "values.h"

 #include "gui.h"

 #include "detectwm.h"

diff --git a/gshutdown/src/values.h b/gshutdown/src/values.h

index 791a12f..9cfd5c3 100644

--- a/gshutdown/src/values.h

+++ b/gshutdown/src/values.h

@@ -21,7 +21,7 @@

 #ifndef __GSHUTDOWN_VALUES__

 #define __GSHUTDOWN_VALUES__

-#include <glib/gtypes.h>

+#include <glib.h>

 #include "action.h"

 typedef enum {