diff -r f600b0d1fc5d -r 721e468c10f3 bl/bl.h
--- a/bl/bl.h	Fri Jan 27 10:30:16 2012 +0000
+++ b/bl/bl.h	Fri Jan 27 21:40:35 2012 +0000
@@ -1,36 +1,2 @@
-#if HAVE_GLIB
-
-#include <glib.h>
-#define BL_DIR_SEPARATOR G_DIR_SEPARATOR
-#define BL_DIR_SEPARATOR_S G_DIR_SEPARATOR_S
-#define BL_IS_DIR_SEPARATOR(c) G_IS_DIR_SEPARATOR(c)
-#define boolean gboolean
-#define String GString
-#define mem_new0 g_new0
-#define mem_free g_free
-#define str_dup g_strdup
-#define str_ndup g_strndup
-#define path_get_basename g_path_get_basename
-#define file_get_contents(filename,contents,length) \
-  g_file_get_contents(filename,contents,length,NULL)
-#define string_new g_string_new
-#define string_append g_string_append
-#define string_append_len g_string_append_len
-#define string_append_c g_string_append_c
-#define string_free g_string_free
-#define string_set_size g_string_set_size
-
-#else	/* !HAVE_GLIB */
-
-#include <bl/macros.h>
-#include <bl/types.h>
-#include <bl/mem.h>
-#include <bl/fileutils.h>
-#include <bl/strfuncs.h>
-#include <bl/blstring.h>
-#include <bl/utils.h>
-
-#endif	/* HAVE_GLIB */
-
 #include <bl/textfileutils.h>
 #include <bl/spawn.h>