diff --git a/src/factory/HttpTaskImpl.cc b/src/factory/HttpTaskImpl.cc
index ba852f50..719447a1 100644
--- a/src/factory/HttpTaskImpl.cc
+++ b/src/factory/HttpTaskImpl.cc
@@ -23,8 +23,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <string>
-#include <openssl/bio.h>
 #include <openssl/ssl.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
 #include "WFTaskError.h"
 #include "WFTaskFactory.h"
 #include "StringUtil.h"
diff --git a/src/manager/WFGlobal.cc b/src/manager/WFGlobal.cc
index 36b28b65..dc006edf 100644
--- a/src/manager/WFGlobal.cc
+++ b/src/manager/WFGlobal.cc
@@ -30,10 +30,12 @@
 #include <mutex>
 #include <condition_variable>
 #include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/engine.h>
-#include <openssl/conf.h>
-#include <openssl/crypto.h>
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+# include <openssl/err.h>
+# include <openssl/engine.h>
+# include <openssl/conf.h>
+# include <openssl/crypto.h>
+#endif
 #include "CommScheduler.h"
 #include "Executor.h"
 #include "WFResourcePool.h"