2 files changed, 2 insertions, 6 deletions

diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 744c3f208..8ce8375e7 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -25,11 +25,8 @@
  */
 #include "platform.h"
 #include "gnunet_arm_service.h"
-#include "gnunet_client_lib.h"
 #include "gnunet_constants.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
 
 /**
  * Timeout for stopping services.  Long to give some services a real chance.
diff --git a/src/template/gnunet-template.c b/src/template/gnunet-template.c
index 3020a73be..0bbbc558f 100644
--- a/src/template/gnunet-template.c
+++ b/src/template/gnunet-template.c
@@ -24,8 +24,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_program_lib.h"
+#include "gnunet_util_lib.h"
 /* #include "gnunet_template_service.h" */
 
 /**