4 files changed, 5 insertions, 6 deletions

diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index d95a670fe..1272a2fff 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -80,7 +80,6 @@ gnunetinclude_HEADERS = \
   gnunet_strings_lib.h \
   gnunet_testbed_service.h \
   gnunet_testing_lib.h \
-  gnunet_testing_lib-new.h \
   gnunet_time_lib.h \
   gnunet_transport_service.h \
   gnunet_transport_plugin.h \
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 6732d19ea..470069419 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -57,7 +57,7 @@ extern "C"
 /**
  * Version of the API (for entire gnunetutil.so library).
  */
-#define GNUNET_UTIL_VERSION 0x00090400
+#define GNUNET_UTIL_VERSION 0x00090500
 
 /**
  * Named constants for return values.  The following
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index a5bda3754..8e5e9a47c 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -29,7 +29,7 @@
 #define GNUNET_TESTBED_SERVICE_H
 
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/src/include/gnunet_testing_lib-new.h b/src/include/gnunet_testing_lib.h
index 6eac07acb..c34166b2e 100644
--- a/src/include/gnunet_testing_lib-new.h
+++ b/src/include/gnunet_testing_lib.h
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file include/gnunet_testing_lib-new.h
+ * @file include/gnunet_testing_lib.h
  * @brief convenience API for writing testcases for GNUnet;
  *        can start/stop one or more peers on a system;
  *        testing is responsible for managing private keys,
@@ -30,8 +30,8 @@
  * @author Christian Grothoff
  */
 
-#ifndef GNUNET_TESTING_LIB_NEW_H
-#define GNUNET_TESTING_LIB_NEW_H
+#ifndef GNUNET_TESTING_LIB_H
+#define GNUNET_TESTING_LIB_H
 
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"