diff -ur samba-tng-old/source/lib/util_tng.c samba-tng-0.5-rc1/source/lib/util_tng.c
--- samba-tng-old/source/lib/util_tng.c	2007-09-04 03:28:08.000000000 +0700
+++ samba-tng-0.5-rc1/source/lib/util_tng.c	2013-10-04 15:34:13.968540805 +0700
@@ -23,8 +23,7 @@
 #include "includes.h"
 #include <errno.h>
 #ifdef HAVE_GLIB
-#include <glib/gmessages.h>
-#include <glib/gstring.h>
+#include <glib.h>
 #endif
 #include "libsamba.h"
 #undef g_return_val_if_fail
diff -ur samba-tng-old/source/lib/util_wunistr.c samba-tng-0.5-rc1/source/lib/util_wunistr.c
--- samba-tng-old/source/lib/util_wunistr.c	2009-07-18 03:38:15.000000000 +0700
+++ samba-tng-0.5-rc1/source/lib/util_wunistr.c	2013-10-04 15:34:54.548519513 +0700
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include <errno.h>
 #ifdef HAVE_GLIB
-#include <glib/gunicode.h>
+#include <glib.h>
 #endif
 #include "tng_misc.h"
 #include "libsamba.h"
diff -ur samba-tng-old/source/printing/print_cups.c samba-tng-0.5-rc1/source/printing/print_cups.c
--- samba-tng-old/source/printing/print_cups.c	2005-02-28 01:09:15.000000000 +0700
+++ samba-tng-0.5-rc1/source/printing/print_cups.c	2013-10-04 16:15:12.487260113 +0700
@@ -22,6 +22,8 @@
 #include "others.h"
 
 #ifdef WITH_CUPS
+#define _IPP_PRIVATE_STRUCTURES 1
+#include <cups/ipp.h>
 #include <cups/cups.h>
 #include <cups/language.h>