2 files changed, 3 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index e4d3fa6a1..79cfa2ec2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -727,6 +727,8 @@ fi
 if test $gl_libunistring_hexversion -le 2305; then
  AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])
 fi
+AC_CHECK_HEADERS([unistr.h],,AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed]))
+
 # restore LIBS
 LIBS=$SAVE_LIBS
 
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index 32eb2caa5..03c47c201 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -89,12 +89,10 @@ GNUNET_decompress (const char *input,
                    size_t output_size);
 
 
-#if HAVE_EXTRACTOR_H && HAVE_LIBEXTRACTOR
+#if HAVE_EXTRACTOR_H
 
 #include <extractor.h>
 
-
-
 #else
 
 /* definitions from extractor.h we need for the build */