Index: include/linc/linc-connection.h
--- include/linc/linc-connection.h.orig	2003-04-24 19:34:24.000000000 +0200
+++ include/linc/linc-connection.h	2012-07-13 20:32:52.000000000 +0200
@@ -12,7 +12,8 @@
 #ifndef _LINC_CONNECTION_H_
 #define _LINC_CONNECTION_H_
 
-#include <glib/gmacros.h>
+#include <glib.h>
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
Index: include/linc/linc-protocol.h
--- include/linc/linc-protocol.h.orig	2002-06-12 18:46:39.000000000 +0200
+++ include/linc/linc-protocol.h	2012-07-13 20:31:20.000000000 +0200
@@ -12,7 +12,7 @@
 #ifndef _LINC_PROTOCOL_H_
 #define _LINC_PROTOCOL_H_
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: include/linc/linc-server.h
--- include/linc/linc-server.h.orig	2002-01-23 18:29:03.000000000 +0100
+++ include/linc/linc-server.h	2012-07-13 20:31:56.000000000 +0200
@@ -12,7 +12,7 @@
 #ifndef _LINC_SERVER_H_
 #define _LINC_SERVER_H_
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: include/linc/linc-types.h
--- include/linc/linc-types.h.orig	2002-01-23 18:53:41.000000000 +0100
+++ include/linc/linc-types.h	2012-07-13 20:31:13.000000000 +0200
@@ -12,9 +12,7 @@
 #ifndef _LINC_TYPES_H_
 #define _LINC_TYPES_H_
 
-#include <glib/gmacros.h>
-#include <glib/gthread.h>
-#include <glib-object.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: include/linc/linc.h
--- include/linc/linc.h.orig	2003-04-19 21:50:48.000000000 +0200
+++ include/linc/linc.h	2012-07-13 20:32:38.000000000 +0200
@@ -12,6 +12,7 @@
 #ifndef _LINC_H_
 #define _LINC_H_
 
+#include <glib-object.h>
 #include <linc/linc-config.h>
 #include <linc/linc-types.h>
 #include <linc/linc-protocol.h>
Index: linc.m4
--- linc.m4.orig	2001-03-14 06:12:41.000000000 +0100
+++ linc.m4	2012-07-13 20:30:25.000000000 +0200
@@ -1,4 +1,4 @@
-AC_DEFUN(AM_PATH_LINC,
+AC_DEFUN([AM_PATH_LINC],
 [dnl
 dnl Get the cflags and libs from the linc-config script
 dnl