diff --git a/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/curlmulti.c b/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/curlmulti.c
index 526a4db..83b9141 100644
--- a/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/curlmulti.c
+++ b/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/curlmulti.c
@@ -17,7 +17,11 @@
 #endif
 
 #include <curl/curl.h>
-#include <curl/types.h>
+
+#ifdef HAVE_CURLTYPES_H
+# include <curl/types.h>
+#endif
+
 #include <curl/easy.h>
 #include <curl/multi.h>
 
diff --git a/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/curltransaction.c b/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/curltransaction.c
index 630f318..e29b33a 100644
--- a/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/curltransaction.c
+++ b/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/curltransaction.c
@@ -15,7 +15,11 @@
 #include "version.h"
 
 #include <curl/curl.h>
-#include <curl/types.h>
+
+#ifdef HAVE_CURLTYPES_H
+# include <curl/types.h>
+#endif
+
 #include <curl/easy.h>
 
 #include "curlversion.h"
diff --git a/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/xmlrpc_curl_transport.c b/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/xmlrpc_curl_transport.c
index 526381d..8bd7f3f 100644
--- a/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/xmlrpc_curl_transport.c
+++ b/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/xmlrpc_curl_transport.c
@@ -83,7 +83,11 @@
 #include "xmlrpc-c/time_int.h"
 
 #include <curl/curl.h>
-#include <curl/types.h>
+
+#ifdef HAVE_CURLTYPES_H
+# include <curl/types.h>
+#endif
+
 #include <curl/easy.h>
 #include <curl/multi.h>
 
diff --git a/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/util/include/pthreadx.h b/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/util/include/pthreadx.h
index 3ec8f2a..a1bb669 100644
--- a/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/util/include/pthreadx.h
+++ b/ede-bug-tools/ede-bug-report/xmlrpc-c/deps/util/include/pthreadx.h
@@ -27,8 +27,10 @@
 #define PTHREADX_H_INCLUDED
 
 #ifndef WIN32
+# ifndef _REENTRANT   /* gcc warns since is already defined by default */
 #  define _REENTRANT
-#  include <pthread.h>
+# endif
+# include <pthread.h>
 #elif defined (WIN32)
 #include <windows.h>