diff --git a/Makefile b/Makefile
index 8912e54b..c45b2f52 100644
--- a/Makefile
+++ b/Makefile
@@ -124,6 +124,7 @@ mostlyclean clean: config/config.mk
 # for packaging.
 distclean: clean
 	rm -f config.log config.status libtool
+	rm -rf test/data/eps test/data/video
 	rm -f *~ *.bak
 	if [ -e bin ]; then rm -rf bin ; fi
 
diff --git a/include/exiv2/http.hpp b/include/exiv2/http.hpp
index 88c0c33b..44316800 100644
--- a/include/exiv2/http.hpp
+++ b/include/exiv2/http.hpp
@@ -5,6 +5,8 @@
 #include <map>
 #include <algorithm>
 
+#include <exiv2/exiv2.hpp>
+
 namespace Exiv2 {
     typedef std::map<std::string,std::string> dict_t;
     typedef dict_t::iterator                  dict_i;
@@ -12,4 +14,9 @@ namespace Exiv2 {
     EXIV2API int http(dict_t& request,dict_t& response,std::string& errors);
 
 }
+
+#if EXV_USE_CURL
+#include <curl/curl.h>
+#endif
+
 #endif
diff --git a/samples/httptest.cpp b/samples/httptest.cpp
index d2764a19..deae7d51 100644
--- a/samples/httptest.cpp
+++ b/samples/httptest.cpp
@@ -9,11 +9,6 @@
 #include <stdlib.h>
 using namespace std;
 
-#if     defined(_MSC_VER)
-#pragma comment(lib, "ws2_32.lib")
-#pragma comment(lib, "wldap32.lib")
-#endif
-
 static int testSyntax(const char* arg)
 {
 	if ( !arg ) {