Build fixes for the fall-out of the inclusion changes

[platform/upstream/glib.git] / glib / giochannel.c

diff --git a/glib/giochannel.c b/glib/giochannel.c
index 358bac6..fb7fd0a 100644 (file)
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -42,13 +42,12 @@
 
 #undef G_DISABLE_DEPRECATED
 
-#include "glib.h"
-
 #include "giochannel.h"
 
+#include "gstrfuncs.h"
+#include "gtestutils.h"
 #include "glibintl.h"
 
-#include "galias.h"
 
 /**
  * SECTION: iochannels
@@ -56,9 +55,8 @@
  * @short_description: portable support for using files, pipes and
  *                     sockets
  * @see_also: <para> <variablelist> <varlistentry>
- *            <term>gtk_input_add_full(), gtk_input_remove(),
- *            gdk_input_add(), gdk_input_add_full(),
- *            gdk_input_remove()</term> <listitem><para> Convenience
+ *            <term>g_io_add_watch(), g_io_add_watch_full(),
+ *            g_source_remove()</term> <listitem><para> Convenience
  *            functions for creating #GIOChannel instances and adding
  *            them to the <link linkend="glib-The-Main-Event-Loop">main
  *            event loop</link>. </para></listitem> </varlistentry>
@@ -2580,6 +2578,3 @@ g_io_channel_error_quark (void)
 {
   return g_quark_from_static_string ("g-io-channel-error-quark");
 }
-
-#define __G_IOCHANNEL_C__
-#include "galiasdef.c"