13 files changed, 67 insertions, 70 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.h b/src/conversation/gnunet-conversation-gtk.h
index b45d938c..01b53b40 100644
--- a/src/conversation/gnunet-conversation-gtk.h
+++ b/src/conversation/gnunet-conversation-gtk.h
@@ -28,7 +28,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "gnunet_gtk.h"
-#include <gnunet/gnunet_dnsparser_lib.h>
 #include <gnunet/gnunet_identity_service.h>
 #include <gnunet/gnunet_namestore_service.h>
 #include <gnunet/gnunet_conversation_service.h>
diff --git a/src/conversation/gnunet-conversation-gtk_log.h b/src/conversation/gnunet-conversation-gtk_log.h
index 74e72af9..c94b5817 100644
--- a/src/conversation/gnunet-conversation-gtk_log.h
+++ b/src/conversation/gnunet-conversation-gtk_log.h
@@ -28,7 +28,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "gnunet_gtk.h"
-#include <gnunet/gnunet_dnsparser_lib.h>
 #include <gnunet/gnunet_identity_service.h>
 #include <gnunet/gnunet_namestore_service.h>
 #include <gnunet/gnunet_conversation_service.h>
diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index 6dd28887..9dccd9e7 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -140,7 +140,7 @@ GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls,
  */
 GdkPixbuf *
 GNUNET_FS_GTK_get_thumbnail_from_meta_data (
-  const struct GNUNET_CONTAINER_MetaData *meta)
+  const struct GNUNET_FS_MetaData *meta)
 {
   GdkPixbuf *pixbuf;
   GdkPixbufLoader *loader;
@@ -148,7 +148,7 @@ GNUNET_FS_GTK_get_thumbnail_from_meta_data (
   unsigned char *thumb;
 
   thumb = NULL;
-  ts = GNUNET_CONTAINER_meta_data_get_thumbnail (meta, &thumb);
+  ts = GNUNET_FS_meta_data_get_thumbnail (meta, &thumb);
   if (0 == ts)
     return NULL;
   loader = gdk_pixbuf_loader_new ();
@@ -242,13 +242,13 @@ GNUNET_FS_GTK_mmap_and_scan (const char *filename,
  */
 char *
 GNUNET_FS_GTK_get_description_from_metadata (
-  const struct GNUNET_CONTAINER_MetaData *meta,
+  const struct GNUNET_FS_MetaData *meta,
   int *is_a_dup)
 {
   char *desc;
   char *utf8_desc;
 
-  desc = GNUNET_CONTAINER_meta_data_get_first_by_types (
+  desc = GNUNET_FS_meta_data_get_first_by_types (
     meta,
     EXTRACTOR_METATYPE_PACKAGE_NAME,
     EXTRACTOR_METATYPE_TITLE,
diff --git a/src/fs/gnunet-fs-gtk_common.h b/src/fs/gnunet-fs-gtk_common.h
index 0665e8dc..615c03a4 100644
--- a/src/fs/gnunet-fs-gtk_common.h
+++ b/src/fs/gnunet-fs-gtk_common.h
@@ -41,7 +41,7 @@
  */
 GdkPixbuf *
 GNUNET_FS_GTK_get_thumbnail_from_meta_data (
-  const struct GNUNET_CONTAINER_MetaData *meta);
+  const struct GNUNET_FS_MetaData *meta);
 
 
 /**
@@ -115,7 +115,7 @@ GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format,
  */
 char *
 GNUNET_FS_GTK_get_description_from_metadata (
-  const struct GNUNET_CONTAINER_MetaData *meta,
+  const struct GNUNET_FS_MetaData *meta,
   int *is_a_dup);
 
 
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index d066ea57..a2e77e46 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -594,7 +594,7 @@ get_suggested_filename_anonymity2 (GtkTreeModel *tm,
   char *filename;
   char *tmp;
   int downloaded_anonymity = -1;
-  struct GNUNET_CONTAINER_MetaData *meta;
+  struct GNUNET_FS_MetaData *meta;
   size_t tmplen;
   int finished_chain;
 
@@ -1212,7 +1212,7 @@ check_for_embedded_uri (void *cls,
  * @param cls closure for @a cb
  */
 static void
-find_embedded_uris (const struct GNUNET_CONTAINER_MetaData *meta,
+find_embedded_uris (const struct GNUNET_FS_MetaData *meta,
                     EmbeddedUriCallback cb,
                     void *cls)
 {
@@ -1220,7 +1220,7 @@ find_embedded_uris (const struct GNUNET_CONTAINER_MetaData *meta,
 
   ctx.cb = cb;
   ctx.cls = cls;
-  GNUNET_CONTAINER_meta_data_iterate (meta, &check_for_embedded_uri, &ctx);
+  GNUNET_FS_meta_data_iterate (meta, &check_for_embedded_uri, &ctx);
 }
 
 
@@ -1753,7 +1753,7 @@ remove_results_in_subtree (GtkTreeModel *tm, GtkTreeIter *iter)
       }
       if (NULL != sr->meta)
       {
-        GNUNET_CONTAINER_meta_data_destroy (sr->meta);
+        GNUNET_FS_meta_data_destroy (sr->meta);
         sr->meta = NULL;
       }
       GNUNET_free (sr);
@@ -1828,7 +1828,7 @@ free_search_result (struct SearchResult *sr)
   }
   if (NULL != sr->meta)
   {
-    GNUNET_CONTAINER_meta_data_destroy (sr->meta);
+    GNUNET_FS_meta_data_destroy (sr->meta);
     sr->meta = NULL;
   }
   GNUNET_free (sr);
@@ -1939,7 +1939,7 @@ GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv,
     gtk_image_clear (mctx->preview_image);
 
   if (NULL != sr->meta)
-    GNUNET_CONTAINER_meta_data_iterate (sr->meta,
+    GNUNET_FS_meta_data_iterate (sr->meta,
                                         &GNUNET_FS_GTK_add_meta_data_to_list_store,
                                         mctx->md_liststore);
 }
@@ -2168,9 +2168,9 @@ handle_search_error (struct SearchTab *tab, const char *emsg)
  * @return mime type to use, possibly NULL
  */
 static char *
-get_mimetype_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta)
+get_mimetype_from_metadata (const struct GNUNET_FS_MetaData *meta)
 {
-  return GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
+  return GNUNET_FS_meta_data_get_first_by_types (meta,
                                                         EXTRACTOR_METATYPE_MIMETYPE,
 #if HAVE_EXTRACTOR_H
                                                         EXTRACTOR_METATYPE_FORMAT,
@@ -2192,7 +2192,7 @@ get_mimetype_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta)
  */
 static void
 update_search_result (struct SearchResult *sr,
-                      const struct GNUNET_CONTAINER_MetaData *meta,
+                      const struct GNUNET_FS_MetaData *meta,
                       uint32_t applicability_rank,
                       int32_t availability_rank,
                       uint32_t availability_certainty,
@@ -2229,10 +2229,10 @@ update_search_result (struct SearchResult *sr,
   pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
   if (NULL != sr->meta)
   {
-    GNUNET_CONTAINER_meta_data_destroy (sr->meta);
+    GNUNET_FS_meta_data_destroy (sr->meta);
     sr->meta = NULL;
   }
-  sr->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
+  sr->meta = GNUNET_FS_meta_data_duplicate (meta);
   if (availability_certainty > 0)
     percent_avail =
       50 + (gint) (availability_rank * 50.0 / availability_certainty);
@@ -2359,7 +2359,7 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
                               uint32_t anonymity,
                               GtkTreeRowReference *parent_rr,
                               const struct GNUNET_FS_Uri *uri,
-                              const struct GNUNET_CONTAINER_MetaData *meta,
+                              const struct GNUNET_FS_MetaData *meta,
                               struct GNUNET_FS_SearchResult *result,
                               uint32_t applicability_rank)
 {
@@ -2451,7 +2451,7 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
       ts = downloads_treestore;
   }
   sr->uri = (uri == NULL) ? NULL : GNUNET_FS_uri_dup (uri);
-  sr->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
+  sr->meta = GNUNET_FS_meta_data_duplicate (meta);
   gtk_tree_store_insert_with_values (ts,
                                      &iter,
                                      pitr,
@@ -2626,7 +2626,7 @@ process_search_result (struct SearchTab *tab,
                        uint32_t anonymity,
                        struct SearchResult *parent,
                        const struct GNUNET_FS_Uri *uri,
-                       const struct GNUNET_CONTAINER_MetaData *meta,
+                       const struct GNUNET_FS_MetaData *meta,
                        struct GNUNET_FS_SearchResult *result,
                        uint32_t applicability_rank)
 {
@@ -2794,7 +2794,7 @@ setup_inner_search (struct GNUNET_FS_SearchContext *sc,
  */
 struct SearchResult *
 GNUNET_GTK_add_to_uri_tab (uint32_t anonymity,
-                           const struct GNUNET_CONTAINER_MetaData *meta,
+                           const struct GNUNET_FS_MetaData *meta,
                            const struct GNUNET_FS_Uri *uri)
 {
   struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
@@ -2977,7 +2977,7 @@ static void
 add_directory_entry (void *cls,
                      const char *filename,
                      const struct GNUNET_FS_Uri *uri,
-                     const struct GNUNET_CONTAINER_MetaData *meta,
+                     const struct GNUNET_FS_MetaData *meta,
                      size_t length,
                      const void *data)
 {
@@ -3285,7 +3285,7 @@ setup_download (struct DownloadEntry *de,
                 struct GNUNET_FS_DownloadContext *dc,
                 const struct GNUNET_FS_Uri *uri,
                 const char *filename,
-                const struct GNUNET_CONTAINER_MetaData *meta,
+                const struct GNUNET_FS_MetaData *meta,
                 uint64_t size,
                 uint64_t completed)
 {
@@ -3399,7 +3399,7 @@ setup_download (struct DownloadEntry *de,
   }
   else
   {
-    struct GNUNET_CONTAINER_MetaData *meta;
+    struct GNUNET_FS_MetaData *meta;
 
     /* get metadata from existing tab, might have a mime type */
     path = gtk_tree_row_reference_get_path (de->sr->rr);
diff --git a/src/fs/gnunet-fs-gtk_event-handler.h b/src/fs/gnunet-fs-gtk_event-handler.h
index 66f34b2c..c903020b 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.h
+++ b/src/fs/gnunet-fs-gtk_event-handler.h
@@ -213,7 +213,7 @@ struct SearchResult
   /**
    * Meta data associated with the result.
    */
-  struct GNUNET_CONTAINER_MetaData *meta;
+  struct GNUNET_FS_MetaData *meta;
 
   /**
    * Where in the tab is this result?
@@ -273,7 +273,7 @@ extern GtkTreeStore *downloads_treestore;
  */
 struct SearchResult *
 GNUNET_GTK_add_to_uri_tab (uint32_t anonymity,
-                           const struct GNUNET_CONTAINER_MetaData *meta,
+                           const struct GNUNET_FS_MetaData *meta,
                            const struct GNUNET_FS_Uri *uri);
 
 
@@ -299,7 +299,7 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
                               uint32_t anonymity,
                               GtkTreeRowReference *parent_rr,
                               const struct GNUNET_FS_Uri *uri,
-                              const struct GNUNET_CONTAINER_MetaData *meta,
+                              const struct GNUNET_FS_MetaData *meta,
                               struct GNUNET_FS_SearchResult *result,
                               uint32_t applicability_rank);
 
diff --git a/src/fs/gnunet-fs-gtk_open-directory.c b/src/fs/gnunet-fs-gtk_open-directory.c
index a83477ec..78c56816 100644
--- a/src/fs/gnunet-fs-gtk_open-directory.c
+++ b/src/fs/gnunet-fs-gtk_open-directory.c
@@ -68,7 +68,7 @@ static void
 add_child (void *cls,
            const char *filename,
            const struct GNUNET_FS_Uri *uri,
-           const struct GNUNET_CONTAINER_MetaData *meta,
+           const struct GNUNET_FS_MetaData *meta,
            size_t length,
            const void *data)
 {
@@ -77,10 +77,10 @@ add_child (void *cls,
   if (NULL == uri)
   {
     /* directory meta data itself, create parent entry */
-    struct GNUNET_CONTAINER_MetaData *dmeta;
+    struct GNUNET_FS_MetaData *dmeta;
 
-    dmeta = GNUNET_CONTAINER_meta_data_duplicate (meta);
-    GNUNET_CONTAINER_meta_data_insert (dmeta,
+    dmeta = GNUNET_FS_meta_data_duplicate (meta);
+    GNUNET_FS_meta_data_insert (dmeta,
                                        "<user>",
                                        EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                        EXTRACTOR_METAFORMAT_UTF8,
@@ -88,7 +88,7 @@ add_child (void *cls,
                                        acc->filename,
                                        strlen (acc->filename) + 1);
     acc->sr = GNUNET_GTK_add_to_uri_tab (acc->anonymity, dmeta, NULL);
-    GNUNET_CONTAINER_meta_data_destroy (dmeta);
+    GNUNET_FS_meta_data_destroy (dmeta);
     return;
   }
   if (NULL == acc->sr)
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index db86cd26..e42cbb7d 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -586,11 +586,11 @@ create_dir_at_iter (struct MainPublishingDialogContext *ctx,
   struct GNUNET_FS_FileInformation *fi;
   GtkTreeRowReference *row_reference;
   GtkTreePath *path;
-  struct GNUNET_CONTAINER_MetaData *meta;
+  struct GNUNET_FS_MetaData *meta;
 
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   GNUNET_FS_meta_data_make_directory (meta);
-  GNUNET_CONTAINER_meta_data_insert (meta,
+  GNUNET_FS_meta_data_insert (meta,
                                      "<gnunet-gtk>",
                                      EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                      EXTRACTOR_METAFORMAT_UTF8,
@@ -611,7 +611,7 @@ create_dir_at_iter (struct MainPublishingDialogContext *ctx,
     meta,
     bo,
     name);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   gtk_tree_store_set (GTK_TREE_STORE (ctx->file_info_treemodel),
                       pos,
                       PUBLISH_MC_FILESIZE,
@@ -1226,7 +1226,7 @@ static int
 free_fi_row_reference (void *cls,
                        struct GNUNET_FS_FileInformation *fi,
                        uint64_t length,
-                       struct GNUNET_CONTAINER_MetaData *meta,
+                       struct GNUNET_FS_MetaData *meta,
                        struct GNUNET_FS_Uri **uri,
                        struct GNUNET_FS_BlockOptions *bo,
                        int *do_index,
@@ -1453,12 +1453,12 @@ add_item (struct AddDirClientContext *adcc,
   {
     /* update meta data mime type (force to be GNUnet-directory) */
     if (NULL != item->meta)
-      GNUNET_CONTAINER_meta_data_delete (item->meta,
+      GNUNET_FS_meta_data_delete (item->meta,
                                          EXTRACTOR_METATYPE_MIMETYPE,
                                          NULL,
                                          0);
     else
-      item->meta = GNUNET_CONTAINER_meta_data_create ();
+      item->meta = GNUNET_FS_meta_data_create ();
     GNUNET_FS_meta_data_make_directory (item->meta);
 
     fi = GNUNET_FS_file_information_create_empty_directory (
@@ -2019,7 +2019,7 @@ static int
 update_treeview_after_edit (void *cls,
                             struct GNUNET_FS_FileInformation *fi,
                             uint64_t length,
-                            struct GNUNET_CONTAINER_MetaData *meta,
+                            struct GNUNET_FS_MetaData *meta,
                             struct GNUNET_FS_Uri **uri,
                             struct GNUNET_FS_BlockOptions *bo,
                             int *do_index,
@@ -2028,7 +2028,7 @@ update_treeview_after_edit (void *cls,
   struct EditPublishContext *epc = cls;
   char *name;
 
-  name = GNUNET_CONTAINER_meta_data_get_by_type (
+  name = GNUNET_FS_meta_data_get_by_type (
     meta,
     EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
   gtk_tree_store_set (GTK_TREE_STORE (epc->tm),
@@ -2232,7 +2232,7 @@ static int
 insert_advertisement (void *cls,
                       struct GNUNET_FS_FileInformation *fi,
                       uint64_t length,
-                      struct GNUNET_CONTAINER_MetaData *meta,
+                      struct GNUNET_FS_MetaData *meta,
                       struct GNUNET_FS_Uri **uri,
                       struct GNUNET_FS_BlockOptions *bo,
                       int *do_index,
@@ -2258,7 +2258,7 @@ insert_advertisement (void *cls,
   if (NULL == sks_uri_string)
     return GNUNET_SYSERR;
 
-  GNUNET_CONTAINER_meta_data_insert (meta,
+  GNUNET_FS_meta_data_insert (meta,
                                      "<gnunet>",
                                      EXTRACTOR_METATYPE_URI,
                                      EXTRACTOR_METAFORMAT_UTF8,
@@ -2416,7 +2416,7 @@ static int
 clear_keywords_in_file_information (void *cls,
                                     struct GNUNET_FS_FileInformation *fi,
                                     uint64_t length,
-                                    struct GNUNET_CONTAINER_MetaData *meta,
+                                    struct GNUNET_FS_MetaData *meta,
                                     struct GNUNET_FS_Uri **uri,
                                     struct GNUNET_FS_BlockOptions *bo,
                                     int *do_index,
@@ -2620,7 +2620,7 @@ static void
 add_updateable_to_ts (void *cls,
                       const char *last_id,
                       const struct GNUNET_FS_Uri *last_uri,
-                      const struct GNUNET_CONTAINER_MetaData *last_meta,
+                      const struct GNUNET_FS_MetaData *last_meta,
                       const char *next_id)
 {
   struct UpdateableContext *uc = cls;
@@ -2660,11 +2660,11 @@ add_updateable_to_ts (void *cls,
     urilen = 0;
 
   mdbuf = NULL;
-  mdsize = GNUNET_CONTAINER_meta_data_serialize (
+  mdsize = GNUNET_FS_meta_data_serialize (
     last_meta,
     &mdbuf,
     64 * 1024,
-    GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL);
+    GNUNET_FS_META_DATA_SERIALIZE_FULL);
   if (0 > mdsize)
     mdsize = 0;
 
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index aff28a5c..f54cecdc 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -236,7 +236,7 @@ struct EditPublicationDialogContext
   /**
    * Briefly used temporary meta data set.
    */
-  struct GNUNET_CONTAINER_MetaData *md;
+  struct GNUNET_FS_MetaData *md;
 
   /**
    * Information about the file being published as seen by the FS-API.
@@ -906,7 +906,7 @@ preserve_meta_items (void *cls,
   }
   if (GNUNET_YES == keep)
     GNUNET_break (GNUNET_OK ==
-                  GNUNET_CONTAINER_meta_data_insert (ctx->md,
+                  GNUNET_FS_meta_data_insert (ctx->md,
                                                      plugin_name,
                                                      type,
                                                      format,
@@ -1002,7 +1002,7 @@ static int
 file_information_update (void *cls,
                          struct GNUNET_FS_FileInformation *fi,
                          uint64_t length,
-                         struct GNUNET_CONTAINER_MetaData *meta,
+                         struct GNUNET_FS_MetaData *meta,
                          struct GNUNET_FS_Uri **uri,
                          struct GNUNET_FS_BlockOptions *bo,
                          int *do_index,
@@ -1048,13 +1048,13 @@ file_information_update (void *cls,
   }
 
   /* update meta data; first, we copy the unchanged values from the original meta data */
-  ctx->md = GNUNET_CONTAINER_meta_data_create ();
-  GNUNET_CONTAINER_meta_data_iterate (meta, &preserve_meta_items, ctx);
+  ctx->md = GNUNET_FS_meta_data_create ();
+  GNUNET_FS_meta_data_iterate (meta, &preserve_meta_items, ctx);
   /* clear original meta data */
-  GNUNET_CONTAINER_meta_data_clear (meta);
+  GNUNET_FS_meta_data_clear (meta);
   /* add all of the 'preserved' values */
-  GNUNET_CONTAINER_meta_data_merge (meta, ctx->md);
-  GNUNET_CONTAINER_meta_data_destroy (ctx->md);
+  GNUNET_FS_meta_data_merge (meta, ctx->md);
+  GNUNET_FS_meta_data_destroy (ctx->md);
   ctx->md = NULL;
   /* now add all of the values from the model; adding will simply do
      nothing for values that are already in the set because they were preserved */
@@ -1078,7 +1078,7 @@ file_information_update (void *cls,
                           -1);
       if (ntype > 0)
       {
-        GNUNET_CONTAINER_meta_data_insert (meta,
+        GNUNET_FS_meta_data_insert (meta,
                                            "<user>",
                                            ntype,
                                            nformat,
@@ -1134,7 +1134,7 @@ file_information_update (void *cls,
         g_object_unref (finfo);
       }
 #endif
-      GNUNET_CONTAINER_meta_data_insert (meta,
+      GNUNET_FS_meta_data_insert (meta,
                                          "<user>",
                                          EXTRACTOR_METATYPE_THUMBNAIL,
                                          EXTRACTOR_METAFORMAT_BINARY,
@@ -1258,7 +1258,7 @@ static int
 file_information_import (void *cls,
                          struct GNUNET_FS_FileInformation *fi,
                          uint64_t length,
-                         struct GNUNET_CONTAINER_MetaData *meta,
+                         struct GNUNET_FS_MetaData *meta,
                          struct GNUNET_FS_Uri **uri,
                          struct GNUNET_FS_BlockOptions *bo,
                          int *do_index,
@@ -1287,7 +1287,7 @@ file_information_import (void *cls,
   /* import meta data */
   if (NULL != meta)
   {
-    GNUNET_CONTAINER_meta_data_iterate (meta,
+    GNUNET_FS_meta_data_iterate (meta,
                                         &GNUNET_FS_GTK_add_meta_data_to_list_store,
                                         ctx->meta_liststore);
     pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
@@ -1299,7 +1299,7 @@ file_information_import (void *cls,
 
   /* Also update window title based on filename */
   gtk_window_set_title (ctx->edit_publication_window, _ ("<unnamed>"));
-  GNUNET_CONTAINER_meta_data_iterate (meta,
+  GNUNET_FS_meta_data_iterate (meta,
                                       &set_window_title_to_filename,
                                       ctx->edit_publication_window);
   return GNUNET_SYSERR; /* only visit top-level item */
diff --git a/src/include/gnunet_gtk.h b/src/include/gnunet_gtk.h
index 4be3138f..a2fdb67e 100644
--- a/src/include/gnunet_gtk.h
+++ b/src/include/gnunet_gtk.h
@@ -35,6 +35,7 @@
 
 #include <gnunet/platform.h>
 #include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_extractor_compat.h>
 #include <gnunet/gnunet_fs_service.h>
 #include <gtk/gtk.h>
 #include <gladeui/glade.h>
diff --git a/src/include/gnunet_gtk_namestore_plugin.h b/src/include/gnunet_gtk_namestore_plugin.h
index ebf4ea87..059cc68c 100644
--- a/src/include/gnunet_gtk_namestore_plugin.h
+++ b/src/include/gnunet_gtk_namestore_plugin.h
@@ -28,7 +28,7 @@
 
 #include "gnunet_gtk.h"
 #include <gnunet/gnunet_namestore_service.h>
-#include <gnunet/gnunet_dnsparser_lib.h>
+#include <gnunet/gnunet_util_lib.h>
 
 
 /**
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index a9d42f91..2981e16f 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -30,7 +30,6 @@
 #include <gnunet/gnunet_gns_service.h>
 #include <gnunet/gnunet_identity_service.h>
 #include <gnunet/gnunet_namestore_service.h>
-#include <gnunet/gnunet_dnsparser_lib.h>
 
 /**
  * Text we use for the 'name' entry for the user to select
@@ -1049,7 +1048,7 @@ edit_dialog_continuation (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
   else
     rd.flags = GNUNET_GNSRECORD_RF_PRIVATE;
   if (edc->n_is_shadow)
-    rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+    rd.flags |= GNUNET_GNSRECORD_RF_SHADOW;
   rd.record_type = edc->record_type;
   rd.expiration_time = edc->n_exp_time;
   if (edc->n_is_relative)
@@ -1691,7 +1690,7 @@ launch_edit_dialog (gint n_type,
     edc->n_is_relative =
       (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION));
     edc->n_is_shadow =
-      (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD));
+      (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_SHADOW));
     edc->n_exp_time = rd_old[off].expiration_time;
     edc->old_record_in_namestore = GNUNET_YES;
   }
@@ -2202,7 +2201,7 @@ gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget,
     if (n_is_relative)
       rd.flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
     if (n_is_shadow)
-      rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+      rd.flags |= GNUNET_GNSRECORD_RF_SHADOW;
     rd.record_type = n_type;
     rd.expiration_time = n_exp_time;
     if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value (n_type,
@@ -2497,8 +2496,8 @@ zone_iteration_proc (void *cls,
     is_public = ((rd[c].flags & GNUNET_GNSRECORD_RF_PRIVATE) !=
                  GNUNET_GNSRECORD_RF_PRIVATE);
     /* Set shadow toggle */
-    is_shadow = ((rd[c].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD) ==
-                 GNUNET_GNSRECORD_RF_SHADOW_RECORD);
+    is_shadow = ((rd[c].flags & GNUNET_GNSRECORD_RF_SHADOW) ==
+                 GNUNET_GNSRECORD_RF_SHADOW);
     /* Expiration time */
     time_is_relative =
       (0 != (rd[c].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION));
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index d1505e80..a6967029 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -27,7 +27,6 @@
 #include "gnunet-setup-options.h"
 #include "gnunet-setup-exit-services.h"
 #include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_tun_lib.h>
 #include <gdk/gdkkeysyms.h>