diff --git a/.clang-tidy.yml b/.clang-tidy.yml
index 3bbb7cf5ca..63d171c766 100644
--- a/.clang-tidy.yml
+++ b/.clang-tidy.yml
@@ -12,8 +12,12 @@ Checks:
   - -clang-diagnostic-nullability-extension
   - bugprone-suspicious-realloc-usage
   - misc-const-correctness
+  - misc-header-include-cycle
   - portability-*
   - readability-named-parameter
   - readability-redundant-control-flow
   - readability-redundant-preprocessor
   - readability-uppercase-literal-suffix
+
+CheckOptions:
+  misc-header-include-cycle.IgnoredFilesList: 'curl/curl.h;openssl/ssl.h'
diff --git a/lib/functypes.h b/lib/functypes.h
index df3cfd44c8..887c2612ef 100644
--- a/lib/functypes.h
+++ b/lib/functypes.h
@@ -23,8 +23,6 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curl_setup.h"
-
 /* defaults:
 
    ssize_t recv(int, void *, size_t, int);
diff --git a/src/tool_operate.h b/src/tool_operate.h
index 93c87e10e6..7e886f6ef0 100644
--- a/src/tool_operate.h
+++ b/src/tool_operate.h
@@ -27,7 +27,7 @@
 
 #include "tool_cb_hdr.h"
 #include "tool_cb_prg.h"
-#include "tool_sdecls.h"
+#include "tool_cfgable.h"
 
 struct per_transfer {
   /* double linked */
diff --git a/src/tool_sdecls.h b/src/tool_sdecls.h
index 9058233a68..5350b71a37 100644
--- a/src/tool_sdecls.h
+++ b/src/tool_sdecls.h
@@ -128,10 +128,4 @@ typedef enum {
   SANITIZE_ERR_LAST /* never use! */
 } SANITIZEcode;
 
-/*
- * Complete struct declarations which have OperationConfig struct members,
- * just in case this header is directly included in some source file.
- */
-#include "tool_cfgable.h"
-
 #endif /* HEADER_CURL_TOOL_SDECLS_H */