1.1 --- a/src/aica/audio.c	Mon Oct 15 21:19:22 2012 +1000
     1.2 +++ b/src/aica/audio.c	Sat Jan 26 14:00:48 2013 +1000
     1.3 @@ -19,7 +19,7 @@
     1.4  
     1.5  #include "aica/aica.h"
     1.6  #include "aica/audio.h"
     1.7 -#include <glib/gmem.h>
     1.8 +#include <glib.h>
     1.9  #include "dream.h"
    1.10  #include <assert.h>
    1.11  #include <string.h>

     2.1 --- a/src/aica/audio.h	Mon Oct 15 21:19:22 2012 +1000
     2.2 +++ b/src/aica/audio.h	Sat Jan 26 14:00:48 2013 +1000
     2.3 @@ -20,7 +20,7 @@
     2.4  
     2.5  #include <stdint.h>
     2.6  #include <stdio.h>
     2.7 -#include <glib/gtypes.h>
     2.8 +#include <glib.h>
     2.9  #include "gettext.h"
    2.10  #include "plugin.h"
    2.11  

     3.1 --- a/src/config.c	Mon Oct 15 21:19:22 2012 +1000
     3.2 +++ b/src/config.c	Sat Jan 26 14:00:48 2013 +1000
     3.3 @@ -21,8 +21,7 @@
     3.4  #include <errno.h>
     3.5  #include <stdlib.h>
     3.6  #include <string.h>
     3.7 -#include <glib/gmem.h>
     3.8 -#include <glib/gstrfuncs.h>
     3.9 +#include <glib.h>
    3.10  #include <sys/types.h>
    3.11  #include <sys/stat.h>
    3.12  #include "dreamcast.h"

     4.1 --- a/src/config.h	Mon Oct 15 21:19:22 2012 +1000
     4.2 +++ b/src/config.h	Sat Jan 26 14:00:48 2013 +1000
     4.3 @@ -19,8 +19,7 @@
     4.4  #ifndef lxdream_config_H
     4.5  #define lxdream_config_H 1
     4.6  
     4.7 -#include <glib/gtypes.h>
     4.8 -#include <glib/glist.h>
     4.9 +#include <glib.h>
    4.10  #include "lxdream.h"
    4.11  #include "gettext.h"
    4.12  

     5.1 --- a/src/drivers/cdrom/cd_gdi.c	Mon Oct 15 21:19:22 2012 +1000
     5.2 +++ b/src/drivers/cdrom/cd_gdi.c	Sat Jan 26 14:00:48 2013 +1000
     5.3 @@ -23,9 +23,7 @@
     5.4  #include <fcntl.h>
     5.5  #include <errno.h>
     5.6  #include <sys/stat.h>
     5.7 -#include <glib/gfileutils.h>
     5.8 -#include <glib/gutils.h>
     5.9 -#include <glib/gstrfuncs.h>
    5.10 +#include <glib.h>
    5.11  #include "drivers/cdrom/cdimpl.h"
    5.12  
    5.13  

     6.1 --- a/src/drivers/cdrom/cd_mmc.c	Mon Oct 15 21:19:22 2012 +1000
     6.2 +++ b/src/drivers/cdrom/cd_mmc.c	Sat Jan 26 14:00:48 2013 +1000
     6.3 @@ -18,7 +18,7 @@
     6.4  
     6.5  #include <assert.h>
     6.6  #include <string.h>
     6.7 -#include <glib/gstrfuncs.h>
     6.8 +#include <glib.h>
     6.9  #include "lxdream.h"
    6.10  #include "gettext.h"
    6.11  #include "drivers/cdrom/cdimpl.h"

     7.1 --- a/src/drivers/cdrom/cdrom.c	Mon Oct 15 21:19:22 2012 +1000
     7.2 +++ b/src/drivers/cdrom/cdrom.c	Sat Jan 26 14:00:48 2013 +1000
     7.3 @@ -19,8 +19,7 @@
     7.4  #include <fcntl.h>
     7.5  #include <stdio.h>
     7.6  #include <string.h>
     7.7 -#include <glib/gmem.h>
     7.8 -#include <glib/gstrfuncs.h>
     7.9 +#include <glib.h>
    7.10  #include "lxdream.h"
    7.11  #include "drivers/cdrom/cdrom.h"
    7.12  #include "drivers/cdrom/cdimpl.h"

     8.1 --- a/src/drivers/cdrom/cdrom.h	Mon Oct 15 21:19:22 2012 +1000
     8.2 +++ b/src/drivers/cdrom/cdrom.h	Sat Jan 26 14:00:48 2013 +1000
     8.3 @@ -18,7 +18,7 @@
     8.4  #define cdrom_cdrom_H 1
     8.5  
     8.6  #include <stdio.h>
     8.7 -#include <glib/glist.h>
     8.8 +#include <glib.h>
     8.9  #include "drivers/cdrom/defs.h"
    8.10  #include "drivers/cdrom/sector.h"
    8.11  

     9.1 --- a/src/drivers/cdrom/defs.h	Mon Oct 15 21:19:22 2012 +1000
     9.2 +++ b/src/drivers/cdrom/defs.h	Sat Jan 26 14:00:48 2013 +1000
     9.3 @@ -21,7 +21,7 @@
     9.4  
     9.5  #include "lxdream.h"
     9.6  #include <stdint.h>
     9.7 -#include <glib/gtypes.h>
     9.8 +#include <glib.h>
     9.9  
    9.10  
    9.11  #ifdef __cplusplus

    10.1 --- a/src/drivers/cdrom/drive.c	Mon Oct 15 21:19:22 2012 +1000
    10.2 +++ b/src/drivers/cdrom/drive.c	Sat Jan 26 14:00:48 2013 +1000
    10.3 @@ -18,8 +18,7 @@
    10.4  
    10.5  #include <stdlib.h>
    10.6  #include <string.h>
    10.7 -#include <glib/gstrfuncs.h>
    10.8 -#include <glib/gmem.h>
    10.9 +#include <glib.h>
   10.10  #include "drivers/cdrom/drive.h"
   10.11  #include "drivers/cdrom/cdimpl.h"
   10.12  

    11.1 --- a/src/drivers/cdrom/drive.h	Mon Oct 15 21:19:22 2012 +1000
    11.2 +++ b/src/drivers/cdrom/drive.h	Sat Jan 26 14:00:48 2013 +1000
    11.3 @@ -26,7 +26,7 @@
    11.4  #ifndef cdrom_drive_H
    11.5  #define cdrom_drive_H 1
    11.6  
    11.7 -#include <glib/glist.h>
    11.8 +#include <glib.h>
    11.9  #include "hook.h"
   11.10  #include "drivers/cdrom/defs.h"
   11.11  

    12.1 --- a/src/drivers/cdrom/isofs.c	Mon Oct 15 21:19:22 2012 +1000
    12.2 +++ b/src/drivers/cdrom/isofs.c	Sat Jan 26 14:00:48 2013 +1000
    12.3 @@ -19,7 +19,7 @@
    12.4  #include <assert.h>
    12.5  #include <stdio.h>
    12.6  #include <unistd.h>
    12.7 -#include <glib/gmem.h>
    12.8 +#include <glib.h>
    12.9  
   12.10  #define LIBISOFS_WITHOUT_LIBBURN 1
   12.11  

    13.1 --- a/src/drivers/cdrom/sector.c	Mon Oct 15 21:19:22 2012 +1000
    13.2 +++ b/src/drivers/cdrom/sector.c	Sat Jan 26 14:00:48 2013 +1000
    13.3 @@ -17,7 +17,7 @@
    13.4   */
    13.5  
    13.6  #include <sys/stat.h>
    13.7 -#include <glib/gmem.h>
    13.8 +#include <glib.h>
    13.9  #include <assert.h>
   13.10  #include <stdlib.h>
   13.11  #include <stdio.h>

    14.1 --- a/src/drivers/cdrom/sector.h	Mon Oct 15 21:19:22 2012 +1000
    14.2 +++ b/src/drivers/cdrom/sector.h	Sat Jan 26 14:00:48 2013 +1000
    14.3 @@ -20,7 +20,7 @@
    14.4  #define cdrom_sector_H 1
    14.5  
    14.6  #include <stdio.h>
    14.7 -#include <glib/gtypes.h>
    14.8 +#include <glib.h>
    14.9  #include "drivers/cdrom/defs.h"
   14.10  
   14.11  #ifdef __cplusplus

    15.1 --- a/src/drivers/input_lirc.c	Mon Oct 15 21:19:22 2012 +1000
    15.2 +++ b/src/drivers/input_lirc.c	Sat Jan 26 14:00:48 2013 +1000
    15.3 @@ -28,7 +28,6 @@
    15.4  #include <dirent.h>
    15.5  #include <ctype.h>
    15.6  
    15.7 -#include <glib/giochannel.h>
    15.8  #include <glib.h>
    15.9  
   15.10  #include <lirc/lirc_client.h>

    16.1 --- a/src/drivers/joy_linux.c	Mon Oct 15 21:19:22 2012 +1000
    16.2 +++ b/src/drivers/joy_linux.c	Sat Jan 26 14:00:48 2013 +1000
    16.3 @@ -32,7 +32,6 @@
    16.4  #include <ctype.h>
    16.5  
    16.6  #include <linux/joystick.h>
    16.7 -#include <glib/giochannel.h>
    16.8  #include <glib.h>
    16.9  
   16.10  #include "lxdream.h"

    17.1 --- a/src/drivers/video_egl.h	Mon Oct 15 21:19:22 2012 +1000
    17.2 +++ b/src/drivers/video_egl.h	Sat Jan 26 14:00:48 2013 +1000
    17.3 @@ -20,7 +20,7 @@
    17.4  #ifndef lxdream_video_egl_H
    17.5  #define lxdream_video_egl_H 1
    17.6  
    17.7 -#include "glib/gtypes.h"
    17.8 +#include <glib.h>
    17.9  
   17.10  #ifdef __cplusplus
   17.11  extern "C" {

    18.1 --- a/src/gdlist.c	Mon Oct 15 21:19:22 2012 +1000
    18.2 +++ b/src/gdlist.c	Sat Jan 26 14:00:48 2013 +1000
    18.3 @@ -19,7 +19,7 @@
    18.4  
    18.5  #include <string.h>
    18.6  #include <stdlib.h>
    18.7 -#include <glib/gstrfuncs.h>
    18.8 +#include <glib.h>
    18.9  #include <libgen.h>
   18.10  #include "gettext.h"
   18.11  #include "gdrom/gdrom.h"

    19.1 --- a/src/gdrom/gdrom.c	Mon Oct 15 21:19:22 2012 +1000
    19.2 +++ b/src/gdrom/gdrom.c	Sat Jan 26 14:00:48 2013 +1000
    19.3 @@ -22,7 +22,7 @@
    19.4  #include <fcntl.h>
    19.5  #include <errno.h>
    19.6  #include <ctype.h>
    19.7 -#include <glib/gutils.h>
    19.8 +#include <glib.h>
    19.9  #include <netinet/in.h>
   19.10  #include "gdrom/ide.h"
   19.11  #include "gdrom/gdrom.h"

    20.1 --- a/src/gdrom/gdrom.h	Mon Oct 15 21:19:22 2012 +1000
    20.2 +++ b/src/gdrom/gdrom.h	Sat Jan 26 14:00:48 2013 +1000
    20.3 @@ -23,7 +23,7 @@
    20.4  #include "lxdream.h"
    20.5  #include "hook.h"
    20.6  #include "drivers/cdrom/defs.h"
    20.7 -#include <glib/glist.h>
    20.8 +#include <glib.h>
    20.9  
   20.10  #ifdef __cplusplus
   20.11  extern "C" {

    21.1 --- a/src/gui.h	Mon Oct 15 21:19:22 2012 +1000
    21.2 +++ b/src/gui.h	Sat Jan 26 14:00:48 2013 +1000
    21.3 @@ -19,7 +19,7 @@
    21.4  #ifndef lxdream_gui_H
    21.5  #define lxdream_gui_H
    21.6  
    21.7 -#include <glib/gtypes.h>
    21.8 +#include <glib.h>
    21.9  
   21.10  #ifdef __cplusplus
   21.11  extern "C" {

    22.1 --- a/src/loader.c	Mon Oct 15 21:19:22 2012 +1000
    22.2 +++ b/src/loader.c	Sat Jan 26 14:00:48 2013 +1000
    22.3 @@ -24,7 +24,7 @@
    22.4  #include <sys/stat.h>
    22.5  #include <errno.h>
    22.6  #include <stdint.h>
    22.7 -#include <glib/gstrfuncs.h>
    22.8 +#include <glib.h>
    22.9  #include <elf.h>
   22.10  #include "mem.h"
   22.11  #include "bootstrap.h"

    23.1 --- a/src/loader.h	Mon Oct 15 21:19:22 2012 +1000
    23.2 +++ b/src/loader.h	Sat Jan 26 14:00:48 2013 +1000
    23.3 @@ -20,7 +20,7 @@
    23.4  #define lxdream_loader_H 1
    23.5  
    23.6  #include <stdio.h>
    23.7 -#include <glib/gtypes.h>
    23.8 +#include <glib.h>
    23.9  
   23.10  #include "drivers/cdrom/cdrom.h"
   23.11  

    24.1 --- a/src/lxdream.h	Mon Oct 15 21:19:22 2012 +1000
    24.2 +++ b/src/lxdream.h	Sat Jan 26 14:00:48 2013 +1000
    24.3 @@ -20,7 +20,7 @@
    24.4  #define lxdream_lxdream_H 1
    24.5  
    24.6  #include <stdint.h>
    24.7 -#include <glib/gtypes.h>
    24.8 +#include <glib.h>
    24.9  
   24.10  #include "../config.h"
   24.11  

    25.1 --- a/src/lxpaths.c	Mon Oct 15 21:19:22 2012 +1000
    25.2 +++ b/src/lxpaths.c	Sat Jan 26 14:00:48 2013 +1000
    25.3 @@ -19,9 +19,7 @@
    25.4  #include <ctype.h>
    25.5  #include <unistd.h>
    25.6  #include <stdlib.h>
    25.7 -#include <glib/gfileutils.h>
    25.8 -#include <glib/gstrfuncs.h>
    25.9 -#include <glib/gutils.h>
   25.10 +#include <glib.h>
   25.11  
   25.12  #include "gui.h"
   25.13  #include "config.h"

    26.1 --- a/src/lxpaths.h	Mon Oct 15 21:19:22 2012 +1000
    26.2 +++ b/src/lxpaths.h	Sat Jan 26 14:00:48 2013 +1000
    26.3 @@ -19,7 +19,7 @@
    26.4  #ifndef lxdream_paths_H
    26.5  #define lxdream_paths_H
    26.6  
    26.7 -#include <glib/gtypes.h>
    26.8 +#include <glib.h>
    26.9  
   26.10  /****************** System paths ****************/
   26.11  /**

    27.1 --- a/src/maple/maple.c	Mon Oct 15 21:19:22 2012 +1000
    27.2 +++ b/src/maple/maple.c	Sat Jan 26 14:00:48 2013 +1000
    27.3 @@ -18,7 +18,7 @@
    27.4  #define MODULE maple_module
    27.5  
    27.6  #include <assert.h>
    27.7 -#include <glib/gstrfuncs.h>
    27.8 +#include <glib.h>
    27.9  #include "eventq.h"
   27.10  #include "dream.h"
   27.11  #include "mem.h"

    28.1 --- a/src/mem.c	Mon Oct 15 21:19:22 2012 +1000
    28.2 +++ b/src/mem.c	Sat Jan 26 14:00:48 2013 +1000
    28.3 @@ -20,7 +20,7 @@
    28.4  #include <sys/types.h>
    28.5  #include <sys/mman.h>
    28.6  #include <sys/stat.h>
    28.7 -#include <glib/gstrfuncs.h>
    28.8 +#include <glib.h>
    28.9  #include <assert.h>
   28.10  #include <stdint.h>
   28.11  #include <stdlib.h>

    29.1 --- a/src/paths_unix.c	Mon Oct 15 21:19:22 2012 +1000
    29.2 +++ b/src/paths_unix.c	Sat Jan 26 14:00:48 2013 +1000
    29.3 @@ -18,7 +18,7 @@
    29.4  
    29.5  #include <string.h>
    29.6  #include <stdlib.h>
    29.7 -#include <glib/gstrfuncs.h>
    29.8 +#include <glib.h>
    29.9  
   29.10  #include "lxdream.h"
   29.11  #include "config.h"

    30.1 --- a/src/plugin.c	Mon Oct 15 21:19:22 2012 +1000
    30.2 +++ b/src/plugin.c	Sat Jan 26 14:00:48 2013 +1000
    30.3 @@ -20,8 +20,7 @@
    30.4  #include <dirent.h>
    30.5  #include <dlfcn.h>
    30.6  #include <string.h>
    30.7 -#include <glib/gmem.h>
    30.8 -#include <glib/gstrfuncs.h>
    30.9 +#include <glib.h>
   30.10  #include "plugin.h"
   30.11  #include "lxpaths.h"
   30.12  

    31.1 --- a/src/pvr2/glutil.c	Mon Oct 15 21:19:22 2012 +1000
    31.2 +++ b/src/pvr2/glutil.c	Sat Jan 26 14:00:48 2013 +1000
    31.3 @@ -19,7 +19,7 @@
    31.4  #include <assert.h>
    31.5  #include <string.h>
    31.6  #include <stdlib.h>
    31.7 -#include <glib/gstrfuncs.h>
    31.8 +#include <glib.h>
    31.9  #include "pvr2/glutil.h"
   31.10  
   31.11  gboolean isOpenGLES2()

    32.1 --- a/src/sh4/sh4core.h	Mon Oct 15 21:19:22 2012 +1000
    32.2 +++ b/src/sh4/sh4core.h	Sat Jan 26 14:00:48 2013 +1000
    32.3 @@ -19,7 +19,7 @@
    32.4  #ifndef lxdream_sh4core_H
    32.5  #define lxdream_sh4core_H 1
    32.6  
    32.7 -#include <glib/gtypes.h>
    32.8 +#include <glib.h>
    32.9  #include <stdint.h>
   32.10  #include <stdio.h>
   32.11  #include "mem.h"

    33.1 --- a/src/syscall.h	Mon Oct 15 21:19:22 2012 +1000
    33.2 +++ b/src/syscall.h	Sat Jan 26 14:00:48 2013 +1000
    33.3 @@ -20,7 +20,7 @@
    33.4  #define lxdream_syscall_H 1
    33.5  
    33.6  #include <stdint.h>
    33.7 -#include <glib/gtypes.h>
    33.8 +#include <glib.h>
    33.9  
   33.10  #ifdef __cplusplus
   33.11  extern "C" {

    34.1 --- a/src/test/testlxpaths.c	Mon Oct 15 21:19:22 2012 +1000
    34.2 +++ b/src/test/testlxpaths.c	Sat Jan 26 14:00:48 2013 +1000
    34.3 @@ -19,7 +19,7 @@
    34.4  #include <stdlib.h>
    34.5  #include <stdio.h>
    34.6  #include <string.h>
    34.7 -#include <glib/gmem.h>
    34.8 +#include <glib.h>
    34.9  #include "lxpaths.h"
   34.10  
   34.11  char *lxdream_get_global_config_path_value() { }

    35.1 --- a/src/tools/actparse.c	Mon Oct 15 21:19:22 2012 +1000
    35.2 +++ b/src/tools/actparse.c	Sat Jan 26 14:00:48 2013 +1000
    35.3 @@ -22,7 +22,7 @@
    35.4  #include <string.h>
    35.5  #include <ctype.h>
    35.6  #include <sys/stat.h>
    35.7 -#include <glib/gstrfuncs.h>
    35.8 +#include <glib.h>
    35.9  #include "tools/gendec.h"
   35.10  
   35.11  static int add_action( struct action *actions, struct ruleset *rules, char *operation, const char *file, int line, char *action )

    36.1 --- a/src/tools/gendec.c	Mon Oct 15 21:19:22 2012 +1000
    36.2 +++ b/src/tools/gendec.c	Sat Jan 26 14:00:48 2013 +1000
    36.3 @@ -23,7 +23,7 @@
    36.4  #include <getopt.h>
    36.5  #include <errno.h>
    36.6  #include <ctype.h>
    36.7 -#include <glib/gstrfuncs.h>
    36.8 +#include <glib.h>
    36.9  #include <assert.h>
   36.10  #include "tools/gendec.h"
   36.11  

    37.1 --- a/src/tools/genglsl.c	Mon Oct 15 21:19:22 2012 +1000
    37.2 +++ b/src/tools/genglsl.c	Sat Jan 26 14:00:48 2013 +1000
    37.3 @@ -27,9 +27,7 @@
    37.4  #include <stdlib.h>
    37.5  #include <string.h>
    37.6  #include <getopt.h>
    37.7 -#include <glib/gstrfuncs.h>
    37.8 -#include <glib/gshell.h>
    37.9 -#include <glib/glist.h>
   37.10 +#include <glib.h>
   37.11  #include "../../config.h"
   37.12  
   37.13  #define MAX_LINE 4096

    38.1 --- a/src/tools/genmach.c	Mon Oct 15 21:19:22 2012 +1000
    38.2 +++ b/src/tools/genmach.c	Sat Jan 26 14:00:48 2013 +1000
    38.3 @@ -23,8 +23,7 @@
    38.4  #include <getopt.h>
    38.5  #include <ctype.h>
    38.6  #include <errno.h>
    38.7 -#include <glib/gstrfuncs.h>
    38.8 -#include <glib/glist.h>
    38.9 +#include <glib.h>
   38.10  #include "gettext.h"
   38.11  #include "genmach.h"
   38.12  

    39.1 --- a/src/tools/genmach.h	Mon Oct 15 21:19:22 2012 +1000
    39.2 +++ b/src/tools/genmach.h	Sat Jan 26 14:00:48 2013 +1000
    39.3 @@ -20,7 +20,7 @@
    39.4  #define lxdream_genmmio_H 1
    39.5  
    39.6  #include <stdint.h>
    39.7 -#include <glib/glist.h>
    39.8 +#include <glib.h>
    39.9  
   39.10  #ifdef __cplusplus
   39.11  extern "C" {

    40.1 --- a/src/tools/mdparse.c	Mon Oct 15 21:19:22 2012 +1000
    40.2 +++ b/src/tools/mdparse.c	Sat Jan 26 14:00:48 2013 +1000
    40.3 @@ -25,7 +25,7 @@
    40.4  #include <ctype.h>
    40.5  #include <errno.h>
    40.6  #include <sys/stat.h>
    40.7 -#include <glib/gmem.h>
    40.8 +#include <glib.h>
    40.9  
   40.10  #include "genmach.h"
   40.11  /*

    41.1 --- a/src/tqueue.h	Mon Oct 15 21:19:22 2012 +1000
    41.2 +++ b/src/tqueue.h	Sat Jan 26 14:00:48 2013 +1000
    41.3 @@ -20,7 +20,7 @@
    41.4  #ifndef lxdream_tqueue_H
    41.5  #define lxdream_tqueue_H 1
    41.6  
    41.7 -#include "glib/gtypes.h"
    41.8 +#include <glib.h>
    41.9  
   41.10  #ifdef __cplusplus
   41.11  extern "C" {

    42.1 --- a/src/vmu/vmulist.c	Mon Oct 15 21:19:22 2012 +1000
    42.2 +++ b/src/vmu/vmulist.c	Sat Jan 26 14:00:48 2013 +1000
    42.3 @@ -18,8 +18,7 @@
    42.4  
    42.5  #include <string.h>
    42.6  #include <stdlib.h>
    42.7 -#include <glib/glist.h>
    42.8 -#include <glib/gstrfuncs.h>
    42.9 +#include <glib.h>
   42.10  #include "vmulist.h"
   42.11  #include "config.h"
   42.12  

    43.1 --- a/src/vmu/vmuvol.c	Mon Oct 15 21:19:22 2012 +1000
    43.2 +++ b/src/vmu/vmuvol.c	Sat Jan 26 14:00:48 2013 +1000
    43.3 @@ -16,8 +16,7 @@
    43.4   * GNU General Public License for more details.
    43.5   */
    43.6  
    43.7 -#include <glib/gmem.h>
    43.8 -#include <glib/gstrfuncs.h>
    43.9 +#include <glib.h>
   43.10  #include <string.h>
   43.11  #include <unistd.h>
   43.12  #include <stdio.h>