From f1aad687c03048c9db445b8fec05becf7b703b22 Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Fri, 16 Oct 2026 19:25:06 +0100
Subject: [PATCH 1/2] tree: wrap arginfo in C extern blocks

---
 Zend/zend_attributes_arginfo.h                           | 3 +++
 Zend/zend_builtin_functions_arginfo.h                    | 3 +++
 Zend/zend_closures_arginfo.h                             | 3 +++
 Zend/zend_constants_arginfo.h                            | 3 +++
 Zend/zend_enum_arginfo.h                                 | 3 +++
 Zend/zend_exceptions_arginfo.h                           | 3 +++
 Zend/zend_fibers_arginfo.h                               | 3 +++
 Zend/zend_generators_arginfo.h                           | 3 +++
 Zend/zend_interfaces_arginfo.h                           | 3 +++
 Zend/zend_weakrefs_arginfo.h                             | 3 +++
 build/gen_stub.php                                       | 6 +++++-
 ext/bcmath/bcmath_arginfo.h                              | 3 +++
 ext/bz2/bz2_arginfo.h                                    | 3 +++
 ext/calendar/calendar_arginfo.h                          | 3 +++
 ext/com_dotnet/com_extension_arginfo.h                   | 3 +++
 ext/com_dotnet/com_persist_arginfo.h                     | 3 +++
 ext/ctype/ctype_arginfo.h                                | 3 +++
 ext/curl/curl_arginfo.h                                  | 3 +++
 ext/curl/curl_file_arginfo.h                             | 3 +++
 ext/date/php_date_arginfo.h                              | 3 +++
 ext/date/time_arginfo.h                                  | 3 +++
 ext/dba/dba_arginfo.h                                    | 3 +++
 ext/dl_test/dl_test_arginfo.h                            | 3 +++
 ext/dom/php_dom_arginfo.h                                | 3 +++
 ext/dom/php_dom_decl.h                                   | 2 ++
 ext/enchant/enchant_arginfo.h                            | 3 +++
 ext/exif/exif_arginfo.h                                  | 3 +++
 ext/ffi/ffi_arginfo.h                                    | 3 +++
 ext/fileinfo/fileinfo_arginfo.h                          | 3 +++
 ext/filter/filter_arginfo.h                              | 3 +++
 ext/ftp/ftp_arginfo.h                                    | 3 +++
 ext/gd/gd_arginfo.h                                      | 3 +++
 ext/gettext/gettext_arginfo.h                            | 3 +++
 ext/gmp/gmp_arginfo.h                                    | 3 +++
 ext/hash/hash_arginfo.h                                  | 3 +++
 ext/iconv/iconv_arginfo.h                                | 3 +++
 ext/intl/breakiterator/breakiterator_arginfo.h           | 3 +++
 ext/intl/breakiterator/breakiterator_iterators_arginfo.h | 3 +++
 ext/intl/calendar/calendar_arginfo.h                     | 3 +++
 ext/intl/collator/collator_arginfo.h                     | 3 +++
 ext/intl/common/common_arginfo.h                         | 3 +++
 ext/intl/converter/converter_arginfo.h                   | 3 +++
 ext/intl/dateformat/dateformat_arginfo.h                 | 3 +++
 ext/intl/dateformat/datepatterngenerator_arginfo.h       | 3 +++
 ext/intl/formatter/formatter_arginfo.h                   | 3 +++
 ext/intl/listformatter/listformatter_arginfo.h           | 3 +++
 ext/intl/locale/locale_arginfo.h                         | 3 +++
 ext/intl/msgformat/msgformat_arginfo.h                   | 3 +++
 ext/intl/normalizer/normalizer_arginfo.h                 | 3 +++
 ext/intl/php_intl_arginfo.h                              | 3 +++
 ext/intl/rangeformatter/rangeformatter_arginfo.h         | 3 +++
 ext/intl/resourcebundle/resourcebundle_arginfo.h         | 3 +++
 ext/intl/spoofchecker/spoofchecker_arginfo.h             | 3 +++
 ext/intl/timezone/timezone_arginfo.h                     | 3 +++
 ext/intl/transliterator/transliterator_arginfo.h         | 3 +++
 ext/intl/uchar/uchar_arginfo.h                           | 3 +++
 ext/json/json_arginfo.h                                  | 3 +++
 ext/ldap/ldap_arginfo.h                                  | 3 +++
 ext/libxml/libxml_arginfo.h                              | 3 +++
 ext/mbstring/mbstring_arginfo.h                          | 3 +++
 ext/mysqli/mysqli_arginfo.h                              | 3 +++
 ext/odbc/odbc_arginfo.h                                  | 3 +++
 ext/opcache/opcache_arginfo.h                            | 3 +++
 ext/openssl/openssl_arginfo.h                            | 3 +++
 ext/openssl/openssl_pwhash_arginfo.h                     | 3 +++
 ext/pcntl/pcntl_arginfo.h                                | 3 +++
 ext/pcntl/pcntl_decl.h                                   | 2 ++
 ext/pcre/php_pcre_arginfo.h                              | 3 +++
 ext/pdo/pdo_arginfo.h                                    | 3 +++
 ext/pdo/pdo_dbh_arginfo.h                                | 3 +++
 ext/pdo/pdo_stmt_arginfo.h                               | 3 +++
 ext/pdo_dblib/pdo_dblib_arginfo.h                        | 3 +++
 ext/pdo_firebird/pdo_firebird_arginfo.h                  | 3 +++
 ext/pdo_mysql/pdo_mysql_arginfo.h                        | 3 +++
 ext/pdo_odbc/pdo_odbc_arginfo.h                          | 3 +++
 ext/pdo_pgsql/pdo_pgsql_arginfo.h                        | 3 +++
 ext/pdo_pgsql/pgsql_driver_arginfo.h                     | 3 +++
 ext/pdo_sqlite/pdo_sqlite_arginfo.h                      | 3 +++
 ext/pdo_sqlite/sqlite_driver_arginfo.h                   | 3 +++
 ext/pgsql/pgsql_arginfo.h                                | 3 +++
 ext/phar/phar_object_arginfo.h                           | 3 +++
 ext/posix/posix_arginfo.h                                | 3 +++
 ext/random/random_arginfo.h                              | 3 +++
 ext/random/random_decl.h                                 | 2 ++
 ext/readline/readline_arginfo.h                          | 3 +++
 ext/reflection/php_reflection_arginfo.h                  | 3 +++
 ext/reflection/php_reflection_decl.h                     | 2 ++
 ext/session/session_arginfo.h                            | 3 +++
 ext/shmop/shmop_arginfo.h                                | 3 +++
 ext/simplexml/simplexml_arginfo.h                        | 3 +++
 ext/skeleton/skeleton_arginfo.h                          | 3 +++
 ext/snmp/snmp_arginfo.h                                  | 3 +++
 ext/snmp/snmp_decl.h                                     | 2 ++
 ext/soap/soap_arginfo.h                                  | 3 +++
 ext/sockets/sockets_arginfo.h                            | 3 +++
 ext/sodium/libsodium_arginfo.h                           | 3 +++
 ext/sodium/sodium_pwhash_arginfo.h                       | 3 +++
 ext/spl/php_spl_arginfo.h                                | 3 +++
 ext/spl/spl_array_arginfo.h                              | 3 +++
 ext/spl/spl_directory_arginfo.h                          | 3 +++
 ext/spl/spl_dllist_arginfo.h                             | 3 +++
 ext/spl/spl_exceptions_arginfo.h                         | 3 +++
 ext/spl/spl_fixedarray_arginfo.h                         | 3 +++
 ext/spl/spl_heap_arginfo.h                               | 3 +++
 ext/spl/spl_iterators_arginfo.h                          | 3 +++
 ext/spl/spl_observer_arginfo.h                           | 3 +++
 ext/sqlite3/sqlite3_arginfo.h                            | 3 +++
 ext/standard/basic_functions_arginfo.h                   | 3 +++
 ext/standard/basic_functions_decl.h                      | 2 ++
 ext/standard/dir_arginfo.h                               | 3 +++
 ext/standard/dl_arginfo.h                                | 3 +++
 ext/standard/file_arginfo.h                              | 3 +++
 ext/standard/io_poll_arginfo.h                           | 3 +++
 ext/standard/io_poll_decl.h                              | 2 ++
 ext/standard/password_arginfo.h                          | 3 +++
 ext/standard/user_filters_arginfo.h                      | 3 +++
 ext/sysvmsg/sysvmsg_arginfo.h                            | 3 +++
 ext/sysvsem/sysvsem_arginfo.h                            | 3 +++
 ext/sysvshm/sysvshm_arginfo.h                            | 3 +++
 ext/tidy/tidy_arginfo.h                                  | 3 +++
 ext/tokenizer/tokenizer_arginfo.h                        | 3 +++
 ext/tokenizer/tokenizer_data_arginfo.h                   | 3 +++
 ext/uri/php_uri_arginfo.h                                | 3 +++
 ext/uri/php_uri_decl.h                                   | 2 ++
 ext/xml/xml_arginfo.h                                    | 3 +++
 ext/xmlreader/php_xmlreader_arginfo.h                    | 3 +++
 ext/xmlwriter/php_xmlwriter_arginfo.h                    | 3 +++
 ext/xsl/php_xsl_arginfo.h                                | 3 +++
 ext/zend_test/fiber_arginfo.h                            | 3 +++
 ext/zend_test/iterators_arginfo.h                        | 3 +++
 ext/zend_test/object_handlers_arginfo.h                  | 3 +++
 ext/zend_test/test_arginfo.h                             | 3 +++
 ext/zend_test/test_decl.h                                | 2 ++
 ext/zend_test/test_legacy_arginfo.h                      | 3 +++
 ext/zend_test/tmp_methods_arginfo.h                      | 3 +++
 ext/zip/php_zip_arginfo.h                                | 3 +++
 ext/zlib/zlib_arginfo.h                                  | 3 +++
 main/main_arginfo.h                                      | 3 +++
 main/streams/stream_errors_arginfo.h                     | 3 +++
 main/streams/stream_errors_decl.h                        | 2 ++
 main/streams/userspace_arginfo.h                         | 3 +++
 sapi/apache2handler/php_functions_arginfo.h              | 3 +++
 sapi/cgi/cgi_main_arginfo.h                              | 3 +++
 sapi/cli/php_cli_process_title_arginfo.h                 | 3 +++
 sapi/cli/php_cli_server_arginfo.h                        | 3 +++
 sapi/fpm/fpm/fpm_main_arginfo.h                          | 3 +++
 sapi/litespeed/lsapi_main_arginfo.h                      | 3 +++
 sapi/phpdbg/phpdbg_arginfo.h                             | 3 +++
 148 files changed, 436 insertions(+), 1 deletion(-)

diff --git a/Zend/zend_attributes_arginfo.h b/Zend/zend_attributes_arginfo.h
index 2c4bfc99e1ef..6a3c0a0bec3b 100644
--- a/Zend/zend_attributes_arginfo.h
+++ b/Zend/zend_attributes_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: dc2b1de9f4d91162f0e9ab236272f79019c5b5ab */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Attribute___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "Attribute::TARGET_ALL")
@@ -293,3 +294,5 @@ static zend_class_entry *register_class_DelayedTargetValidation(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/Zend/zend_builtin_functions_arginfo.h b/Zend/zend_builtin_functions_arginfo.h
index 2fba874a8e93..cb1c37afde7b 100644
--- a/Zend/zend_builtin_functions_arginfo.h
+++ b/Zend/zend_builtin_functions_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 5d7145b7bc305bb50b45e75c02740206148223b1 */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_clone, 0, 1, IS_OBJECT, 0)
 	ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
