diff --git a/.gitignore b/.gitignore
index 39df143..f97b7e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 po/*.gmo
-po/.intltool-merge-cache
+po/.intltool-merge-cache*
 *Makefile
 *Makefile.in
 po/Makefile.in.in
diff --git a/configure.ac.in b/configure.ac.in
index 30d7bbd..7753fe0 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -71,6 +71,7 @@ dnl *** Check for required packages ***
 dnl ***********************************
 XDT_CHECK_LIBX11_REQUIRE()
 XDT_CHECK_PACKAGE([LIBXMU], [xmu], [1.1.2])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.50.0])
 XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0])
 XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.5.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.14.0])
diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index afbed2d..752d41c 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -16,6 +16,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <err.h>
 #include <sys/types.h>
diff --git a/src/task-manager-freebsd.c b/src/task-manager-freebsd.c
index 1fd19f2..4920c2c 100644
--- a/src/task-manager-freebsd.c
+++ b/src/task-manager-freebsd.c
@@ -9,6 +9,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <kvm.h>
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/src/task-manager-linux.c b/src/task-manager-linux.c
index a924fa3..d85663e 100644
--- a/src/task-manager-linux.c
+++ b/src/task-manager-linux.c
@@ -8,6 +8,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/task-manager-skel.c b/src/task-manager-skel.c
index d615c3e..ed32aef 100644
--- a/src/task-manager-skel.c
+++ b/src/task-manager-skel.c
@@ -15,6 +15,10 @@
 #include <string.h>
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 
 #include "task-manager.h"
diff --git a/src/task-manager-solaris.c b/src/task-manager-solaris.c
index d02cd86..76c96d9 100644
--- a/src/task-manager-solaris.c
+++ b/src/task-manager-solaris.c
@@ -8,6 +8,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <kstat.h>
 #include <sys/types.h>
 #include <sys/stat.h>