diff --git a/mbtask/Makefile b/mbtask/Makefile
index 21353f8c..ade4c10d 100644
--- a/mbtask/Makefile
+++ b/mbtask/Makefile
@@ -77,19 +77,19 @@ depend:
 
 # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT
 # Dependencies generated by make depend
-callstat.o: libs.h ../lib/structs.h taskutil.h callstat.h
-nodelist.o: libs.h ../lib/structs.h taskutil.h nodelist.h
-scanout.o: libs.h ../lib/structs.h taskutil.h scanout.h
-taskcomm.o: libs.h ../lib/structs.h taskstat.h taskregs.h taskdisk.h taskinfo.h taskutil.h taskcomm.h
-taskinfo.o: libs.h ../lib/structs.h taskinfo.h
-taskstat.o: libs.h ../lib/structs.h taskstat.h callstat.h outstat.h taskutil.h
-mbtask.o: libs.h ../lib/structs.h ../paths.h signame.h taskstat.h taskutil.h taskregs.h taskcomm.h callstat.h outstat.h nodelist.h ports.h calllist.h ping.h mbtask.h
-outstat.o: libs.h ../lib/structs.h taskutil.h taskstat.h scanout.h nodelist.h callstat.h ports.h outstat.h
-signame.o: signame.h
-taskdisk.o: libs.h ../lib/structs.h taskdisk.h taskutil.h
-taskregs.o: libs.h ../lib/structs.h taskstat.h taskregs.h taskutil.h
-taskutil.o: libs.h ../lib/structs.h signame.h scanout.h taskutil.h
-ports.o: libs.h ../lib/structs.h taskutil.h nodelist.h ports.h
-calllist.o: libs.h ../lib/structs.h taskstat.h taskutil.h callstat.h outstat.h mbtask.h calllist.h
-ping.o: libs.h ../lib/structs.h taskstat.h taskutil.h ping.h
+callstat.o: ../config.h libs.h ../lib/structs.h taskutil.h callstat.h
+nodelist.o: ../config.h libs.h ../lib/structs.h taskutil.h nodelist.h
+scanout.o: ../config.h libs.h ../lib/structs.h taskutil.h scanout.h
+taskcomm.o: ../config.h libs.h ../lib/structs.h taskstat.h taskregs.h taskdisk.h taskinfo.h taskutil.h taskcomm.h
+taskinfo.o: ../config.h libs.h ../lib/structs.h taskinfo.h
+taskstat.o: ../config.h libs.h ../lib/structs.h taskstat.h callstat.h outstat.h taskutil.h
+mbtask.o: ../config.h libs.h ../lib/structs.h ../paths.h signame.h taskstat.h taskutil.h taskregs.h taskcomm.h callstat.h outstat.h nodelist.h ports.h calllist.h ping.h mbtask.h
+outstat.o: ../config.h libs.h ../lib/structs.h taskutil.h taskstat.h scanout.h nodelist.h callstat.h ports.h outstat.h
+signame.o: ../config.h signame.h
+taskdisk.o: ../config.h libs.h ../lib/structs.h taskdisk.h taskutil.h
+taskregs.o: ../config.h libs.h ../lib/structs.h taskstat.h taskregs.h taskutil.h
+taskutil.o: ../config.h libs.h ../lib/structs.h signame.h scanout.h taskutil.h
+ports.o: ../config.h libs.h ../lib/structs.h taskutil.h nodelist.h ports.h
+calllist.o: ../config.h libs.h ../lib/structs.h taskstat.h taskutil.h callstat.h outstat.h mbtask.h calllist.h
+ping.o: ../config.h libs.h ../lib/structs.h taskstat.h taskutil.h ping.h
 # End of generated dependencies
diff --git a/mbtask/calllist.c b/mbtask/calllist.c
index 0baa010c..385d0569 100644
--- a/mbtask/calllist.c
+++ b/mbtask/calllist.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "taskstat.h"
diff --git a/mbtask/callstat.c b/mbtask/callstat.c
index 24ee7ada..929dfcf6 100644
--- a/mbtask/callstat.c
+++ b/mbtask/callstat.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "taskutil.h"
diff --git a/mbtask/libs.h b/mbtask/libs.h
index 7010a1ab..9d1e47da 100644
--- a/mbtask/libs.h
+++ b/mbtask/libs.h
@@ -36,8 +36,6 @@
 #define	SS_BUFSIZE	1024		/* Streams socket buffersize	*/
 
 
-#include "../config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
diff --git a/mbtask/mbtask.c b/mbtask/mbtask.c
index d459a705..9080f553 100644
--- a/mbtask/mbtask.c
+++ b/mbtask/mbtask.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "../paths.h"
diff --git a/mbtask/nodelist.c b/mbtask/nodelist.c
index 0c36b574..22490ddb 100644
--- a/mbtask/nodelist.c
+++ b/mbtask/nodelist.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "taskutil.h"
diff --git a/mbtask/outstat.c b/mbtask/outstat.c
index 1f1d2057..7c63f958 100644
--- a/mbtask/outstat.c
+++ b/mbtask/outstat.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "taskutil.h"
diff --git a/mbtask/ping.c b/mbtask/ping.c
index 251d6d51..0faf2a59 100644
--- a/mbtask/ping.c
+++ b/mbtask/ping.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "taskstat.h"
diff --git a/mbtask/ports.c b/mbtask/ports.c
index d5f1c899..6e6aa5a5 100644
--- a/mbtask/ports.c
+++ b/mbtask/ports.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "taskutil.h"
diff --git a/mbtask/scanout.c b/mbtask/scanout.c
index d2101cf7..103e8698 100644
--- a/mbtask/scanout.c
+++ b/mbtask/scanout.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "taskutil.h"
diff --git a/mbtask/signame.c b/mbtask/signame.c
index c049e1cc..1a93525b 100644
--- a/mbtask/signame.c
+++ b/mbtask/signame.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "signame.h"
 
 
diff --git a/mbtask/taskcomm.c b/mbtask/taskcomm.c
index a4c24d65..3d4cdaeb 100644
--- a/mbtask/taskcomm.c
+++ b/mbtask/taskcomm.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "taskstat.h"
diff --git a/mbtask/taskdisk.c b/mbtask/taskdisk.c
index 644640a4..1d166d41 100644
--- a/mbtask/taskdisk.c
+++ b/mbtask/taskdisk.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "taskdisk.h"
diff --git a/mbtask/taskinfo.c b/mbtask/taskinfo.c
index ff8de314..282f6644 100644
--- a/mbtask/taskinfo.c
+++ b/mbtask/taskinfo.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "taskinfo.h"
diff --git a/mbtask/taskregs.c b/mbtask/taskregs.c
index e81a73f4..a6109a85 100644
--- a/mbtask/taskregs.c
+++ b/mbtask/taskregs.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "taskstat.h"
diff --git a/mbtask/taskstat.c b/mbtask/taskstat.c
index 3a428ca0..3c96c512 100644
--- a/mbtask/taskstat.c
+++ b/mbtask/taskstat.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "taskstat.h"
diff --git a/mbtask/taskutil.c b/mbtask/taskutil.c
index 951ea8f0..9c692637 100644
--- a/mbtask/taskutil.c
+++ b/mbtask/taskutil.c
@@ -28,6 +28,7 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
 #include "../lib/structs.h"
 #include "signame.h"