Disable includes instead of sysincl-ing them

7 files changed, 16 insertions, 62 deletions

diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml
index 13ab120c2a..438a7b5f54 100644
--- a/build/sysincl/misc.yml
+++ b/build/sysincl/misc.yml
@@ -235,27 +235,11 @@
     - sqltypes.h
     - sqlucode.h
 
-- source_filter: "^contrib/libs/libmemcached"
-  includes:
-    - sasl/sasl.h
-    - sasl/saslutil.h
-
 - source_filter: "^contrib/libs/(apache/apr|httpd|llvm)"
   includes:
     - uuid.h
     - uuid/uuid.h
 
-- source_filter: "^contrib/libs/(kenlm|libxml|re2|sqlite3)"
-  includes:
-    - unicode/ucnv.h
-    - unicode/ucol.h
-    - unicode/uniset.h
-    - unicode/unistr.h
-    - unicode/ustring.h
-    - unicode/utf16.h
-    - unicode/utypes.h
-    - unicode/uversion.h
-
 - source_filter: "^contrib/deprecated/glib"
   includes:
     - configmake.h
@@ -286,25 +270,10 @@
     - ngx_http.h
     - ngx_log.h
 
-- source_filter: "^contrib/libs/leptonica-1.70"
-  includes:
-    - gif_lib.h
-    - webp/decode.h
-    - webp/encode.h
-
 - source_filter: "^contrib/libs/libpcap"
   includes:
     - strerror.h
 
-- source_filter: "^contrib/libs/libxml"
-  includes:
-    - lzma.h
-    - win32config.h
-
-- source_filter: "^contrib/libs/mod_perl2"
-  includes:
-    - config.h
-
 - source_filter: "^contrib/libs/(apache/apr|httpd|openssl)"
   includes:
     - netinet/sctp.h
@@ -314,10 +283,6 @@
     - magic.h
     - xmlparse.h
 
-- source_filter: "^contrib/python/scipy"
-  includes:
-    - matrix.h
-
 - source_filter: "^contrib/python/uWSGI"
   includes:
     - libxml/parser.h
@@ -356,10 +321,6 @@
     - could_not_find_Perl_patchlevel.h
     - patchlevel.h
 
-- source_filter: "^contrib/libs/(freetype|leptonica-1.70|libtheora|zbar)"
-  includes:
-    - png.h
-
 - source_filter: "^(contrib/restricted/boost/boost/mpi|catboost/cuda/cuda_lib/mpi)"
   includes:
     - mpi.h
@@ -425,6 +386,7 @@
 - source_filter: "^contrib/libs/h3"
   includes:
     - alloc.h: contrib/libs/h3/h3lib/include/alloc.h
+
 - source_filter: "^cloud/iam/token_agent/daemon"
   includes:
     - contrib/libs/grpc/include/grpcpp/impl/codegen/server_context_impl.h
@@ -613,10 +575,6 @@
   includes:
     - position.hh
 
-- source_filter: "^contrib/libs/re2/util/pcre.h"
-  includes:
-    - pcre.h
-
 - source_filter: "^contrib/libs/fp16/include/fp16/psimd.h"
   includes:
     - psimd.h
diff --git a/contrib/libs/libxml/config.h b/contrib/libs/libxml/config.h
index 33a3b10f20..306f9edad7 100644
--- a/contrib/libs/libxml/config.h
+++ b/contrib/libs/libxml/config.h
@@ -1,15 +1,11 @@
 #pragma once
 
-#if defined(_MSC_VER)
-#   include "config-win.h"
-#else
-#   include "config-linux.h"
-#endif
-
 #if defined(__arm__) || defined(__ARM__)
 #   include "config-armv7a.h"
-#endif
-
-#if defined(__aarch64__) || defined(_M_ARM64)
+#elif defined(__aarch64__) || defined(_M_ARM64)
 #   include "config-armv8a.h"
+#elif defined(_MSC_VER)
+#   include "config-win.h"
+#else
+#   include "config-linux.h"
 #endif
diff --git a/contrib/libs/libxml/include/libxml/encoding.h b/contrib/libs/libxml/include/libxml/encoding.h
index df8c2ef1f7..d90489456c 100644
--- a/contrib/libs/libxml/include/libxml/encoding.h
+++ b/contrib/libs/libxml/include/libxml/encoding.h
@@ -28,7 +28,7 @@
 #include <iconv.h>
 #endif
 #ifdef LIBXML_ICU_ENABLED
-#include <unicode/ucnv.h>
+#error #include <unicode/ucnv.h>
 #endif
 #ifdef __cplusplus
 extern "C" {
diff --git a/contrib/libs/libxml/libxml.h b/contrib/libs/libxml/libxml.h
index 648de30e64..cd22b12c4f 100644
--- a/contrib/libs/libxml/libxml.h
+++ b/contrib/libs/libxml/libxml.h
@@ -28,7 +28,7 @@
  * This is needed to compile libxml2 for Windows CE.
  * At least I tested it with WinCE 5.0 for Emulator and WinCE 4.2/SH4 target
  */
-#include <win32config.h>
+#error #include <win32config.h>
 #include <libxml/xmlversion.h>
 #else
 /*
diff --git a/contrib/libs/re2/re2/parse.cc b/contrib/libs/re2/re2/parse.cc
index 67a485791a..0a5e4aa1ed 100644
--- a/contrib/libs/re2/re2/parse.cc
+++ b/contrib/libs/re2/re2/parse.cc
@@ -35,9 +35,9 @@
 #include "re2/walker-inl.h"
 
 #if defined(RE2_USE_ICU)
-#include "unicode/uniset.h"
-#include "unicode/unistr.h"
-#include "unicode/utypes.h"
+#error #include "unicode/uniset.h"
+#error #include "unicode/unistr.h"
+#error #include "unicode/utypes.h"
 #endif
 
 namespace re2 {
diff --git a/contrib/libs/re2/util/pcre.h b/contrib/libs/re2/util/pcre.h
index 846f30019e..72c02bf8e1 100644
--- a/contrib/libs/re2/util/pcre.h
+++ b/contrib/libs/re2/util/pcre.h
@@ -164,7 +164,7 @@
 #include "absl/strings/string_view.h"
 
 #ifdef USEPCRE
-#include <pcre.h>
+#error #include <pcre.h>
 namespace re2 {
 const bool UsingPCRE = true;
 }  // namespace re2
diff --git a/contrib/libs/sqlite3/sqlite3.c b/contrib/libs/sqlite3/sqlite3.c
index 5467a37967..45c9d1db7d 100644
--- a/contrib/libs/sqlite3/sqlite3.c
+++ b/contrib/libs/sqlite3/sqlite3.c
@@ -206416,10 +206416,10 @@ SQLITE_API int sqlite3_rtree_init(
  || defined(SQLITE_ENABLE_ICU_COLLATIONS)
 
 /* Include ICU headers */
-#include <unicode/utypes.h>
+#error #include <unicode/utypes.h>
 #error #include <unicode/uregex.h>
-#include <unicode/ustring.h>
-#include <unicode/ucol.h>
+#error #include <unicode/ustring.h>
+#error #include <unicode/ucol.h>
 
 /* #include <assert.h> */
 
@@ -206963,7 +206963,7 @@ SQLITE_API int sqlite3_icu_init(
 #error #include <unicode/ubrk.h>
 /* #include <unicode/ucol.h> */
 /* #include <unicode/ustring.h> */
-#include <unicode/utf16.h>
+#error #include <unicode/utf16.h>
 
 typedef struct IcuTokenizer IcuTokenizer;
 typedef struct IcuCursor IcuCursor;