5 files changed, 14 insertions, 6 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 91d25a274..ff4f2328c 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -124,5 +124,5 @@ test_ats_api_reset_backoff_LDADD = \
 
 EXTRA_DIST = \
   ats.h \
-  test_ats_api.conf 
+  test_ats_api.conf
 
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index ecf574e20..956595f43 100644
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -582,7 +582,7 @@ static char *my_short_id;
 /**
  * Transmit handle to the plugin.
  */
-static struct GNUNET_CONNECTION_TransmitHandle *plugin_transmit_handle;
+static struct GNUNET_SERVER_TransmitHandle *plugin_transmit_handle;
 
 /**
  * Head of DLL for client messages
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 5614ebe36..ec4a3d2ca 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -205,7 +205,7 @@ gnunet_gns_DEPENDENCIES = \
   libgnunetgns.la
 
 gnunet_gns_proxy_SOURCES = \
- gnunet-gns-proxy.c
+ gnunet-gns-proxy.c gns_proxy_proto.h 
 gnunet_gns_proxy_LDADD = -lmicrohttpd \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -215,8 +215,8 @@ gnunet_gns_proxy_DEPENDENCIES = \
 
 gnunet_service_gns_SOURCES = \
  gnunet-service-gns.c \
- gnunet-service-gns_resolver.c \
- gnunet-service-gns_interceptor.c
+ gnunet-service-gns_resolver.c gnunet-service-gns_resolver.h \
+ gnunet-service-gns_interceptor.c gnunet-service-gns_interceptor.h 
 gnunet_service_gns_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -286,4 +286,7 @@ endif
 endif
 
 EXTRA_DIST = \
-  test_gns_simple_lookup.conf
+  test_gns_defaults.conf \
+  test_gns_simple_lookup.conf \
+  test_gns_dht_default.conf
+
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 582ef5629..34a879fd9 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -51,6 +51,7 @@ gnunetinclude_HEADERS = \
   gnunet_hello_lib.h \
   gnunet_helper_lib.h \
   gnunet_load_lib.h \
+  gnunet_lockmanager_service.h \
   gnunet_mesh_service.h \
   gnunet_mysql_lib.h \
   gnunet_namestore_plugin.h \
@@ -67,6 +68,7 @@ gnunetinclude_HEADERS = \
   gnunet_protocols.h \
   gnunet_pseudonym_lib.h \
   gnunet_resolver_service.h \
+  gnunet_regex_lib.h \
   gnunet_scheduler_lib.h \
   gnunet_server_lib.h \
   gnunet_service_lib.h \
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index f9998642d..fb69e289b 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -125,6 +125,7 @@ EXTRA_DIST = \
    gnunet_pyexpect.py.in \
    test_integration_connection_values_tcp.py.in \
    test_integration_connection_values_tcp_udp.py.in \
+   test_integration_connection_values_tcp_udp_http.py.in \
    test_integration_bootstrap_and_connect.py.in \
    test_integration_bootstrap_and_connect_and_disconnect.py.in \
    test_integration_bootstrap_and_connect_and_disconnect_nat.py.in \
@@ -144,6 +145,8 @@ EXTRA_DIST = \
    confs/c_no_nat_client_http_2.conf\
    confs/c_no_nat_client_http.conf \
    confs/c_no_nat_client_http_2.conf \
+   confs/c_no_nat_client_unix.conf \
+   confs/c_no_nat_client_unix_2.conf \
    test_connection_stability.conf \
    hostkeys/0000-hostkey \
    hostkeys/0001-hostkey \