@@ -411,3 +412,5 @@ static zend_class_entry *register_class_stdClass(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/Zend/zend_closures_arginfo.h b/Zend/zend_closures_arginfo.h
index 5bc983a97c2c..ed2df41de6ca 100644
--- a/Zend/zend_closures_arginfo.h
+++ b/Zend/zend_closures_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit zend_closures.stub.php instead.
  * Stub hash: e0626e52adb2d38dad1140c1a28cc7774cc84500 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Closure___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -53,3 +54,5 @@ static zend_class_entry *register_class_Closure(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/Zend/zend_constants_arginfo.h b/Zend/zend_constants_arginfo.h
index b8346610ed59..682480aded35 100644
--- a/Zend/zend_constants_arginfo.h
+++ b/Zend/zend_constants_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 static void register_zend_constants_symbols(int module_number)
 {
@@ -39,3 +40,5 @@ static void register_zend_constants_symbols(int module_number)
 	ZVAL_STR(&attribute_Deprecated_const_E_STRICT_0->args[1].value, attribute_Deprecated_const_E_STRICT_0_arg1_str);
 	attribute_Deprecated_const_E_STRICT_0->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);
 }
+
+END_EXTERN_C()
diff --git a/Zend/zend_enum_arginfo.h b/Zend/zend_enum_arginfo.h
index d86191e9afbb..a703c75a9cac 100644
--- a/Zend/zend_enum_arginfo.h
+++ b/Zend/zend_enum_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit zend_enum.stub.php instead.
  * Stub hash: 7092f1d4ba651f077cff37050899f090f00abf22 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_UnitEnum_cases, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -44,3 +45,5 @@ static zend_class_entry *register_class_BackedEnum(zend_class_entry *class_entry
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/Zend/zend_exceptions_arginfo.h b/Zend/zend_exceptions_arginfo.h
index 4706161a09af..6a9191dc7b74 100644
--- a/Zend/zend_exceptions_arginfo.h
+++ b/Zend/zend_exceptions_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit zend_exceptions.stub.php instead.
  * Stub hash: ba1562ca8fe2fe48c40bc52d10545aa989afd86c */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Throwable_getMessage, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -336,3 +337,5 @@ static zend_class_entry *register_class_RequestParseBodyException(zend_class_ent
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/Zend/zend_fibers_arginfo.h b/Zend/zend_fibers_arginfo.h
index 31af8db130c6..2f8ecbe2dbbb 100644
--- a/Zend/zend_fibers_arginfo.h
+++ b/Zend/zend_fibers_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit zend_fibers.stub.php instead.
  * Stub hash: e82bbc8e81fe98873a9a5697a4b38e63a24379da */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Fiber___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
@@ -89,3 +90,5 @@ static zend_class_entry *register_class_FiberError(zend_class_entry *class_entry
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/Zend/zend_generators_arginfo.h b/Zend/zend_generators_arginfo.h
index 6d8d7989c423..2e47da279c28 100644
--- a/Zend/zend_generators_arginfo.h
+++ b/Zend/zend_generators_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit zend_generators.stub.php instead.
  * Stub hash: d376e984db0db6ccd9356f632f9d7e1382b2afb7 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Generator_rewind, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
@@ -70,3 +71,5 @@ static zend_class_entry *register_class_ClosedGeneratorException(zend_class_entr
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/Zend/zend_interfaces_arginfo.h b/Zend/zend_interfaces_arginfo.h
index 836313e4f41b..9c852ed58853 100644
--- a/Zend/zend_interfaces_arginfo.h
+++ b/Zend/zend_interfaces_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit zend_interfaces.stub.php instead.
  * Stub hash: a9c915c11e5989d8c7cf2d704ada09ca765670c3 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IteratorAggregate_getIterator, 0, 0, Traversable, 0)
 ZEND_END_ARG_INFO()
@@ -199,3 +200,5 @@ static zend_class_entry *register_class_InternalIterator(zend_class_entry *class
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/Zend/zend_weakrefs_arginfo.h b/Zend/zend_weakrefs_arginfo.h
index 90c4d42cf4d3..c589485b641d 100644
--- a/Zend/zend_weakrefs_arginfo.h
+++ b/Zend/zend_weakrefs_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit zend_weakrefs.stub.php instead.
  * Stub hash: d91889851d9732d41e43fffddb6235d033c67534 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_WeakReference___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -81,3 +82,5 @@ static zend_class_entry *register_class_WeakMap(zend_class_entry *class_entry_Ar
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/build/gen_stub.php b/build/gen_stub.php
index edcb58710d67..797099d102d1 100755
--- a/build/gen_stub.php
+++ b/build/gen_stub.php
@@ -4785,7 +4785,9 @@ function (FuncInfo $funcInfo) use (&$generatedFunctionDeclarations) {
                 . "\n"
                 . "#ifndef {$headerName}\n"
                 . "#define {$headerName}\n"
+                . "BEGIN_EXTERN_C()\n"
                 . $declCode . "\n"
+                . "END_EXTERN_C()\n"
                 . "#endif /* {$headerName} */\n";
         }
 
@@ -4795,7 +4797,9 @@ function (FuncInfo $funcInfo) use (&$generatedFunctionDeclarations) {
             . " * Stub hash: $stubHash"
             . ($hasDeclFile ? "\n * Has decl header: yes */\n" : " */\n")
             . ($includeCode !== "" ? "\n" . $includeCode : "")
-            . $code;
+            . "BEGIN_EXTERN_C()\n"
+            . $code . "\n"
+            . "END_EXTERN_C()\n";
 
         return [$code, $declCode];
     }
diff --git a/ext/bcmath/bcmath_arginfo.h b/ext/bcmath/bcmath_arginfo.h
index 02cbd958032d..a5ad0fc23dba 100644
--- a/ext/bcmath/bcmath_arginfo.h
+++ b/ext/bcmath/bcmath_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit bcmath.stub.php instead.
  * Stub hash: 687d6fb392a9b0c1329152cc0f62341a73e427f4 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcadd, 0, 2, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, num1, IS_STRING, 0)
@@ -214,3 +215,5 @@ static zend_class_entry *register_class_BcMath_Number(zend_class_entry *class_en
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/bz2/bz2_arginfo.h b/ext/bz2/bz2_arginfo.h
index 6a71b18a4f7b..9ca708a959cf 100644
--- a/ext/bz2/bz2_arginfo.h
+++ b/ext/bz2/bz2_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit bz2.stub.php instead.
  * Stub hash: c2c8e0fe1e3244c8cadafe60b65b7235c105b3c9 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bzopen, 0, 0, 2)
 	ZEND_ARG_INFO(0, file)
@@ -70,3 +71,5 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(bzdecompress, arginfo_bzdecompress)
 	ZEND_FE_END
 };
+
+END_EXTERN_C()
diff --git a/ext/calendar/calendar_arginfo.h b/ext/calendar/calendar_arginfo.h
index c35913d63e67..14c1646b04cc 100644
--- a/ext/calendar/calendar_arginfo.h
+++ b/ext/calendar/calendar_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: f45116785b01842f56ff923a54f65ab839b3dd61 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_cal_days_in_month, 0, 3, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, calendar, IS_LONG, 0)
@@ -141,3 +142,5 @@ static void register_calendar_symbols(int module_number)
 	REGISTER_LONG_CONSTANT("CAL_JEWISH_ADD_ALAFIM", CAL_JEWISH_ADD_ALAFIM, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CAL_JEWISH_ADD_GERESHAYIM", CAL_JEWISH_ADD_GERESHAYIM, CONST_PERSISTENT);
 }
+
+END_EXTERN_C()
diff --git a/ext/com_dotnet/com_extension_arginfo.h b/ext/com_dotnet/com_extension_arginfo.h
index 805719078124..1e2578d85057 100644
--- a/ext/com_dotnet/com_extension_arginfo.h
+++ b/ext/com_dotnet/com_extension_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 9b2eea541946c291eb002ee98997f3dcad8bdfce */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_variant_set, 0, 2, IS_VOID, 0)
 	ZEND_ARG_OBJ_INFO(0, variant, variant, 0)
@@ -338,3 +339,5 @@ static zend_class_entry *register_class_com_exception(zend_class_entry *class_en
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/com_dotnet/com_persist_arginfo.h b/ext/com_dotnet/com_persist_arginfo.h
index 03e38955ee23..aec3366415a2 100644
--- a/ext/com_dotnet/com_persist_arginfo.h
+++ b/ext/com_dotnet/com_persist_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit com_persist.stub.php instead.
  * Stub hash: d14d30fb232f08da37ba0df0b9186eb8bac5e1a4 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_COMPersistHelper___construct, 0, 0, 0)
 	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, variant, variant, 1, "null")
@@ -60,3 +61,5 @@ static zend_class_entry *register_class_COMPersistHelper(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/ctype/ctype_arginfo.h b/ext/ctype/ctype_arginfo.h
index 2285b4b6f134..7c53feb282d8 100644
--- a/ext/ctype/ctype_arginfo.h
+++ b/ext/ctype/ctype_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit ctype.stub.php instead.
  * Stub hash: 155783e1858a7f24dbc1c3e810d5cffee5468bf7 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ctype_alnum, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, text, IS_MIXED, 0)
@@ -51,3 +52,5 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(ctype_xdigit, arginfo_ctype_xdigit)
 	ZEND_FE_END
 };
+
+END_EXTERN_C()
diff --git a/ext/curl/curl_arginfo.h b/ext/curl/curl_arginfo.h
index c38d581cb3cd..c4ad9eb317a0 100644
--- a/ext/curl/curl_arginfo.h
+++ b/ext/curl/curl_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_close, 0, 1, IS_VOID, 0)
 	ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0)
