diff -r -u GNUnet-0.4.3/src/include/textui/keywords.h GNUnet-mod/src/include/textui/keywords.h
--- GNUnet-0.4.3/src/include/textui/keywords.h	Fri Jul 26 15:57:00 2002
+++ GNUnet-mod/src/include/textui/keywords.h	Sun Jul 28 05:35:49 2002
@@ -12,6 +12,7 @@
 
 #ifdef HAVE_EXTRACTOR_H
 #include <extractor.h>
+#define HAVE_LIBEXTRACTOR 1
 #else
 typedef struct EXTRACTOR_Extractor {
 } EXTRACTOR_ExtractorList;
diff -r -u GNUnet-0.4.3/src/textui/insertmulti.c GNUnet-mod/src/textui/insertmulti.c
--- GNUnet-0.4.3/src/textui/insertmulti.c	Fri Jul 26 15:57:21 2002
+++ GNUnet-mod/src/textui/insertmulti.c	Sun Jul 28 05:40:40 2002
@@ -76,7 +76,7 @@
 		       &mimetype,
 		       &keywords,
 		       &num_keywords,
-		       extractors);
+		       getExtractors());
   if (num_keywords <= 0) {
     print("Automatic keyword extraction failed, did not insert file %s.\n",
 	  filename);
@@ -206,7 +206,7 @@
 		     index_content))
       result = -1;
 #ifdef HAVE_LIBEXTRACTOR
-  removeAll(extractors);
+  EXTRACTOR_removeAll(extractors);
 #endif
   doneTCPIO();
   freeConfig();
diff -r -u GNUnet-0.4.3/src/textui/keywords.c GNUnet-mod/src/textui/keywords.c
--- GNUnet-0.4.3/src/textui/keywords.c	Fri Jul 26 14:52:36 2002
+++ GNUnet-mod/src/textui/keywords.c	Sun Jul 28 20:37:49 2002
@@ -85,12 +85,12 @@
   keyList = EXTRACTOR_removeDuplicateKeywords(keyList,
 					      EXTRACTOR_DUPLICATES_REMOVE_UNKNOWN);
   if (*mimetype == NULL) {
-    key = extractLast(EXTRACTOR_MIMETYPE, keyList);
+    key = EXTRACTOR_extractLast(EXTRACTOR_MIMETYPE, keyList);
     if (key != NULL)
       *mimetype = strdup(key);
   }
   if (*description == NULL) {
-    key = extractLast(EXTRACTOR_DESCRIPTION, keyList);
+    key = EXTRACTOR_extractLast(EXTRACTOR_DESCRIPTION, keyList);
     if (key != NULL)    
       *description = strdup(key);
   }