diff --git a/include/common/openssl-compat.h b/include/haproxy/openssl-compat.h
similarity index 98%
rename from include/common/openssl-compat.h
rename to include/haproxy/openssl-compat.h
index 25b1edec5..34fe6cb76 100644
--- a/include/common/openssl-compat.h
+++ b/include/haproxy/openssl-compat.h
@@ -1,5 +1,5 @@
-#ifndef _COMMON_OPENSSL_COMPAT_H
-#define _COMMON_OPENSSL_COMPAT_H
+#ifndef _HAPROXY_OPENSSL_COMPAT_H
+#define _HAPROXY_OPENSSL_COMPAT_H
 #ifdef USE_OPENSSL
 
 #include <openssl/bn.h>
@@ -379,4 +379,4 @@ static inline void SSL_CTX_up_ref(SSL_CTX *ctx)
 #endif
 
 #endif /* USE_OPENSSL */
-#endif /* _COMMON_OPENSSL_COMPAT_H */
+#endif /* _HAPROXY_OPENSSL_COMPAT_H */
diff --git a/include/proto/ssl_sock.h b/include/proto/ssl_sock.h
index 101d86810..696651213 100644
--- a/include/proto/ssl_sock.h
+++ b/include/proto/ssl_sock.h
@@ -23,7 +23,7 @@
 #define _PROTO_SSL_SOCK_H
 #ifdef USE_OPENSSL
 
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 
 #include <types/connection.h>
 #include <types/listener.h>
diff --git a/include/types/listener.h b/include/types/listener.h
index cbd4bab17..7374dc8f8 100644
--- a/include/types/listener.h
+++ b/include/types/listener.h
@@ -27,7 +27,7 @@
 
 #ifdef USE_OPENSSL
 #include <haproxy/api-t.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 #endif
 
 #include <common/mini-clist.h>
diff --git a/include/types/server.h b/include/types/server.h
index 70a6e82ac..c8e5bb69b 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -28,7 +28,7 @@
 #include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 #include <common/hathreads.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 
 #include <import/eb32tree.h>
 
diff --git a/include/types/ssl_ckch.h b/include/types/ssl_ckch.h
index db59bb7ee..a63ec1d1e 100644
--- a/include/types/ssl_ckch.h
+++ b/include/types/ssl_ckch.h
@@ -34,7 +34,7 @@
 #ifdef USE_OPENSSL
 
 #include <common/mini-clist.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 
 /* This is used to preload the certificate, private key
  * and Cert Chain of a file passed in via the crt
diff --git a/include/types/ssl_sock.h b/include/types/ssl_sock.h
index aed6e6ce8..be58aa8c2 100644
--- a/include/types/ssl_sock.h
+++ b/include/types/ssl_sock.h
@@ -34,7 +34,7 @@
 #include <common/buffer.h>
 #include <common/hathreads.h>
 #include <common/mini-clist.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 
 /* ***** READ THIS before adding code here! *****
  *
diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c
index 3d1f676d1..c93c51a47 100644
--- a/src/cfgparse-ssl.c
+++ b/src/cfgparse-ssl.c
@@ -34,7 +34,7 @@
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
 #include <common/cfgparse.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 
 #include <types/ssl_sock.h>
 
diff --git a/src/haproxy.c b/src/haproxy.c
index d2bb0de64..79a28acb6 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -89,7 +89,7 @@
 #include <common/mini-clist.h>
 #include <common/namespace.h>
 #include <common/net_helper.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 #include <common/regex.h>
 #include <common/standard.h>
 #include <common/time.h>
diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index 85703d548..8bc78e1c6 100644
--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@@ -22,7 +22,7 @@
 
 #include <haproxy/api.h>
 #include <common/buffer.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 #include <common/standard.h>
 
 #include <types/sample.h>
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 39e4f22d2..d11eaaf19 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -48,7 +48,7 @@
 #include <common/chunk.h>
 #include <common/debug.h>
 #include <haproxy/errors.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 #include <common/standard.h>
 #include <common/ticks.h>
 #include <common/time.h>
diff --git a/src/ssl_utils.c b/src/ssl_utils.c
index 76c513741..10b71d565 100644
--- a/src/ssl_utils.c
+++ b/src/ssl_utils.c
@@ -13,7 +13,7 @@
 
 
 #include <common/buffer.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 
 #include <proto/ssl_sock.h>