@@ -1063,3 +1064,5 @@ static zend_class_entry *register_class_CurlSharePersistentHandle(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/curl/curl_file_arginfo.h b/ext/curl/curl_file_arginfo.h
index f855b63688d2..aa534cd76597 100644
--- a/ext/curl/curl_file_arginfo.h
+++ b/ext/curl/curl_file_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit curl_file.stub.php instead.
  * Stub hash: 0d09bd2f3b0a155cef25ca343319ecf470424d71 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_CURLFile___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -104,3 +105,5 @@ static zend_class_entry *register_class_CURLStringFile(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h
index 7dc1061446c5..618ad79f55c2 100644
--- a/ext/date/php_date_arginfo.h
+++ b/ext/date/php_date_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)
@@ -1354,3 +1355,5 @@ static zend_class_entry *register_class_DateMalformedPeriodStringException(zend_
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/date/time_arginfo.h b/ext/date/time_arginfo.h
index bdd4170450f8..83203e225746 100644
--- a/ext/date/time_arginfo.h
+++ b/ext/date/time_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit time.stub.php instead.
  * Stub hash: 71349e499ff03529323bede7eb1e680637e81c85 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Time_Duration___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -135,3 +136,5 @@ static zend_class_entry *register_class_Time_Duration(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/dba/dba_arginfo.h b/ext/dba/dba_arginfo.h
index 1a2f230e669c..69dc51b60571 100644
--- a/ext/dba/dba_arginfo.h
+++ b/ext/dba/dba_arginfo.h
@@ -4,6 +4,7 @@
 #if defined(DBA_LMDB)
 #include "zend_constants.h"
 #endif
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_dba_popen, 0, 2, Dba\\Connection, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
@@ -116,3 +117,5 @@ static zend_class_entry *register_class_Dba_Connection(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/dl_test/dl_test_arginfo.h b/ext/dl_test/dl_test_arginfo.h
index f659696e4e7c..7107489908fa 100644
--- a/ext/dl_test/dl_test_arginfo.h
+++ b/ext/dl_test/dl_test_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: f935fbfb32fd8d960437269566d6bcaa3be7b6b0 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dl_test_test1, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
@@ -98,3 +99,5 @@ static zend_class_entry *register_class_DlTestAliasedClass(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/dom/php_dom_arginfo.h b/ext/dom/php_dom_arginfo.h
index 6a15f911e610..c0988963ca6f 100644
--- a/ext/dom/php_dom_arginfo.h
+++ b/ext/dom/php_dom_arginfo.h
@@ -5,6 +5,7 @@
 #include "zend_attributes.h"
 #include "zend_constants.h"
 #include "zend_enum.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_dom_import_simplexml, 0, 1, DOMAttr|DOMElement, 0)
 	ZEND_ARG_TYPE_INFO(0, node, IS_OBJECT, 0)
@@ -3629,3 +3630,5 @@ static zend_class_entry *register_class_Dom_XPath(void)
 	return class_entry;
 }
 #endif
+
+END_EXTERN_C()
diff --git a/ext/dom/php_dom_decl.h b/ext/dom/php_dom_decl.h
index e42fe5969595..14e3540a3ad2 100644
--- a/ext/dom/php_dom_decl.h
+++ b/ext/dom/php_dom_decl.h
@@ -3,6 +3,7 @@
 
 #ifndef ZEND_PHP_DOM_DECL_8d7713834c924709155ed7acc554c9efc55e96c1_H
 #define ZEND_PHP_DOM_DECL_8d7713834c924709155ed7acc554c9efc55e96c1_H
+BEGIN_EXTERN_C()
 
 typedef enum zend_enum_Dom_AdjacentPosition {
 	ZEND_ENUM_Dom_AdjacentPosition_BeforeBegin = 1,
@@ -11,4 +12,5 @@ typedef enum zend_enum_Dom_AdjacentPosition {
 	ZEND_ENUM_Dom_AdjacentPosition_AfterEnd = 4,
 } zend_enum_Dom_AdjacentPosition;
 
+END_EXTERN_C()
 #endif /* ZEND_PHP_DOM_DECL_8d7713834c924709155ed7acc554c9efc55e96c1_H */
diff --git a/ext/enchant/enchant_arginfo.h b/ext/enchant/enchant_arginfo.h
index d60fe4dde0a1..c38962174150 100644
--- a/ext/enchant/enchant_arginfo.h
+++ b/ext/enchant/enchant_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_enchant_broker_init, 0, 0, EnchantBroker, MAY_BE_FALSE)
 ZEND_END_ARG_INFO()
@@ -235,3 +236,5 @@ static zend_class_entry *register_class_EnchantDictionary(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/exif/exif_arginfo.h b/ext/exif/exif_arginfo.h
index f80f04f0ed2e..eba854efe439 100644
--- a/ext/exif/exif_arginfo.h
+++ b/ext/exif/exif_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 633b2db018fa1453845a854a6361f11f107f4653 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_exif_tagname, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
@@ -42,3 +43,5 @@ static void register_exif_symbols(int module_number)
 {
 	REGISTER_LONG_CONSTANT("EXIF_USE_MBSTRING", USE_MBSTRING, CONST_PERSISTENT);
 }
+
+END_EXTERN_C()
diff --git a/ext/ffi/ffi_arginfo.h b/ext/ffi/ffi_arginfo.h
index a263e0bfb32e..79ee7e0d67a5 100644
--- a/ext/ffi/ffi_arginfo.h
+++ b/ext/ffi/ffi_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit ffi.stub.php instead.
  * Stub hash: d3626f5d39317876fc7d4f240b0758f17f3472c8 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_cdef, 0, 0, FFI, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code, IS_STRING, 0, "\"\"")
@@ -481,3 +482,5 @@ static zend_class_entry *register_class_FFI_ParserException(zend_class_entry *cl
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/fileinfo/fileinfo_arginfo.h b/ext/fileinfo/fileinfo_arginfo.h
index 21b1c452d611..48c45a7f9f7a 100644
--- a/ext/fileinfo/fileinfo_arginfo.h
+++ b/ext/fileinfo/fileinfo_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_finfo_open, 0, 0, finfo, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "FILEINFO_NONE")
@@ -118,3 +119,5 @@ static zend_class_entry *register_class_finfo(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/filter/filter_arginfo.h b/ext/filter/filter_arginfo.h
index 6d9ac902e2b5..d506e8a8d902 100644
--- a/ext/filter/filter_arginfo.h
+++ b/ext/filter/filter_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_has_var, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, input_type, IS_LONG, 0)
@@ -153,3 +154,5 @@ static zend_class_entry *register_class_Filter_FilterFailedException(zend_class_
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/ftp/ftp_arginfo.h b/ext/ftp/ftp_arginfo.h
index 420fc3553ea6..3a98136da59f 100644
--- a/ext/ftp/ftp_arginfo.h
+++ b/ext/ftp/ftp_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ftp_connect, 0, 1, FTP\\Connection, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
@@ -303,3 +304,5 @@ static zend_class_entry *register_class_FTP_Connection(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/gd/gd_arginfo.h b/ext/gd/gd_arginfo.h
index ee28379b30c9..0fc55f25f100 100644
--- a/ext/gd/gd_arginfo.h
+++ b/ext/gd/gd_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gd_info, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -955,3 +956,5 @@ static zend_class_entry *register_class_GdFont(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/gettext/gettext_arginfo.h b/ext/gettext/gettext_arginfo.h
index 8b622a322add..30bbfd8ae381 100644
--- a/ext/gettext/gettext_arginfo.h
+++ b/ext/gettext/gettext_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit gettext.stub.php instead.
  * Stub hash: c675dc9492943bbac106c5906b75c31436964423 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_textdomain, 0, 0, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, domain, IS_STRING, 1, "null")
@@ -100,3 +101,5 @@ static const zend_function_entry ext_functions[] = {
 #endif
 	ZEND_FE_END
 };
+
+END_EXTERN_C()
diff --git a/ext/gmp/gmp_arginfo.h b/ext/gmp/gmp_arginfo.h
index 038ce3890158..b889eb2ce44b 100644
--- a/ext/gmp/gmp_arginfo.h
+++ b/ext/gmp/gmp_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 743a4be1078abfa29294336564126ace8c194cbe */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_init, 0, 1, GMP, 0)
 	ZEND_ARG_TYPE_MASK(0, num, MAY_BE_LONG|MAY_BE_STRING, NULL)
@@ -366,3 +367,5 @@ static zend_class_entry *register_class_GMP(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/hash/hash_arginfo.h b/ext/hash/hash_arginfo.h
index 98cd952cd121..7db7e824aa69 100644
--- a/ext/hash/hash_arginfo.h
+++ b/ext/hash/hash_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_hash, 0, 2, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, algo, IS_STRING, 0)
@@ -246,3 +247,5 @@ static zend_class_entry *register_class_HashContext(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/iconv/iconv_arginfo.h b/ext/iconv/iconv_arginfo.h
index d85eaf1de005..555b8dfde88f 100644
--- a/ext/iconv/iconv_arginfo.h
+++ b/ext/iconv/iconv_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 4367fa431d3e4814e42d9aa514c10cae1d842d8f */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv_strlen, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
@@ -93,3 +94,5 @@ static void register_iconv_symbols(int module_number)
 	REGISTER_LONG_CONSTANT("ICONV_MIME_DECODE_STRICT", PHP_ICONV_MIME_DECODE_STRICT, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("ICONV_MIME_DECODE_CONTINUE_ON_ERROR", PHP_ICONV_MIME_DECODE_CONTINUE_ON_ERROR, CONST_PERSISTENT);
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/breakiterator/breakiterator_arginfo.h b/ext/intl/breakiterator/breakiterator_arginfo.h
index e9a97b5129d2..887894cc5ac1 100644
--- a/ext/intl/breakiterator/breakiterator_arginfo.h
+++ b/ext/intl/breakiterator/breakiterator_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit breakiterator.stub.php instead.
  * Stub hash: 14892bbc6f25c04c109ddbbe140a4b1f575cafd6 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlBreakIterator_createCharacterInstance, 0, 0, IntlBreakIterator, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
@@ -295,3 +296,5 @@ static zend_class_entry *register_class_IntlCodePointBreakIterator(zend_class_en
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/breakiterator/breakiterator_iterators_arginfo.h b/ext/intl/breakiterator/breakiterator_iterators_arginfo.h
index 423c60709d9c..7859d2d56920 100644
--- a/ext/intl/breakiterator/breakiterator_iterators_arginfo.h
+++ b/ext/intl/breakiterator/breakiterator_iterators_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit breakiterator_iterators.stub.php instead.
  * Stub hash: 5dc9ab2cc5862b2082fb9cd5cec909298921b115 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlPartsIterator_getBreakIterator, 0, 0, IntlBreakIterator, 0)
 ZEND_END_ARG_INFO()
@@ -43,3 +44,5 @@ static zend_class_entry *register_class_IntlPartsIterator(zend_class_entry *clas
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/calendar/calendar_arginfo.h b/ext/intl/calendar/calendar_arginfo.h
index 291283309acc..1d51cf7fa01d 100644
--- a/ext/intl/calendar/calendar_arginfo.h
+++ b/ext/intl/calendar/calendar_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit calendar.stub.php instead.
  * Stub hash: 2fc12d1fde65efbec4305f4934a3f4b25282a552 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -573,3 +574,5 @@ static zend_class_entry *register_class_IntlGregorianCalendar(zend_class_entry *
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/collator/collator_arginfo.h b/ext/intl/collator/collator_arginfo.h
index bf8345cd8be0..da832d25e3f9 100644
--- a/ext/intl/collator/collator_arginfo.h
+++ b/ext/intl/collator/collator_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: cbe3c5f4c35d93f90c3e7164bdfc4e2fefc88c83 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -249,3 +250,5 @@ static zend_class_entry *register_class_Collator(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/common/common_arginfo.h b/ext/intl/common/common_arginfo.h
index 2ca89fe96037..b08ddee9eea9 100644
--- a/ext/intl/common/common_arginfo.h
+++ b/ext/intl/common/common_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlIterator_current, 0, 0, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
@@ -195,3 +196,5 @@ static zend_class_entry *register_class_IntlIterator(zend_class_entry *class_ent
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/converter/converter_arginfo.h b/ext/intl/converter/converter_arginfo.h
index d43981abf6ae..fc050f1bec6c 100644
--- a/ext/intl/converter/converter_arginfo.h
+++ b/ext/intl/converter/converter_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit converter.stub.php instead.
  * Stub hash: f351fbf3afd9753fb16c87903c3dbd5e4621c024 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_UConverter___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, destination_encoding, IS_STRING, 1, "null")
@@ -372,3 +373,5 @@ static zend_class_entry *register_class_UConverter(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/dateformat/dateformat_arginfo.h b/ext/intl/dateformat/dateformat_arginfo.h
index 07c546648f48..01e97665645b 100644
--- a/ext/intl/dateformat/dateformat_arginfo.h
+++ b/ext/intl/dateformat/dateformat_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit dateformat.stub.php instead.
  * Stub hash: 13d9fe2cca75fcda5365a589ee318f76fcba3b84 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
@@ -227,3 +228,5 @@ static zend_class_entry *register_class_IntlDateFormatter(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/dateformat/datepatterngenerator_arginfo.h b/ext/intl/dateformat/datepatterngenerator_arginfo.h
index acf6a4695929..16f0f59b7099 100644
--- a/ext/intl/dateformat/datepatterngenerator_arginfo.h
+++ b/ext/intl/dateformat/datepatterngenerator_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit datepatterngenerator.stub.php instead.
  * Stub hash: cea997295023d9f6f6451150bf19867e7dac8c90 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDatePatternGenerator___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
@@ -43,3 +44,5 @@ static zend_class_entry *register_class_IntlDatePatternGenerator(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/formatter/formatter_arginfo.h b/ext/intl/formatter/formatter_arginfo.h
index fb3e3619ad50..852efeb3fb90 100644
--- a/ext/intl/formatter/formatter_arginfo.h
+++ b/ext/intl/formatter/formatter_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: d886941aa76837aed1da08845dbaff9442107203 */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -634,3 +635,5 @@ static zend_class_entry *register_class_NumberFormatter(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/listformatter/listformatter_arginfo.h b/ext/intl/listformatter/listformatter_arginfo.h
index 8be31588d6ba..9b8d165ed562 100644
--- a/ext/intl/listformatter/listformatter_arginfo.h
+++ b/ext/intl/listformatter/listformatter_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit listformatter.stub.php instead.
  * Stub hash: cdbbdb55d1e53f422c5854460c3c6cc3d01360d7 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlListFormatter___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -97,3 +98,5 @@ static zend_class_entry *register_class_IntlListFormatter(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/locale/locale_arginfo.h b/ext/intl/locale/locale_arginfo.h
index a95494580c0f..12a677dfbf7f 100644
--- a/ext/intl/locale/locale_arginfo.h
+++ b/ext/intl/locale/locale_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit locale.stub.php instead.
  * Stub hash: 2f2de79772630fd0a2399b88120bd968bfed1144 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Locale_getDefault, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -211,3 +212,5 @@ static zend_class_entry *register_class_Locale(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/msgformat/msgformat_arginfo.h b/ext/intl/msgformat/msgformat_arginfo.h
index 6f59b06059d7..99201522e630 100644
--- a/ext/intl/msgformat/msgformat_arginfo.h
+++ b/ext/intl/msgformat/msgformat_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit msgformat.stub.php instead.
  * Stub hash: d595f5c582996ebb96ab39df8cb56c4cf6c8dfcf */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -82,3 +83,5 @@ static zend_class_entry *register_class_MessageFormatter(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/normalizer/normalizer_arginfo.h b/ext/intl/normalizer/normalizer_arginfo.h
index 761cf92b8c0a..e0003e9ce36e 100644
--- a/ext/intl/normalizer/normalizer_arginfo.h
+++ b/ext/intl/normalizer/normalizer_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit normalizer.stub.php instead.
  * Stub hash: 908a9587edd132a41100be09c9908e088f3fa055 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Normalizer_normalize, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
@@ -96,3 +97,5 @@ static zend_class_entry *register_class_Normalizer(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/php_intl_arginfo.h b/ext/intl/php_intl_arginfo.h
index a1b95671d275..9d1a860fc293 100644
--- a/ext/intl/php_intl_arginfo.h
+++ b/ext/intl/php_intl_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intlcal_create_instance, 0, 0, IntlCalendar, 1)
 	ZEND_ARG_OBJ_TYPE_MASK(0, timezone, IntlTimeZone|DateTimeZone, MAY_BE_STRING|MAY_BE_NULL, "null")
@@ -1282,3 +1283,5 @@ static zend_class_entry *register_class_IntlException(zend_class_entry *class_en
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/rangeformatter/rangeformatter_arginfo.h b/ext/intl/rangeformatter/rangeformatter_arginfo.h
index a08ffc314c56..1c3009e02cbf 100644
--- a/ext/intl/rangeformatter/rangeformatter_arginfo.h
+++ b/ext/intl/rangeformatter/rangeformatter_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit rangeformatter.stub.php instead.
  * Stub hash: 7029642524e32984e893e1e050a5e0bbf275c416 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlNumberRangeFormatter___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -146,3 +147,5 @@ static zend_class_entry *register_class_IntlNumberRangeFormatter(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/resourcebundle/resourcebundle_arginfo.h b/ext/intl/resourcebundle/resourcebundle_arginfo.h
index 3f82668277ae..9841d2932944 100644
--- a/ext/intl/resourcebundle/resourcebundle_arginfo.h
+++ b/ext/intl/resourcebundle/resourcebundle_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit resourcebundle.stub.php instead.
  * Stub hash: e302e5ca1abcb9b52e3c14abbd38b9e8f1461390 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ResourceBundle___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
@@ -64,3 +65,5 @@ static zend_class_entry *register_class_ResourceBundle(zend_class_entry *class_e
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/spoofchecker/spoofchecker_arginfo.h b/ext/intl/spoofchecker/spoofchecker_arginfo.h
index 236a292767ca..af05fd6f936a 100644
--- a/ext/intl/spoofchecker/spoofchecker_arginfo.h
+++ b/ext/intl/spoofchecker/spoofchecker_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit spoofchecker.stub.php instead.
  * Stub hash: e701a18d8fd0c9bba50ee184e700263bffd882f8 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -220,3 +221,5 @@ static zend_class_entry *register_class_Spoofchecker(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/timezone/timezone_arginfo.h b/ext/intl/timezone/timezone_arginfo.h
index 3b1985e685ee..0cde6bcc1fcd 100644
--- a/ext/intl/timezone/timezone_arginfo.h
+++ b/ext/intl/timezone/timezone_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit timezone.stub.php instead.
  * Stub hash: 22e652c6a05ade0a6fd3119e4742cd260ba27146 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -234,3 +235,5 @@ static zend_class_entry *register_class_IntlTimeZone(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/transliterator/transliterator_arginfo.h b/ext/intl/transliterator/transliterator_arginfo.h
index 42257294c3a4..94675b4b4925 100644
--- a/ext/intl/transliterator/transliterator_arginfo.h
+++ b/ext/intl/transliterator/transliterator_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit transliterator.stub.php instead.
  * Stub hash: 54eab5ebc2589b5f0a22998979c7409da1a9bfb1 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Transliterator___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -86,3 +87,5 @@ static zend_class_entry *register_class_Transliterator(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/intl/uchar/uchar_arginfo.h b/ext/intl/uchar/uchar_arginfo.h
index 7de78a0fd9d8..9198a075e9c0 100644
--- a/ext/intl/uchar/uchar_arginfo.h
+++ b/ext/intl/uchar/uchar_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit uchar.stub.php instead.
  * Stub hash: 58fb5f326ee08cca73977720d3b055b0118d78bb */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_hasBinaryProperty, 0, 2, _IS_BOOL, 1)
 	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
@@ -4309,3 +4310,5 @@ static zend_class_entry *register_class_IntlChar(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/json/json_arginfo.h b/ext/json/json_arginfo.h
index 01ebf40727c3..0eb0fa37ede4 100644
--- a/ext/json/json_arginfo.h
+++ b/ext/json/json_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 0ceb50047401c4b9e878c09cc518eacc274f7fff */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_json_encode, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
@@ -103,3 +104,5 @@ static zend_class_entry *register_class_JsonException(zend_class_entry *class_en
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h
index cea79a70d902..4e4a257fce8a 100644
--- a/ext/ldap/ldap_arginfo.h
+++ b/ext/ldap/ldap_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 #if defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ldap_connect, 0, 0, LDAP\\Connection, MAY_BE_FALSE)
@@ -800,3 +801,5 @@ static zend_class_entry *register_class_LDAP_ResultEntry(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/libxml/libxml_arginfo.h b/ext/libxml/libxml_arginfo.h
index 2d77e2498117..5e9c40ab57e6 100644
--- a/ext/libxml/libxml_arginfo.h
+++ b/ext/libxml/libxml_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_libxml_set_streams_context, 0, 1, IS_VOID, 0)
 	ZEND_ARG_INFO(0, context)
@@ -135,3 +136,5 @@ static zend_class_entry *register_class_LibXMLError(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/mbstring/mbstring_arginfo.h b/ext/mbstring/mbstring_arginfo.h
index 593589b66db1..81b40922f0c2 100644
--- a/ext/mbstring/mbstring_arginfo.h
+++ b/ext/mbstring/mbstring_arginfo.h
@@ -5,6 +5,7 @@
 #include "zend_attributes.h"
 #endif
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_language, 0, 0, MAY_BE_STRING|MAY_BE_BOOL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, language, IS_STRING, 1, "null")
@@ -577,3 +578,5 @@ static void register_mbstring_symbols(int module_number)
 	attribute_Deprecated_const_MB_ONIGURUMA_VERSION_0->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);
 #endif
 }
+
+END_EXTERN_C()
diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
index dac51d7f4959..8c13194ea8a9 100644
--- a/ext/mysqli/mysqli_arginfo.h
+++ b/ext/mysqli/mysqli_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
 	ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
@@ -1681,3 +1682,5 @@ static zend_class_entry *register_class_mysqli_sql_exception(zend_class_entry *c
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/odbc/odbc_arginfo.h b/ext/odbc/odbc_arginfo.h
index 958917d60012..0f8d378db084 100644
--- a/ext/odbc/odbc_arginfo.h
+++ b/ext/odbc/odbc_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_close_all, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
@@ -423,3 +424,5 @@ static zend_class_entry *register_class_Odbc_Result(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/opcache/opcache_arginfo.h b/ext/opcache/opcache_arginfo.h
index 60a1633154c9..e480a0d38bcc 100644
--- a/ext/opcache/opcache_arginfo.h
+++ b/ext/opcache/opcache_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit opcache.stub.php instead.
  * Stub hash: a8de025fa96a78db3a26d53a18bb2b365d094eca */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_opcache_reset, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
@@ -48,3 +49,5 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(opcache_is_script_cached_in_file_cache, arginfo_opcache_is_script_cached_in_file_cache)
 	ZEND_FE_END
 };
+
+END_EXTERN_C()
diff --git a/ext/openssl/openssl_arginfo.h b/ext/openssl/openssl_arginfo.h
index c7fdf82c7861..355f9d74637d 100644
--- a/ext/openssl/openssl_arginfo.h
+++ b/ext/openssl/openssl_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_x509_export_to_file, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_TYPE_MASK(0, certificate, OpenSSLCertificate, MAY_BE_STRING, NULL)
@@ -918,3 +919,5 @@ static zend_class_entry *register_class_OpenSSLAsymmetricKey(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/openssl/openssl_pwhash_arginfo.h b/ext/openssl/openssl_pwhash_arginfo.h
index dead1e12c8a6..23d288e9c129 100644
--- a/ext/openssl/openssl_pwhash_arginfo.h
+++ b/ext/openssl/openssl_pwhash_arginfo.h
@@ -4,6 +4,7 @@
 #if defined(HAVE_OPENSSL_ARGON2)
 #include "zend_constants.h"
 #endif
+BEGIN_EXTERN_C()
 
 static void register_openssl_pwhash_symbols(int module_number)
 {
@@ -16,3 +17,5 @@ static void register_openssl_pwhash_symbols(int module_number)
 	REGISTER_STRING_CONSTANT("PASSWORD_ARGON2_PROVIDER", "openssl", CONST_PERSISTENT);
 #endif
 }
+
+END_EXTERN_C()
diff --git a/ext/pcntl/pcntl_arginfo.h b/ext/pcntl/pcntl_arginfo.h
index a9d6bb010e29..f3ee7f63091c 100644
--- a/ext/pcntl/pcntl_arginfo.h
+++ b/ext/pcntl/pcntl_arginfo.h
@@ -4,6 +4,7 @@
 
 #include "zend_constants.h"
 #include "zend_enum.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pcntl_fork, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -681,3 +682,5 @@ static zend_class_entry *register_class_Pcntl_QosClass(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/pcntl/pcntl_decl.h b/ext/pcntl/pcntl_decl.h
index a0fdb4dde755..feb944399a76 100644
--- a/ext/pcntl/pcntl_decl.h
+++ b/ext/pcntl/pcntl_decl.h
@@ -3,6 +3,7 @@
 
 #ifndef ZEND_PCNTL_DECL_ec6306e93fad6d127ff880fc01736ac287619cf7_H
 #define ZEND_PCNTL_DECL_ec6306e93fad6d127ff880fc01736ac287619cf7_H
+BEGIN_EXTERN_C()
 
 typedef enum zend_enum_Pcntl_QosClass {
 	ZEND_ENUM_Pcntl_QosClass_UserInteractive = 1,
@@ -12,4 +13,5 @@ typedef enum zend_enum_Pcntl_QosClass {
 	ZEND_ENUM_Pcntl_QosClass_Background = 5,
 } zend_enum_Pcntl_QosClass;
 
+END_EXTERN_C()
 #endif /* ZEND_PCNTL_DECL_ec6306e93fad6d127ff880fc01736ac287619cf7_H */
diff --git a/ext/pcre/php_pcre_arginfo.h b/ext/pcre/php_pcre_arginfo.h
index 2f64048decff..bfa8523b6a3d 100644
--- a/ext/pcre/php_pcre_arginfo.h
+++ b/ext/pcre/php_pcre_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 63de1d37ab303e1d6af7c96eaeeba09d7f35d116 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_preg_match, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
@@ -126,3 +127,5 @@ static void register_php_pcre_symbols(int module_number)
 	REGISTER_LONG_CONSTANT("PCRE_VERSION_MINOR", PCRE2_MINOR, CONST_PERSISTENT);
 	REGISTER_BOOL_CONSTANT("PCRE_JIT_SUPPORT", PHP_PCRE_JIT_SUPPORT, CONST_PERSISTENT);
 }
+
+END_EXTERN_C()
diff --git a/ext/pdo/pdo_arginfo.h b/ext/pdo/pdo_arginfo.h
index 8327b383a1b9..d35655156c8c 100644
--- a/ext/pdo/pdo_arginfo.h
+++ b/ext/pdo/pdo_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit pdo.stub.php instead.
  * Stub hash: dc41dddeea1ae117c6f2f3447afb29bf6623b757 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pdo_drivers, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -30,3 +31,5 @@ static zend_class_entry *register_class_PDOException(zend_class_entry *class_ent
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/pdo/pdo_dbh_arginfo.h b/ext/pdo/pdo_dbh_arginfo.h
index 1e4cc4328b9b..60ded64d6c6c 100644
--- a/ext/pdo/pdo_dbh_arginfo.h
+++ b/ext/pdo/pdo_dbh_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 006be61b2c519e7d9ca997a7f12135eb3e0f3500 */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, dsn, IS_STRING, 0)
@@ -569,3 +570,5 @@ static zend_class_entry *register_class_PDO(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/pdo/pdo_stmt_arginfo.h b/ext/pdo/pdo_stmt_arginfo.h
index 080202f897bc..a61416ff0d55 100644
--- a/ext/pdo/pdo_stmt_arginfo.h
+++ b/ext/pdo/pdo_stmt_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit pdo_stmt.stub.php instead.
  * Stub hash: 6a5b332ba4bfeceaca6aad734d38dabb66d82c97 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_PDOStatement_bindColumn, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_MASK(0, column, MAY_BE_STRING|MAY_BE_LONG, NULL)
@@ -164,3 +165,5 @@ static zend_class_entry *register_class_PDORow(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/pdo_dblib/pdo_dblib_arginfo.h b/ext/pdo_dblib/pdo_dblib_arginfo.h
index 330bcde667f2..91a9396cf9af 100644
--- a/ext/pdo_dblib/pdo_dblib_arginfo.h
+++ b/ext/pdo_dblib/pdo_dblib_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit pdo_dblib.stub.php instead.
  * Stub hash: 95f297028aee0675523d6984c03a518e4fc431df */
+BEGIN_EXTERN_C()
 
 static zend_class_entry *register_class_Pdo_Dblib(zend_class_entry *class_entry_PDO)
 {
@@ -52,3 +53,5 @@ static zend_class_entry *register_class_Pdo_Dblib(zend_class_entry *class_entry_
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/pdo_firebird/pdo_firebird_arginfo.h b/ext/pdo_firebird/pdo_firebird_arginfo.h
index 11b75f920880..a607282a303d 100644
--- a/ext/pdo_firebird/pdo_firebird_arginfo.h
+++ b/ext/pdo_firebird/pdo_firebird_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit pdo_firebird.stub.php instead.
  * Stub hash: d36b2055abc48ae91c3442dda68fa2a28eb6d25b */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Pdo_Firebird_getApiVersion, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -68,3 +69,5 @@ static zend_class_entry *register_class_Pdo_Firebird(zend_class_entry *class_ent
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/pdo_mysql/pdo_mysql_arginfo.h b/ext/pdo_mysql/pdo_mysql_arginfo.h
index a3fe8b90c425..59f4667646ee 100644
--- a/ext/pdo_mysql/pdo_mysql_arginfo.h
+++ b/ext/pdo_mysql/pdo_mysql_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit pdo_mysql.stub.php instead.
  * Stub hash: 9d2c0327499693f1ca2825a9ad42ad769f44a24a */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Pdo_Mysql_getWarningCount, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -142,3 +143,5 @@ static zend_class_entry *register_class_Pdo_Mysql(zend_class_entry *class_entry_
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/pdo_odbc/pdo_odbc_arginfo.h b/ext/pdo_odbc/pdo_odbc_arginfo.h
index b9b2fff674c7..f6df39fdf624 100644
--- a/ext/pdo_odbc/pdo_odbc_arginfo.h
+++ b/ext/pdo_odbc/pdo_odbc_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 9136c911494c9e3462c49b3e58f4bcc15ebb2a9c */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 static void register_pdo_odbc_symbols(int module_number)
 {
@@ -47,3 +48,5 @@ static zend_class_entry *register_class_Pdo_Odbc(zend_class_entry *class_entry_P
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/pdo_pgsql/pdo_pgsql_arginfo.h b/ext/pdo_pgsql/pdo_pgsql_arginfo.h
index 2178d3086f65..8ef6d9f5c4a8 100644
--- a/ext/pdo_pgsql/pdo_pgsql_arginfo.h
+++ b/ext/pdo_pgsql/pdo_pgsql_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 3f62627e74ad08de8e95c9862e3d209ae63d971a */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Pdo_Pgsql_escapeIdentifier, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
@@ -176,3 +177,5 @@ static zend_class_entry *register_class_Pdo_Pgsql(zend_class_entry *class_entry_
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/pdo_pgsql/pgsql_driver_arginfo.h b/ext/pdo_pgsql/pgsql_driver_arginfo.h
index 9e52f3dbfdbc..e27fd80905cf 100644
--- a/ext/pdo_pgsql/pgsql_driver_arginfo.h
+++ b/ext/pdo_pgsql/pgsql_driver_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit pgsql_driver.stub.php instead.
  * Stub hash: 30c01b4d2e7f836b81a31dc0c1a115883eb41568 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_PDO_PGSql_Ext_pgsqlCopyFromArray, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, tableName, IS_STRING, 0)
@@ -68,3 +69,5 @@ static const zend_function_entry class_PDO_PGSql_Ext_methods[] = {
 	ZEND_ME(PDO_PGSql_Ext, pgsqlGetPid, arginfo_class_PDO_PGSql_Ext_pgsqlGetPid, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+END_EXTERN_C()
diff --git a/ext/pdo_sqlite/pdo_sqlite_arginfo.h b/ext/pdo_sqlite/pdo_sqlite_arginfo.h
index 73a9158301c0..ba3a641792b2 100644
--- a/ext/pdo_sqlite/pdo_sqlite_arginfo.h
+++ b/ext/pdo_sqlite/pdo_sqlite_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit pdo_sqlite.stub.php instead.
  * Stub hash: 721c46905fa8fb1e18d7196ed85c37f56049ea33 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Pdo_Sqlite_createAggregate, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
@@ -186,3 +187,5 @@ static zend_class_entry *register_class_Pdo_Sqlite(zend_class_entry *class_entry
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/pdo_sqlite/sqlite_driver_arginfo.h b/ext/pdo_sqlite/sqlite_driver_arginfo.h
index 4a31eebb745d..ef5089258df9 100644
--- a/ext/pdo_sqlite/sqlite_driver_arginfo.h
+++ b/ext/pdo_sqlite/sqlite_driver_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit sqlite_driver.stub.php instead.
  * Stub hash: dc901bd60d17c1a2cdb40a118e2c6cd6eb0396e3 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_PDO_SQLite_Ext_sqliteCreateFunction, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
@@ -30,3 +31,5 @@ static const zend_function_entry class_PDO_SQLite_Ext_methods[] = {
 	ZEND_ME(PDO_SQLite_Ext, sqliteCreateCollation, arginfo_class_PDO_SQLite_Ext_sqliteCreateCollation, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+END_EXTERN_C()
diff --git a/ext/pgsql/pgsql_arginfo.h b/ext/pgsql/pgsql_arginfo.h
index d63b98bfe1b9..7f5d27cd818d 100644
--- a/ext/pgsql/pgsql_arginfo.h
+++ b/ext/pgsql/pgsql_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_pg_connect, 0, 1, PgSql\\Connection, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, connection_string, IS_STRING, 0)
@@ -1044,3 +1045,5 @@ static zend_class_entry *register_class_PgSql_Lob(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/phar/phar_object_arginfo.h b/ext/phar/phar_object_arginfo.h
index f2ebf5ba6ea4..73d2130f391f 100644
--- a/ext/phar/phar_object_arginfo.h
+++ b/ext/phar/phar_object_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 4d1023618fff80be6c8f49864312600adf358ff4 */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -749,3 +750,5 @@ static zend_class_entry *register_class_PharFileInfo(zend_class_entry *class_ent
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/posix/posix_arginfo.h b/ext/posix/posix_arginfo.h
index 6172cdf3a1ce..7e6df5414b29 100644
--- a/ext/posix/posix_arginfo.h
+++ b/ext/posix/posix_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 25e0aa769d72988ebca07fff96c8ed1fcb6b7d5e */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_posix_kill, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, process_id, IS_LONG, 0)
@@ -467,3 +468,5 @@ static void register_posix_symbols(int module_number)
 	REGISTER_LONG_CONSTANT("POSIX_SC_OPEN_MAX", _SC_OPEN_MAX, CONST_PERSISTENT);
 #endif
 }
+
+END_EXTERN_C()
diff --git a/ext/random/random_arginfo.h b/ext/random/random_arginfo.h
index fb71235d8150..103f8a37114b 100644
--- a/ext/random/random_arginfo.h
+++ b/ext/random/random_arginfo.h
@@ -5,6 +5,7 @@
 #include "zend_attributes.h"
 #include "zend_constants.h"
 #include "zend_enum.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_lcg_value, 0, 0, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
@@ -375,3 +376,5 @@ static zend_class_entry *register_class_Random_RandomException(zend_class_entry
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/random/random_decl.h b/ext/random/random_decl.h
index 67b27f198247..1a1531667e64 100644
--- a/ext/random/random_decl.h
+++ b/ext/random/random_decl.h
@@ -3,6 +3,7 @@
 
 #ifndef ZEND_RANDOM_DECL_245fb5b66e540814c8595a06182886aee3e32f2c_H
 #define ZEND_RANDOM_DECL_245fb5b66e540814c8595a06182886aee3e32f2c_H
+BEGIN_EXTERN_C()
 
 typedef enum zend_enum_Random_IntervalBoundary {
 	ZEND_ENUM_Random_IntervalBoundary_ClosedOpen = 1,
@@ -11,4 +12,5 @@ typedef enum zend_enum_Random_IntervalBoundary {
 	ZEND_ENUM_Random_IntervalBoundary_OpenOpen = 4,
 } zend_enum_Random_IntervalBoundary;
 
+END_EXTERN_C()
 #endif /* ZEND_RANDOM_DECL_245fb5b66e540814c8595a06182886aee3e32f2c_H */
diff --git a/ext/readline/readline_arginfo.h b/ext/readline/readline_arginfo.h
index 2e17c9ee046a..b74e929c91f7 100644
--- a/ext/readline/readline_arginfo.h
+++ b/ext/readline/readline_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 848e798481f62ee09cfd8cc3dfa6b0814cfdd979 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_readline, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, prompt, IS_STRING, 1, "null")
@@ -101,3 +102,5 @@ static void register_readline_symbols(int module_number)
 {
 	REGISTER_STRING_CONSTANT("READLINE_LIB", READLINE_LIB, CONST_PERSISTENT);
 }
+
+END_EXTERN_C()
diff --git a/ext/reflection/php_reflection_arginfo.h b/ext/reflection/php_reflection_arginfo.h
index 661372516d50..2b9cb24570d6 100644
--- a/ext/reflection/php_reflection_arginfo.h
+++ b/ext/reflection/php_reflection_arginfo.h
@@ -4,6 +4,7 @@
 
 #include "zend_attributes.h"
 #include "zend_enum.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Reflection_getModifierNames, 0, 1, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, modifiers, IS_LONG, 0)
@@ -1938,3 +1939,5 @@ static zend_class_entry *register_class_ReflectionConstant(zend_class_entry *cla
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/reflection/php_reflection_decl.h b/ext/reflection/php_reflection_decl.h
index 555ed84feebe..cf2cc2af5328 100644
--- a/ext/reflection/php_reflection_decl.h
+++ b/ext/reflection/php_reflection_decl.h
@@ -3,10 +3,12 @@
 
 #ifndef ZEND_PHP_REFLECTION_DECL_c4dcc2653f826c2c437065faec4bf77772ef88b1_H
 #define ZEND_PHP_REFLECTION_DECL_c4dcc2653f826c2c437065faec4bf77772ef88b1_H
+BEGIN_EXTERN_C()
 
 typedef enum zend_enum_PropertyHookType {
 	ZEND_ENUM_PropertyHookType_Get = 1,
 	ZEND_ENUM_PropertyHookType_Set = 2,
 } zend_enum_PropertyHookType;
 
+END_EXTERN_C()
 #endif /* ZEND_PHP_REFLECTION_DECL_c4dcc2653f826c2c437065faec4bf77772ef88b1_H */
diff --git a/ext/session/session_arginfo.h b/ext/session/session_arginfo.h
index 091317182afb..28c17adcae79 100644
--- a/ext/session/session_arginfo.h
+++ b/ext/session/session_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 5109ef5c81733a112fe20d2626b8572d0969973c */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_session_name, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, name, IS_STRING, 1, "null")
@@ -277,3 +278,5 @@ static zend_class_entry *register_class_SessionHandler(zend_class_entry *class_e
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/shmop/shmop_arginfo.h b/ext/shmop/shmop_arginfo.h
index 464a6a462ae3..5f50d7d758e8 100644
--- a/ext/shmop/shmop_arginfo.h
+++ b/ext/shmop/shmop_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: e7f250077b6721539caee96afe4ed392396018f9 */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_shmop_open, 0, 4, Shmop, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
@@ -71,3 +72,5 @@ static zend_class_entry *register_class_Shmop(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/simplexml/simplexml_arginfo.h b/ext/simplexml/simplexml_arginfo.h
index 5a62efbc7be5..2f558044891e 100644
--- a/ext/simplexml/simplexml_arginfo.h
+++ b/ext/simplexml/simplexml_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit simplexml.stub.php instead.
  * Stub hash: 83f1bd204b309a4558c1b09128fe29f972f54252 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_simplexml_load_file, 0, 1, SimpleXMLElement, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -181,3 +182,5 @@ static zend_class_entry *register_class_SimpleXMLIterator(zend_class_entry *clas
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/skeleton/skeleton_arginfo.h b/ext/skeleton/skeleton_arginfo.h
index e74b28c0faa9..63cfc6bc846c 100644
--- a/ext/skeleton/skeleton_arginfo.h
+++ b/ext/skeleton/skeleton_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit skeleton.stub.php instead.
  * Stub hash: 54b0ffc3af871b189435266df516f7575c1b9675 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_test1, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
@@ -16,3 +17,5 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(test2, arginfo_test2)
 	ZEND_FE_END
 };
+
+END_EXTERN_C()
diff --git a/ext/snmp/snmp_arginfo.h b/ext/snmp/snmp_arginfo.h
index 5e8af709928b..51dd2cda1df9 100644
--- a/ext/snmp/snmp_arginfo.h
+++ b/ext/snmp/snmp_arginfo.h
@@ -5,6 +5,7 @@
 #include "zend_attributes.h"
 #include "zend_constants.h"
 #include "zend_enum.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmpget, 0, 3, IS_MIXED, 0)
 	ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
@@ -597,3 +598,5 @@ static zend_class_entry *register_class_Snmp_StringOutput(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/snmp/snmp_decl.h b/ext/snmp/snmp_decl.h
index f0b7f49d5a37..1a37a9306354 100644
--- a/ext/snmp/snmp_decl.h
+++ b/ext/snmp/snmp_decl.h
@@ -3,6 +3,7 @@
 
 #ifndef ZEND_SNMP_DECL_9a32b308176289c1b1475524372a69257f464bd4_H
 #define ZEND_SNMP_DECL_9a32b308176289c1b1475524372a69257f464bd4_H
+BEGIN_EXTERN_C()
 
 typedef enum zend_enum_Snmp_Mib {
 	ZEND_ENUM_Snmp_Mib_AllowUnderscores = 1,
@@ -36,4 +37,5 @@ typedef enum zend_enum_Snmp_StringOutput {
 	ZEND_ENUM_Snmp_StringOutput_Hex = 3,
 } zend_enum_Snmp_StringOutput;
 
+END_EXTERN_C()
 #endif /* ZEND_SNMP_DECL_9a32b308176289c1b1475524372a69257f464bd4_H */
diff --git a/ext/soap/soap_arginfo.h b/ext/soap/soap_arginfo.h
index f6b146d779d6..7f8c79266618 100644
--- a/ext/soap/soap_arginfo.h
+++ b/ext/soap/soap_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_use_soap_error_handler, 0, 0, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enable, _IS_BOOL, 0, "true")
@@ -750,3 +751,5 @@ static zend_class_entry *register_class_SoapClient(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/sockets/sockets_arginfo.h b/ext/sockets/sockets_arginfo.h
index 3f62bb3607fe..aac80a3f6fe4 100644
--- a/ext/sockets/sockets_arginfo.h
+++ b/ext/sockets/sockets_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: aceee39bed5332f7f26d5d768976c4d5ab96ab3c */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_select, 0, 4, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(1, read, IS_ARRAY, 1)
@@ -1135,3 +1136,5 @@ static zend_class_entry *register_class_AddressInfo(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/sodium/libsodium_arginfo.h b/ext/sodium/libsodium_arginfo.h
index d13759fd75f1..65b3edd4cada 100644
--- a/ext/sodium/libsodium_arginfo.h
+++ b/ext/sodium/libsodium_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_sodium_crypto_aead_aes256gcm_is_available, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
@@ -1397,3 +1398,5 @@ static zend_class_entry *register_class_SodiumException(zend_class_entry *class_
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/sodium/sodium_pwhash_arginfo.h b/ext/sodium/sodium_pwhash_arginfo.h
index 42cd454772c1..0a768f4ecda3 100644
--- a/ext/sodium/sodium_pwhash_arginfo.h
+++ b/ext/sodium/sodium_pwhash_arginfo.h
@@ -4,6 +4,7 @@
 #if SODIUM_LIBRARY_VERSION_MAJOR > 9 || (SODIUM_LIBRARY_VERSION_MAJOR == 9 && SODIUM_LIBRARY_VERSION_MINOR >= 6)
 #include "zend_constants.h"
 #endif
+BEGIN_EXTERN_C()
 
 static void register_sodium_pwhash_symbols(int module_number)
 {
@@ -16,3 +17,5 @@ static void register_sodium_pwhash_symbols(int module_number)
 	REGISTER_STRING_CONSTANT("PASSWORD_ARGON2_PROVIDER", "sodium", CONST_PERSISTENT);
 #endif
 }
+
+END_EXTERN_C()
diff --git a/ext/spl/php_spl_arginfo.h b/ext/spl/php_spl_arginfo.h
index 360067c0172a..a6b2457fdcf5 100644
--- a/ext/spl/php_spl_arginfo.h
+++ b/ext/spl/php_spl_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 5f9f72a101d08dc67472461115b90534d4805ddc */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_implements, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, object_or_class)
@@ -115,3 +116,5 @@ static void register_php_spl_symbols(int module_number)
 	ZVAL_STR(&attribute_Deprecated_func_spl_object_hash_0->args[1].value, ZSTR_KNOWN(ZEND_STR_8_DOT_6));
 	attribute_Deprecated_func_spl_object_hash_0->args[1].name = ZSTR_KNOWN(ZEND_STR_SINCE);
 }
+
+END_EXTERN_C()
diff --git a/ext/spl/spl_array_arginfo.h b/ext/spl/spl_array_arginfo.h
index 96523bd7a754..eafb98a13c7a 100644
--- a/ext/spl/spl_array_arginfo.h
+++ b/ext/spl/spl_array_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: c50ad88a1603d7805b7b77b60bd9c9bf0aa0a008 */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_MASK(0, array, MAY_BE_ARRAY|MAY_BE_OBJECT, "[]")
@@ -359,3 +360,5 @@ static zend_class_entry *register_class_RecursiveArrayIterator(zend_class_entry
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/spl/spl_directory_arginfo.h b/ext/spl/spl_directory_arginfo.h
index 7cf3c04cf35e..bbc77fb079bc 100644
--- a/ext/spl/spl_directory_arginfo.h
+++ b/ext/spl/spl_directory_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 3313c7bc6d9691a01903e6625630863e2b1e1bf7 */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileInfo___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -666,3 +667,5 @@ static zend_class_entry *register_class_SplTempFileObject(zend_class_entry *clas
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/spl/spl_dllist_arginfo.h b/ext/spl/spl_dllist_arginfo.h
index 0f0872b0f047..4f21df3cdb5c 100644
--- a/ext/spl/spl_dllist_arginfo.h
+++ b/ext/spl/spl_dllist_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit spl_dllist.stub.php instead.
  * Stub hash: 45e42d3a0589031651daee5653900d5a4fb61c3d */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SplDoublyLinkedList_add, 0, 2, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
@@ -200,3 +201,5 @@ static zend_class_entry *register_class_SplStack(zend_class_entry *class_entry_S
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/spl/spl_exceptions_arginfo.h b/ext/spl/spl_exceptions_arginfo.h
index 759602783066..bb526f9e4893 100644
--- a/ext/spl/spl_exceptions_arginfo.h
+++ b/ext/spl/spl_exceptions_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit spl_exceptions.stub.php instead.
  * Stub hash: 07475caecc81ab3b38a04905f874615af1126289 */
+BEGIN_EXTERN_C()
 
 static zend_class_entry *register_class_LogicException(zend_class_entry *class_entry_Exception)
 {
@@ -130,3 +131,5 @@ static zend_class_entry *register_class_UnexpectedValueException(zend_class_entr
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/spl/spl_fixedarray_arginfo.h b/ext/spl/spl_fixedarray_arginfo.h
index 2f2a264fe621..16b8328eb927 100644
--- a/ext/spl/spl_fixedarray_arginfo.h
+++ b/ext/spl/spl_fixedarray_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 0c838fed60b29671fe04e63315ab662d8cb16f0c */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFixedArray___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, size, IS_LONG, 0, "0")
@@ -108,3 +109,5 @@ static zend_class_entry *register_class_SplFixedArray(zend_class_entry *class_en
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/spl/spl_heap_arginfo.h b/ext/spl/spl_heap_arginfo.h
index 010d911ecb83..eb55cb32f131 100644
--- a/ext/spl/spl_heap_arginfo.h
+++ b/ext/spl/spl_heap_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit spl_heap.stub.php instead.
  * Stub hash: 3256398ed9e798f141fd3cb73370c0d8b2dbd0f1 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SplPriorityQueue_compare, 0, 2, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, priority1, IS_MIXED, 0)
@@ -233,3 +234,5 @@ static zend_class_entry *register_class_SplMaxHeap(zend_class_entry *class_entry
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/spl/spl_iterators_arginfo.h b/ext/spl/spl_iterators_arginfo.h
index 23a5b6db33df..eee6b7116f5a 100644
--- a/ext/spl/spl_iterators_arginfo.h
+++ b/ext/spl/spl_iterators_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit spl_iterators.stub.php instead.
  * Stub hash: ab66d2fff7ac7556d4244582a2bd3e83a3f95243 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_EmptyIterator_current, 0, 0, IS_NEVER, 0)
 ZEND_END_ARG_INFO()
@@ -966,3 +967,5 @@ static zend_class_entry *register_class_RecursiveTreeIterator(zend_class_entry *
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/spl/spl_observer_arginfo.h b/ext/spl/spl_observer_arginfo.h
index 14ba7ef995db..f3167ac2fb0b 100644
--- a/ext/spl/spl_observer_arginfo.h
+++ b/ext/spl/spl_observer_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 9dfd8bcf8946cbee550c9a46da07c424c3505408 */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SplObserver_update, 0, 1, IS_VOID, 0)
 	ZEND_ARG_OBJ_INFO(0, subject, SplSubject, 0)
@@ -319,3 +320,5 @@ static zend_class_entry *register_class_MultipleIterator(zend_class_entry *class
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/sqlite3/sqlite3_arginfo.h b/ext/sqlite3/sqlite3_arginfo.h
index f3f8160e5e20..130a8111dbad 100644
--- a/ext/sqlite3/sqlite3_arginfo.h
+++ b/ext/sqlite3/sqlite3_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -598,3 +599,5 @@ static zend_class_entry *register_class_SQLite3Result(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index 21a14c0bfedf..10909cd5a763 100644
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -5,6 +5,7 @@
 #include "zend_attributes.h"
 #include "zend_constants.h"
 #include "zend_enum.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -4150,3 +4151,5 @@ static zend_class_entry *register_class_RoundingMode(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/standard/basic_functions_decl.h b/ext/standard/basic_functions_decl.h
index e1f012c26370..439d99a4a031 100644
--- a/ext/standard/basic_functions_decl.h
+++ b/ext/standard/basic_functions_decl.h
@@ -3,6 +3,7 @@
 
 #ifndef ZEND_BASIC_FUNCTIONS_DECL_1e7c1c8937b439ecab1343a0e78a6092bcbbb0fc_H
 #define ZEND_BASIC_FUNCTIONS_DECL_1e7c1c8937b439ecab1343a0e78a6092bcbbb0fc_H
+BEGIN_EXTERN_C()
 
 typedef enum zend_enum_SortDirection {
 	ZEND_ENUM_SortDirection_Ascending = 1,
@@ -20,4 +21,5 @@ typedef enum zend_enum_RoundingMode {
 	ZEND_ENUM_RoundingMode_PositiveInfinity = 8,
 } zend_enum_RoundingMode;
 
+END_EXTERN_C()
 #endif /* ZEND_BASIC_FUNCTIONS_DECL_1e7c1c8937b439ecab1343a0e78a6092bcbbb0fc_H */
diff --git a/ext/standard/dir_arginfo.h b/ext/standard/dir_arginfo.h
index afd2ed76fd5c..5608c6c52d5d 100644
--- a/ext/standard/dir_arginfo.h
+++ b/ext/standard/dir_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: e21d382cd4001001874c49d8c5244efb57613910 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Directory_close, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
@@ -74,3 +75,5 @@ static zend_class_entry *register_class_Directory(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/standard/dl_arginfo.h b/ext/standard/dl_arginfo.h
index d982c3aa4cdf..9abb2dfd0f63 100644
--- a/ext/standard/dl_arginfo.h
+++ b/ext/standard/dl_arginfo.h
@@ -1,7 +1,10 @@
 /* This is a generated file, edit dl.stub.php instead.
  * Stub hash: 7dac6edd98e3e17669ae4bf0be7db89678059ca0 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dl, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, extension_filename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+
+END_EXTERN_C()
diff --git a/ext/standard/file_arginfo.h b/ext/standard/file_arginfo.h
index dd8a64910be8..3c1cdb745f87 100644
--- a/ext/standard/file_arginfo.h
+++ b/ext/standard/file_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 static void register_file_symbols(int module_number)
 {
@@ -139,3 +140,5 @@ static void register_file_symbols(int module_number)
 	ZVAL_STR_COPY(&attribute_Deprecated_const_FILE_BINARY_0->args[1].value, attribute_Deprecated_const_FILE_TEXT_0_arg1_str);
 	attribute_Deprecated_const_FILE_BINARY_0->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);
 }
+
+END_EXTERN_C()
diff --git a/ext/standard/io_poll_arginfo.h b/ext/standard/io_poll_arginfo.h
index 925f483ddc88..aa819318a200 100644
--- a/ext/standard/io_poll_arginfo.h
+++ b/ext/standard/io_poll_arginfo.h
@@ -3,6 +3,7 @@
  * Has decl header: yes */
 
 #include "zend_enum.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Io_Poll_Backend_getAvailableBackends, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -394,3 +395,5 @@ static zend_class_entry *register_class_StreamPollHandle(zend_class_entry *class
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/standard/io_poll_decl.h b/ext/standard/io_poll_decl.h
index de49880392a7..02d2e8f409b6 100644
--- a/ext/standard/io_poll_decl.h
+++ b/ext/standard/io_poll_decl.h
@@ -3,6 +3,7 @@
 
 #ifndef ZEND_IO_POLL_DECL_2f52b00fd6dfc62291e0dd288ffd68547b29bdaa_H
 #define ZEND_IO_POLL_DECL_2f52b00fd6dfc62291e0dd288ffd68547b29bdaa_H
+BEGIN_EXTERN_C()
 
 typedef enum zend_enum_Io_Poll_Backend {
 	ZEND_ENUM_Io_Poll_Backend_Auto = 1,
@@ -23,4 +24,5 @@ typedef enum zend_enum_Io_Poll_Event {
 	ZEND_ENUM_Io_Poll_Event_EdgeTriggered = 7,
 } zend_enum_Io_Poll_Event;
 
+END_EXTERN_C()
 #endif /* ZEND_IO_POLL_DECL_2f52b00fd6dfc62291e0dd288ffd68547b29bdaa_H */
diff --git a/ext/standard/password_arginfo.h b/ext/standard/password_arginfo.h
index bbfe8d16aa37..a62954096c2e 100644
--- a/ext/standard/password_arginfo.h
+++ b/ext/standard/password_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 589ff98a8fd6883f11558d4984b89a0467e756e0 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 static void register_password_symbols(int module_number)
 {
@@ -17,3 +18,5 @@ static void register_password_symbols(int module_number)
 #endif
 	REGISTER_STRING_CONSTANT("PASSWORD_DEFAULT", "2y", CONST_PERSISTENT);
 }
+
+END_EXTERN_C()
diff --git a/ext/standard/user_filters_arginfo.h b/ext/standard/user_filters_arginfo.h
index ff65a8083c44..e7f5caee1fff 100644
--- a/ext/standard/user_filters_arginfo.h
+++ b/ext/standard/user_filters_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 01be6d52377ecd1940c14e3d508df28a70456c58 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_php_user_filter_filter, 0, 4, IS_LONG, 0)
 	ZEND_ARG_INFO(0, in)
@@ -106,3 +107,5 @@ static zend_class_entry *register_class_StreamBucket(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/sysvmsg/sysvmsg_arginfo.h b/ext/sysvmsg/sysvmsg_arginfo.h
index 971681cb453f..ee86f191edc9 100644
--- a/ext/sysvmsg/sysvmsg_arginfo.h
+++ b/ext/sysvmsg/sysvmsg_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: ed5b1e4e5dda6a65ce336fc4daa975520c354f17 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_msg_get_queue, 0, 1, SysvMessageQueue, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
@@ -82,3 +83,5 @@ static zend_class_entry *register_class_SysvMessageQueue(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/sysvsem/sysvsem_arginfo.h b/ext/sysvsem/sysvsem_arginfo.h
index b7643a926b14..9b670cf62165 100644
--- a/ext/sysvsem/sysvsem_arginfo.h
+++ b/ext/sysvsem/sysvsem_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit sysvsem.stub.php instead.
  * Stub hash: 946ea9d0d2156ced1bac460d7d5fc3420e1934bb */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_sem_get, 0, 1, SysvSemaphore, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
@@ -41,3 +42,5 @@ static zend_class_entry *register_class_SysvSemaphore(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/sysvshm/sysvshm_arginfo.h b/ext/sysvshm/sysvshm_arginfo.h
index aade5b8276a4..2d1b405e475c 100644
--- a/ext/sysvshm/sysvshm_arginfo.h
+++ b/ext/sysvshm/sysvshm_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit sysvshm.stub.php instead.
  * Stub hash: 792c695a705678a3779d62cef8a5136069f98dee */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_shm_attach, 0, 1, SysvSharedMemory, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
@@ -61,3 +62,5 @@ static zend_class_entry *register_class_SysvSharedMemory(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/tidy/tidy_arginfo.h b/ext/tidy/tidy_arginfo.h
index d402a3167ab0..c836f18f7d06 100644
--- a/ext/tidy/tidy_arginfo.h
+++ b/ext/tidy/tidy_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 7a1ba6bc8ec95e846ec89060b30f54d2c32486ef */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_tidy_parse_string, 0, 1, tidy, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
@@ -544,3 +545,5 @@ static zend_class_entry *register_class_tidyNode(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/tokenizer/tokenizer_arginfo.h b/ext/tokenizer/tokenizer_arginfo.h
index 20e0f0624d7a..2da5263838f6 100644
--- a/ext/tokenizer/tokenizer_arginfo.h
+++ b/ext/tokenizer/tokenizer_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: a89f03303f8a7d254509ae2bc46a36bb79a3c900 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_token_get_all, 0, 1, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, code, IS_STRING, 0)
@@ -96,3 +97,5 @@ static zend_class_entry *register_class_PhpToken(zend_class_entry *class_entry_S
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/tokenizer/tokenizer_data_arginfo.h b/ext/tokenizer/tokenizer_data_arginfo.h
index 20e5a5f776f5..22a129255a94 100644
--- a/ext/tokenizer/tokenizer_data_arginfo.h
+++ b/ext/tokenizer/tokenizer_data_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: c5235344b7c651d27c2c33c90696a418a9c96837 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 static void register_tokenizer_data_symbols(int module_number)
 {
@@ -159,3 +160,5 @@ static void register_tokenizer_data_symbols(int module_number)
 	REGISTER_LONG_CONSTANT("T_BAD_CHARACTER", T_BAD_CHARACTER, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_DOUBLE_COLON", T_PAAMAYIM_NEKUDOTAYIM, CONST_PERSISTENT);
 }
+
+END_EXTERN_C()
diff --git a/ext/uri/php_uri_arginfo.h b/ext/uri/php_uri_arginfo.h
index 43535287d785..a3bf97044925 100644
--- a/ext/uri/php_uri_arginfo.h
+++ b/ext/uri/php_uri_arginfo.h
@@ -4,6 +4,7 @@
 
 #include "zend_attributes.h"
 #include "zend_enum.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_Uri_WhatWg_url_percent_encode, 0, 2, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
@@ -774,3 +775,5 @@ static zend_class_entry *register_class_Uri_WhatWg_UrlPercentEncodingMode(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/uri/php_uri_decl.h b/ext/uri/php_uri_decl.h
index 9423aff69fe7..52aad4f58c7a 100644
--- a/ext/uri/php_uri_decl.h
+++ b/ext/uri/php_uri_decl.h
@@ -3,6 +3,7 @@
 
 #ifndef ZEND_PHP_URI_DECL_d96bdceccf7867b022c923bcfaf9f7a1142f0d0b_H
 #define ZEND_PHP_URI_DECL_d96bdceccf7867b022c923bcfaf9f7a1142f0d0b_H
+BEGIN_EXTERN_C()
 
 typedef enum zend_enum_Uri_UriComparisonMode {
 	ZEND_ENUM_Uri_UriComparisonMode_IncludeFragment = 1,
@@ -76,4 +77,5 @@ typedef enum zend_enum_Uri_WhatWg_UrlPercentEncodingMode {
 	ZEND_ENUM_Uri_WhatWg_UrlPercentEncodingMode_Fragment = 10,
 } zend_enum_Uri_WhatWg_UrlPercentEncodingMode;
 
+END_EXTERN_C()
 #endif /* ZEND_PHP_URI_DECL_d96bdceccf7867b022c923bcfaf9f7a1142f0d0b_H */
diff --git a/ext/xml/xml_arginfo.h b/ext/xml/xml_arginfo.h
index f8c6638e8ec1..a157438ed785 100644
--- a/ext/xml/xml_arginfo.h
+++ b/ext/xml/xml_arginfo.h
@@ -3,6 +3,7 @@
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_xml_parser_create, 0, 0, XMLParser, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
@@ -190,3 +191,5 @@ static zend_class_entry *register_class_XMLParser(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/xmlreader/php_xmlreader_arginfo.h b/ext/xmlreader/php_xmlreader_arginfo.h
index 8283a72f7d30..8a0dbb32be92 100644
--- a/ext/xmlreader/php_xmlreader_arginfo.h
+++ b/ext/xmlreader/php_xmlreader_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit php_xmlreader.stub.php instead.
  * Stub hash: 11cf6e4c523d9ebbe2775d5bd127be303402336f */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_XMLReader_close, 0, 0, IS_TRUE, 0)
 ZEND_END_ARG_INFO()
@@ -392,3 +393,5 @@ static zend_class_entry *register_class_XMLReader(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/xmlwriter/php_xmlwriter_arginfo.h b/ext/xmlwriter/php_xmlwriter_arginfo.h
index 33e85c3e9ec5..6d361fe218df 100644
--- a/ext/xmlwriter/php_xmlwriter_arginfo.h
+++ b/ext/xmlwriter/php_xmlwriter_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit php_xmlwriter.stub.php instead.
  * Stub hash: 27ddfb10eeeda8acfa744751fdcdd030a207f899 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_xmlwriter_open_uri, 0, 1, XMLWriter, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
@@ -488,3 +489,5 @@ static zend_class_entry *register_class_XMLWriter(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/xsl/php_xsl_arginfo.h b/ext/xsl/php_xsl_arginfo.h
index ed639006600b..56e659cf6441 100644
--- a/ext/xsl/php_xsl_arginfo.h
+++ b/ext/xsl/php_xsl_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: cb1005b601e72e8d36d0f6aa5d08872f5c7ea2e6 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_XSLTProcessor_importStylesheet, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, stylesheet, IS_OBJECT, 0)
@@ -145,3 +146,5 @@ static zend_class_entry *register_class_XSLTProcessor(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/zend_test/fiber_arginfo.h b/ext/zend_test/fiber_arginfo.h
index 6aa767f09176..9b5cfe08619c 100644
--- a/ext/zend_test/fiber_arginfo.h
+++ b/ext/zend_test/fiber_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit fiber.stub.php instead.
  * Stub hash: 8cd7626122b050585503ccebe370a61781ff83f2 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class__ZendTestFiber___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
@@ -43,3 +44,5 @@ static zend_class_entry *register_class__ZendTestFiber(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/zend_test/iterators_arginfo.h b/ext/zend_test/iterators_arginfo.h
index 2d5a2de89a99..985d83b8f0ce 100644
--- a/ext/zend_test/iterators_arginfo.h
+++ b/ext/zend_test/iterators_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit iterators.stub.php instead.
  * Stub hash: f9558686a7393ddd4ba3302e811f70d4496317ee */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZendTest_Iterators_TraversableTest___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -26,3 +27,5 @@ static zend_class_entry *register_class_ZendTest_Iterators_TraversableTest(zend_
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/zend_test/object_handlers_arginfo.h b/ext/zend_test/object_handlers_arginfo.h
index 995bd62dc478..fc4056ab4fe8 100644
--- a/ext/zend_test/object_handlers_arginfo.h
+++ b/ext/zend_test/object_handlers_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit object_handlers.stub.php instead.
  * Stub hash: 1a70ed60c5af38539b1222a979f97fddf7d1826e */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DoOperationNoCast___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, val, IS_LONG, 0)
@@ -185,3 +186,5 @@ static zend_class_entry *register_class_DimensionHandlersNoArrayAccess(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/zend_test/test_arginfo.h b/ext/zend_test/test_arginfo.h
index 40f06222783f..dd15c985e40f 100644
--- a/ext/zend_test/test_arginfo.h
+++ b/ext/zend_test/test_arginfo.h
@@ -7,6 +7,7 @@
 #if (PHP_VERSION_ID >= 80100)
 #include "zend_enum.h"
 #endif
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_trigger_bailout, 0, 0, IS_NEVER, 0)
 ZEND_END_ARG_INFO()
@@ -1758,3 +1759,5 @@ static zend_class_entry *register_class_ZendTestNS2_ZendSubNS_Foo(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/zend_test/test_decl.h b/ext/zend_test/test_decl.h
index 96ebfbea6fc4..65a3056f1bbd 100644
--- a/ext/zend_test/test_decl.h
+++ b/ext/zend_test/test_decl.h
@@ -3,6 +3,7 @@
 
 #ifndef ZEND_TEST_DECL_0d233e99eed49cad1bb8e52c28d14ba2a6054b03_H
 #define ZEND_TEST_DECL_0d233e99eed49cad1bb8e52c28d14ba2a6054b03_H
+BEGIN_EXTERN_C()
 
 typedef enum zend_enum_ZendTestUnitEnum {
 	ZEND_ENUM_ZendTestUnitEnum_Foo = 1,
@@ -27,4 +28,5 @@ typedef enum zend_enum_ZendTestEnumWithInterface {
 	ZEND_ENUM_ZendTestEnumWithInterface_Bar = 2,
 } zend_enum_ZendTestEnumWithInterface;
 
+END_EXTERN_C()
 #endif /* ZEND_TEST_DECL_0d233e99eed49cad1bb8e52c28d14ba2a6054b03_H */
diff --git a/ext/zend_test/test_legacy_arginfo.h b/ext/zend_test/test_legacy_arginfo.h
index 4ee3d3d083eb..4280ce12a130 100644
--- a/ext/zend_test/test_legacy_arginfo.h
+++ b/ext/zend_test/test_legacy_arginfo.h
@@ -6,6 +6,7 @@
 #if (PHP_VERSION_ID >= 80100)
 #include "zend_enum.h"
 #endif
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zend_trigger_bailout, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -1436,3 +1437,5 @@ static zend_class_entry *register_class_ZendTestNS2_ZendSubNS_Foo(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/zend_test/tmp_methods_arginfo.h b/ext/zend_test/tmp_methods_arginfo.h
index 1105996ca333..5e3fb4ec0928 100644
--- a/ext/zend_test/tmp_methods_arginfo.h
+++ b/ext/zend_test/tmp_methods_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit tmp_methods.stub.php instead.
  * Stub hash: 7fd99c0b5a1957cb3a8c08a74421a720475bb46d */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ZendTestTmpMethods_testTmpMethodWithArgInfo, 0, 0, IS_VOID, 0)
 	ZEND_ARG_OBJ_TYPE_MASK(0, tmpMethodParamName, Foo|Bar, MAY_BE_NULL, "null")
@@ -12,3 +13,5 @@ static const zend_function_entry class_ZendTestTmpMethods_methods[] = {
 	ZEND_ME(ZendTestTmpMethods, testTmpMethodWithArgInfo, arginfo_class_ZendTestTmpMethods_testTmpMethodWithArgInfo, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+END_EXTERN_C()
diff --git a/ext/zip/php_zip_arginfo.h b/ext/zip/php_zip_arginfo.h
index 022bce3650b0..5c2e2428c5c5 100644
--- a/ext/zip/php_zip_arginfo.h
+++ b/ext/zip/php_zip_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 8f2b42d73dd8ff8729ddeff8396fa6d563eb13cb */
 
 #include "zend_attributes.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_open, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -1305,3 +1306,5 @@ static zend_class_entry *register_class_ZipArchive(zend_class_entry *class_entry
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/ext/zlib/zlib_arginfo.h b/ext/zlib/zlib_arginfo.h
index 41388789f841..3873261c94f6 100644
--- a/ext/zlib/zlib_arginfo.h
+++ b/ext/zlib/zlib_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 4c5bea6d9f290c244c7bb27c77fe8007d43a40db */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ob_gzhandler, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
@@ -248,3 +249,5 @@ static zend_class_entry *register_class_DeflateContext(void)
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/main/main_arginfo.h b/main/main_arginfo.h
index 0da355e87b77..5c6ef081c52c 100644
--- a/main/main_arginfo.h
+++ b/main/main_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 22b4c7412680888c122886bccd21e3d38953ce33 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 static void register_main_symbols(int module_number)
 {
@@ -87,3 +88,5 @@ static void register_main_symbols(int module_number)
 	REGISTER_STRING_CONSTANT("PHP_SAPI", sapi_module.name, CONST_PERSISTENT | CONST_NO_FILE_CACHE);
 	REGISTER_STRING_CONSTANT("PHP_BINARY", PG(php_binary) ? PG(php_binary) : "", CONST_PERSISTENT | CONST_NO_FILE_CACHE);
 }
+
+END_EXTERN_C()
diff --git a/main/streams/stream_errors_arginfo.h b/main/streams/stream_errors_arginfo.h
index 8b46210b3579..dde8bc56bcfc 100644
--- a/main/streams/stream_errors_arginfo.h
+++ b/main/streams/stream_errors_arginfo.h
@@ -3,6 +3,7 @@
  * Has decl header: yes */
 
 #include "zend_enum.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_StreamException_getErrors, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -257,3 +258,5 @@ static zend_class_entry *register_class_StreamException(zend_class_entry *class_
 
 	return class_entry;
 }
+
+END_EXTERN_C()
diff --git a/main/streams/stream_errors_decl.h b/main/streams/stream_errors_decl.h
index 3a18055b9e74..828d642fd587 100644
--- a/main/streams/stream_errors_decl.h
+++ b/main/streams/stream_errors_decl.h
@@ -3,6 +3,7 @@
 
 #ifndef ZEND_STREAM_ERRORS_DECL_d3087b608996f81bf0dd19c25792feec9744e768_H
 #define ZEND_STREAM_ERRORS_DECL_d3087b608996f81bf0dd19c25792feec9744e768_H
+BEGIN_EXTERN_C()
 
 typedef enum zend_enum_StreamErrorCode {
 	ZEND_ENUM_StreamErrorCode_None = 1,
@@ -184,4 +185,5 @@ typedef enum zend_enum_StreamErrorStore {
 	ZEND_ENUM_StreamErrorStore_All = 5,
 } zend_enum_StreamErrorStore;
 
+END_EXTERN_C()
 #endif /* ZEND_STREAM_ERRORS_DECL_d3087b608996f81bf0dd19c25792feec9744e768_H */
diff --git a/main/streams/userspace_arginfo.h b/main/streams/userspace_arginfo.h
index 267eede10741..26007d132932 100644
--- a/main/streams/userspace_arginfo.h
+++ b/main/streams/userspace_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 9198095c858c95fcb31252ddfa24fe04787d0460 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 static void register_userspace_symbols(int module_number)
 {
@@ -29,3 +30,5 @@ static void register_userspace_symbols(int module_number)
 	REGISTER_LONG_CONSTANT("STREAM_META_GROUP_NAME", PHP_STREAM_META_GROUP_NAME, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("STREAM_META_ACCESS", PHP_STREAM_META_ACCESS, CONST_PERSISTENT);
 }
+
+END_EXTERN_C()
diff --git a/sapi/apache2handler/php_functions_arginfo.h b/sapi/apache2handler/php_functions_arginfo.h
index f816c29f8621..99c663ec19c0 100644
--- a/sapi/apache2handler/php_functions_arginfo.h
+++ b/sapi/apache2handler/php_functions_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit php_functions.stub.php instead.
  * Stub hash: 130666f6f971fe7b43a450d922e4b3d092e78667 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_apache_lookup_uri, 0, 1, MAY_BE_OBJECT|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -60,3 +61,5 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(apache_get_modules, arginfo_apache_get_modules)
 	ZEND_FE_END
 };
+
+END_EXTERN_C()
diff --git a/sapi/cgi/cgi_main_arginfo.h b/sapi/cgi/cgi_main_arginfo.h
index 42b0f50e179d..4f0d491a2b0c 100644
--- a/sapi/cgi/cgi_main_arginfo.h
+++ b/sapi/cgi/cgi_main_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit cgi_main.stub.php instead.
  * Stub hash: df963adc6bc610cdd31861036889141fa9464ded */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_apache_child_terminate, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
@@ -22,3 +23,5 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(apache_response_headers, arginfo_apache_response_headers)
 	ZEND_FE_END
 };
+
+END_EXTERN_C()
diff --git a/sapi/cli/php_cli_process_title_arginfo.h b/sapi/cli/php_cli_process_title_arginfo.h
index f00f9cf22bba..8d4c4b3aa1c7 100644
--- a/sapi/cli/php_cli_process_title_arginfo.h
+++ b/sapi/cli/php_cli_process_title_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit php_cli_process_title.stub.php instead.
  * Stub hash: ee776e0c54fe4b66a98b3a0203af11c5f3082e38 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_cli_set_process_title, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, title, IS_STRING, 0)
@@ -8,3 +9,5 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_cli_get_process_title, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
+
+END_EXTERN_C()
diff --git a/sapi/cli/php_cli_server_arginfo.h b/sapi/cli/php_cli_server_arginfo.h
index 752631e5d25e..b8aa7ba8bbab 100644
--- a/sapi/cli/php_cli_server_arginfo.h
+++ b/sapi/cli/php_cli_server_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit php_cli_server.stub.php instead.
  * Stub hash: 60cd531d36a34fe7c51982e9ec40b45d2a2a4ce7 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_apache_request_headers, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -8,3 +9,5 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_getallheaders arginfo_apache_request_headers
 
+
+END_EXTERN_C()
diff --git a/sapi/fpm/fpm/fpm_main_arginfo.h b/sapi/fpm/fpm/fpm_main_arginfo.h
index 0931c8c7adc3..657187522527 100644
--- a/sapi/fpm/fpm/fpm_main_arginfo.h
+++ b/sapi/fpm/fpm/fpm_main_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit fpm_main.stub.php instead.
  * Stub hash: b9cdc331451e1f03af1faf6fc621a4ad62603ab0 */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_fastcgi_finish_request, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
@@ -23,3 +24,5 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(fpm_get_status, arginfo_fpm_get_status)
 	ZEND_FE_END
 };
+
+END_EXTERN_C()
diff --git a/sapi/litespeed/lsapi_main_arginfo.h b/sapi/litespeed/lsapi_main_arginfo.h
index 82c154aef763..f0b5c70ef592 100644
--- a/sapi/litespeed/lsapi_main_arginfo.h
+++ b/sapi/litespeed/lsapi_main_arginfo.h
@@ -1,5 +1,6 @@
 /* This is a generated file, edit lsapi_main.stub.php instead.
  * Stub hash: 3419f4e77bd091e09e0cfc55d81f443d5a3396ff */
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_litespeed_request_headers, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -33,3 +34,5 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(litespeed_finish_request, arginfo_litespeed_finish_request)
 	ZEND_FE_END
 };
+
+END_EXTERN_C()
diff --git a/sapi/phpdbg/phpdbg_arginfo.h b/sapi/phpdbg/phpdbg_arginfo.h
index f12bf1ca2575..634ce1799355 100644
--- a/sapi/phpdbg/phpdbg_arginfo.h
+++ b/sapi/phpdbg/phpdbg_arginfo.h
@@ -2,6 +2,7 @@
  * Stub hash: 08e29f02953f23bfce6ce04f435227b4e5e61545 */
 
 #include "zend_constants.h"
+BEGIN_EXTERN_C()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phpdbg_break_next, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
@@ -79,3 +80,5 @@ static void register_phpdbg_symbols(int module_number)
 	REGISTER_LONG_CONSTANT("PHPDBG_COLOR_NOTICE", PHPDBG_COLOR_NOTICE, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("PHPDBG_COLOR_ERROR", PHPDBG_COLOR_ERROR, CONST_PERSISTENT);
 }
+
+END_EXTERN_C()

From 2b88809b81c254e918cea3874befb87124d7638d Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Fri, 16 Oct 2026 19:40:52 +0100
Subject: [PATCH 2/2] Fix ext/intl

---
 ext/intl/converter/converter.cpp | 38 ++++++++++++++++----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/ext/intl/converter/converter.cpp b/ext/intl/converter/converter.cpp
index 565f18573d71..bfd2315229dd 100644
--- a/ext/intl/converter/converter.cpp
+++ b/ext/intl/converter/converter.cpp
@@ -91,7 +91,7 @@ static void php_converter_default_callback(zval *return_value, zval *zobj, zend_
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, toUCallback) {
+U_CFUNC PHP_METHOD(UConverter, toUCallback) {
 	zend_long reason;
 	zend_string *source, *codeUnits;
 	zval *error;
@@ -108,7 +108,7 @@ PHP_METHOD(UConverter, toUCallback) {
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, fromUCallback) {
+U_CFUNC PHP_METHOD(UConverter, fromUCallback) {
 	zend_long reason;
 	zval *source, *error;
 	zend_long codePoint;
@@ -403,14 +403,14 @@ static void php_converter_do_set_encoding(UConverter **pcnv, INTERNAL_FUNCTION_P
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, setSourceEncoding) {
+U_CFUNC PHP_METHOD(UConverter, setSourceEncoding) {
 	php_converter_object *objval = CONV_GET(ZEND_THIS);
 	php_converter_do_set_encoding(&(objval->src), INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, setDestinationEncoding) {
+U_CFUNC PHP_METHOD(UConverter, setDestinationEncoding) {
 	php_converter_object *objval = CONV_GET(ZEND_THIS);
 	php_converter_do_set_encoding(&(objval->dest), INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
@@ -439,14 +439,14 @@ static void php_converter_do_get_encoding(php_converter_object *objval, UConvert
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, getSourceEncoding) {
+U_CFUNC PHP_METHOD(UConverter, getSourceEncoding) {
 	php_converter_object *objval = CONV_GET(ZEND_THIS);
 	php_converter_do_get_encoding(objval, objval->src, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, getDestinationEncoding) {
+U_CFUNC PHP_METHOD(UConverter, getDestinationEncoding) {
 	php_converter_object *objval = CONV_GET(ZEND_THIS);
 	php_converter_do_get_encoding(objval, objval->dest, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
@@ -474,21 +474,21 @@ static void php_converter_do_get_type(php_converter_object *objval, UConverter *
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, getSourceType) {
+U_CFUNC PHP_METHOD(UConverter, getSourceType) {
 	php_converter_object *objval = CONV_GET(ZEND_THIS);
 	php_converter_do_get_type(objval, objval->src, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, getDestinationType) {
+U_CFUNC PHP_METHOD(UConverter, getDestinationType) {
 	php_converter_object *objval = CONV_GET(ZEND_THIS);
 	php_converter_do_get_type(objval, objval->dest, INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, __construct) {
+U_CFUNC PHP_METHOD(UConverter, __construct) {
 	php_converter_object *objval = CONV_GET(ZEND_THIS);
 	char *src = "utf-8";
 	size_t src_len = sizeof("utf-8") - 1;
@@ -522,7 +522,7 @@ PHP_METHOD(UConverter, __construct) {
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, setSubstChars) {
+U_CFUNC PHP_METHOD(UConverter, setSubstChars) {
 	php_converter_object *objval = CONV_GET(ZEND_THIS);
 	char *chars;
 	size_t chars_len;
@@ -563,7 +563,7 @@ PHP_METHOD(UConverter, setSubstChars) {
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, getSubstChars) {
+U_CFUNC PHP_METHOD(UConverter, getSubstChars) {
 	php_converter_object *objval = CONV_GET(ZEND_THIS);
 	char chars[127];
 	int8_t chars_len = sizeof(chars);
@@ -659,7 +659,7 @@ static void php_converter_set_subst_chars(UConverter *cnv, const zend_string *su
 
 /* {{{ */
 #define UCNV_REASON_CASE(v) case (UCNV_ ## v) : RETURN_STRINGL( "REASON_" #v , sizeof( "REASON_" #v ) - 1);
-PHP_METHOD(UConverter, reasonText) {
+U_CFUNC PHP_METHOD(UConverter, reasonText) {
 	zend_long reason;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -682,7 +682,7 @@ PHP_METHOD(UConverter, reasonText) {
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, convert) {
+U_CFUNC PHP_METHOD(UConverter, convert) {
 	php_converter_object *objval = CONV_GET(ZEND_THIS);
 	char *str;
 	size_t str_len;
@@ -709,7 +709,7 @@ PHP_METHOD(UConverter, convert) {
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, transcode) {
+U_CFUNC PHP_METHOD(UConverter, transcode) {
 	char *str, *src, *dest;
 	size_t str_len, src_len, dest_len;
 	zval *options = nullptr;
@@ -769,7 +769,7 @@ PHP_METHOD(UConverter, transcode) {
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, getErrorCode) {
+U_CFUNC PHP_METHOD(UConverter, getErrorCode) {
 	php_converter_object *objval = CONV_GET(ZEND_THIS);
 
 	ZEND_PARSE_PARAMETERS_NONE();
@@ -779,7 +779,7 @@ PHP_METHOD(UConverter, getErrorCode) {
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, getErrorMessage) {
+U_CFUNC PHP_METHOD(UConverter, getErrorMessage) {
 	php_converter_object *objval = CONV_GET(ZEND_THIS);
 
 	ZEND_PARSE_PARAMETERS_NONE();
@@ -794,7 +794,7 @@ PHP_METHOD(UConverter, getErrorMessage) {
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, getAvailable) {
+U_CFUNC PHP_METHOD(UConverter, getAvailable) {
 	int32_t i,
 			count = ucnv_countAvailable();
 
@@ -812,7 +812,7 @@ PHP_METHOD(UConverter, getAvailable) {
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, getAliases) {
+U_CFUNC PHP_METHOD(UConverter, getAliases) {
 	char *name;
 	size_t name_len;
 	UErrorCode error = U_ZERO_ERROR;
@@ -847,7 +847,7 @@ PHP_METHOD(UConverter, getAliases) {
 /* }}} */
 
 /* {{{ */
-PHP_METHOD(UConverter, getStandards) {
+U_CFUNC PHP_METHOD(UConverter, getStandards) {
 	uint16_t i, count;
 
 	ZEND_PARSE_PARAMETERS_NONE();