diff --git a/src/libopensc/aux-data.c b/src/libopensc/aux-data.c
index c81cbf56..3b7c4744 100644
--- a/src/libopensc/aux-data.c
+++ b/src/libopensc/aux-data.c
@@ -27,6 +27,7 @@
 #include <assert.h>
 #include <string.h>
 
+#include "internal.h"
 #include "common/compat_strlcat.h"
 
 #include <libopensc/errors.h>
diff --git a/src/libopensc/aux-data.h b/src/libopensc/aux-data.h
index 20b5ee1d..027fe4c4 100644
--- a/src/libopensc/aux-data.h
+++ b/src/libopensc/aux-data.h
@@ -28,7 +28,6 @@ extern "C" {
 #endif
 
 #include "cardctl.h"
-#include "internal.h"
 #include "errors.h"
 #include "asn1.h"
 #include "types.h"
diff --git a/src/tools/cryptoflex-tool.c b/src/tools/cryptoflex-tool.c
index d9e86745..ed9255e0 100644
--- a/src/tools/cryptoflex-tool.c
+++ b/src/tools/cryptoflex-tool.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 
+#include "libopensc/sc-ossl-compat.h"
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>