From 37c740d50946e59c5a5767e4b7aee5f34fcab268 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Sun, 18 Sep 2011 18:59:20 -0400
Subject: [PATCH] Don't #include <glib/gslice.h> from gmem.h

It looks like this was done just to help people port from gmem to
gslice, but nothing in this header actually requires gslice.h to be
included.
---
 glib/garray.c           | 1 +
 glib/gbuffer.c          | 2 +-
 glib/gcache.c           | 1 +
 glib/gchecksum.c        | 1 +
 glib/gdataset.c         | 1 +
 glib/gdatetime.c        | 1 +
 glib/gerror.c           | 1 +
 glib/ghash.c            | 1 +
 glib/ghmac.c            | 1 +
 glib/ghook.c            | 1 +
 glib/glist.c            | 1 +
 glib/gmarkup.c          | 1 +
 glib/gmem.c             | 1 +
 glib/gmem.h             | 1 -
 glib/gnode.c            | 2 ++
 glib/gqueue.c           | 1 +
 glib/gsequence.c        | 1 +
 glib/gslist.c           | 2 ++
 glib/gtestutils.c       | 1 +
 glib/gtimezone.c        | 1 +
 glib/gtree.c            | 1 +
 glib/gvariant-parser.c  | 1 +
 glib/gvariant.c         | 1 +
 glib/gvarianttypeinfo.c | 2 +-
 24 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/glib/garray.c b/glib/garray.c
index 07149b0..27bc7e4 100644
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -35,6 +35,7 @@
 
 #include "garray.h"
 
+#include "gslice.h"
 #include "gmem.h"
 #include "gthread.h"
 #include "gmessages.h"
diff --git a/glib/gbuffer.c b/glib/gbuffer.c
index d4dc21b..70de15b 100644
--- a/glib/gbuffer.c
+++ b/glib/gbuffer.c
@@ -25,9 +25,9 @@
 
 #include <glib/gstrfuncs.h>
 #include <glib/gatomic.h>
+#include <glib/gslice.h>
 #include <glib/gmem.h>
 
-
 typedef struct
 {
   GBuffer buffer;
diff --git a/glib/gcache.c b/glib/gcache.c
index 9c51334..e155bb7 100644
--- a/glib/gcache.c
+++ b/glib/gcache.c
@@ -32,6 +32,7 @@
 
 #include "gcache.h"
 
+#include "gslice.h"
 #include "ghash.h"
 #include "gtestutils.h"
 
diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index 620def2..f7844f2 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -24,6 +24,7 @@
 
 #include "gchecksum.h"
 
+#include "gslice.h"
 #include "gmem.h"
 #include "gstrfuncs.h"
 #include "gtestutils.h"
diff --git a/glib/gdataset.c b/glib/gdataset.c
index ce6d1b7..554c6c5 100644
--- a/glib/gdataset.c
+++ b/glib/gdataset.c
@@ -37,6 +37,7 @@
 #include "gdataset.h"
 #include "gbitlock.h"
 
+#include "gslice.h"
 #include "gdatasetprivate.h"
 #include "ghash.h"
 #include "gquark.h"
diff --git a/glib/gdatetime.c b/glib/gdatetime.c
index 3a3557c..65c4033 100644
--- a/glib/gdatetime.c
+++ b/glib/gdatetime.c
@@ -60,6 +60,7 @@
 
 #include "gdatetime.h"
 
+#include "gslice.h"
 #include "gatomic.h"
 #include "gfileutils.h"
 #include "ghash.h"
diff --git a/glib/gerror.c b/glib/gerror.c
index 015d709..6217aa2 100644
--- a/glib/gerror.c
+++ b/glib/gerror.c
@@ -352,6 +352,7 @@
 
 #include "gerror.h"
 
+#include "gslice.h"
 #include "gstrfuncs.h"
 #include "gtestutils.h"
 
diff --git a/glib/ghash.c b/glib/ghash.c
index 5cc52f1..6b0b58f 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -37,6 +37,7 @@
 #include "gstrfuncs.h"
 #include "gatomic.h"
 #include "gtestutils.h"
+#include "gslice.h"
 
 
 /**
diff --git a/glib/ghmac.c b/glib/ghmac.c
index 20e8fcd..ef26177 100644
--- a/glib/ghmac.c
+++ b/glib/ghmac.c
@@ -28,6 +28,7 @@
 
 #include "glib/galloca.h"
 #include "gatomic.h"
+#include "gslice.h"
 #include "gmem.h"
 #include "gstrfuncs.h"
 #include "gtestutils.h"
diff --git a/glib/ghook.c b/glib/ghook.c
index 1406b58..6ef03f3 100644
--- a/glib/ghook.c
+++ b/glib/ghook.c
@@ -36,6 +36,7 @@
 #include "ghook.h"
 
 #include "gtestutils.h"
+#include "gslice.h"
 
 
 /* --- functions --- */
diff --git a/glib/glist.c b/glib/glist.c
index 33db0b7..f75e2af 100644
--- a/glib/glist.c
+++ b/glib/glist.c
@@ -31,6 +31,7 @@
 #include "config.h"
 
 #include "glist.h"
+#include "gslice.h"
 
 #include "gtestutils.h"
 
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index b588d91..a71d044 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -29,6 +29,7 @@
 
 #include "gmarkup.h"
 
+#include "gslice.h"
 #include "galloca.h"
 #include "gstrfuncs.h"
 #include "gstring.h"
diff --git a/glib/gmem.c b/glib/gmem.c
index a79684f..1553ed7 100644
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <signal.h>
 
+#include "gslice.h"
 #include "gbacktrace.h"
 #include "gtestutils.h"
 #include "gthread.h"
diff --git a/glib/gmem.h b/glib/gmem.h
index 8f57d34..5927f92 100644
--- a/glib/gmem.h
+++ b/glib/gmem.h
@@ -31,7 +31,6 @@
 #ifndef __G_MEM_H__
 #define __G_MEM_H__
 
-#include <glib/gslice.h>
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gnode.c b/glib/gnode.c
index b9cea62..9fef8f7 100644
--- a/glib/gnode.c
+++ b/glib/gnode.c
@@ -35,6 +35,8 @@
 
 #include "gnode.h"
 
+#include "gslice.h"
+
 #include "gtestutils.h"
 
 /**
diff --git a/glib/gqueue.c b/glib/gqueue.c
index e6bf411..8d01b86 100644
--- a/glib/gqueue.c
+++ b/glib/gqueue.c
@@ -54,6 +54,7 @@
 #include "gqueue.h"
 
 #include "gtestutils.h"
+#include "gslice.h"
 
 /**
  * g_queue_new:
diff --git a/glib/gsequence.c b/glib/gsequence.c
index 5631be3..04e867b 100644
--- a/glib/gsequence.c
+++ b/glib/gsequence.c
@@ -24,6 +24,7 @@
 
 #include "gmem.h"
 #include "gtestutils.h"
+#include "gslice.h"
 /**
  * SECTION:sequence
  * @title: Sequences
diff --git a/glib/gslist.c b/glib/gslist.c
index 6f86675..6a11669 100644
--- a/glib/gslist.c
+++ b/glib/gslist.c
@@ -31,7 +31,9 @@
 #include "config.h"
 
 #include "gslist.h"
+
 #include "gtestutils.h"
+#include "gslice.h"
 
 /**
  * SECTION:linked_lists_single
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index 37933de..1abd9df 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -48,6 +48,7 @@
 #include "grand.h"
 #include "gstrfuncs.h"
 #include "gtimer.h"
+#include "gslice.h"
 
 
 /* Global variable for storing assertion messages; this is the counterpart to
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
index 780a388..84dad84 100644
--- a/glib/gtimezone.c
+++ b/glib/gtimezone.c
@@ -34,6 +34,7 @@
 #include "ghash.h"
 #include "gthread.h"
 #include "gbufferprivate.h"
+#include "gslice.h"
 
 /**
  * SECTION:timezone
diff --git a/glib/gtree.c b/glib/gtree.c
index 60ba2cf..9bd9fa8 100644
--- a/glib/gtree.c
+++ b/glib/gtree.c
@@ -34,6 +34,7 @@
 
 #include "gatomic.h"
 #include "gtestutils.h"
+#include "gslice.h"
 
 /**
  * SECTION:trees-binary
diff --git a/glib/gvariant-parser.c b/glib/gvariant-parser.c
index ad21a6f..9f9c34c 100644
--- a/glib/gvariant-parser.c
+++ b/glib/gvariant-parser.c
@@ -32,6 +32,7 @@
 #include "gtestutils.h"
 #include "gvariant.h"
 #include "gvarianttype.h"
+#include "gslice.h"
 
 /*
  * two-pass algorithm
diff --git a/glib/gvariant.c b/glib/gvariant.c
index db6765c..571d29c 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -29,6 +29,7 @@
 #include <glib/gvariant-core.h>
 #include <glib/gtestutils.h>
 #include <glib/gstrfuncs.h>
+#include <glib/gslice.h>
 #include <glib/ghash.h>
 #include <glib/gmem.h>
 
diff --git a/glib/gvarianttypeinfo.c b/glib/gvarianttypeinfo.c
index 820d901..7252459 100644
--- a/glib/gvarianttypeinfo.c
+++ b/glib/gvarianttypeinfo.c
@@ -26,9 +26,9 @@
 
 #include <glib/gtestutils.h>
 #include <glib/gthread.h>
+#include <glib/gslice.h>
 #include <glib/ghash.h>
 
-
 /* < private >
  * GVariantTypeInfo:
  *
-- 
2.7.4