diff --git a/fun.c b/fun.c
index d8cdfa99..cdc2ff0b 100644
--- a/fun.c
+++ b/fun.c
@@ -27,33 +27,6 @@
 #include "Zend/zend_exceptions.h"
 #include "ext/spl/spl_exceptions.h"
 
-/* {{{ arginfo */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_kafka_get_err_descs, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_kafka_err2name, 0, 0, 1)
-    ZEND_ARG_INFO(0, err)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_kafka_err2str, 0, 0, 1)
-    ZEND_ARG_INFO(0, err)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_kafka_errno2err, 0, 0, 1)
-    ZEND_ARG_INFO(0, errnox)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_kafka_errno, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_kafka_thread_cnt, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_kafka_offset_tail, 0, 0, 1)
-    ZEND_ARG_INFO(0, cnt)
-ZEND_END_ARG_INFO()
-/* }}} */
-
 /* {{{ proto array rd_kafka_get_err_descs()
  * Returns the full list of error codes.
  */
@@ -194,18 +167,3 @@ PHP_FUNCTION(rd_kafka_offset_tail)
     RETURN_LONG(RD_KAFKA_OFFSET_TAIL(cnt));
 }
 /* }}} */
-
-/* {{{ rdkafka_functions[]
- */
-const zend_function_entry rdkafka_functions[] = {
-    PHP_FE(rd_kafka_get_err_descs,  arginfo_kafka_get_err_descs)
-    PHP_FE(rd_kafka_err2name,       arginfo_kafka_err2name)
-    PHP_FE(rd_kafka_err2str,        arginfo_kafka_err2str)
-    PHP_DEP_FE(rd_kafka_errno2err,      arginfo_kafka_errno2err)
-    PHP_DEP_FE(rd_kafka_errno,          arginfo_kafka_errno)
-    PHP_FE(rd_kafka_offset_tail,    arginfo_kafka_offset_tail)
-    PHP_FE(rd_kafka_thread_cnt,     arginfo_kafka_thread_cnt)
-    PHP_FE_END    /* Must be the last line in rdkafka_functions[] */
-};
-/* }}} */
-
diff --git a/fun.h b/fun.h
deleted file mode 100644
index 466141e9..00000000
--- a/fun.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-  +----------------------------------------------------------------------+
-  | php-rdkafka                                                          |
-  +----------------------------------------------------------------------+
-  | Copyright (c) 2016 Arnaud Le Blanc                                   |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.01 of the PHP license,      |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_01.txt                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | license@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Author: Arnaud Le Blanc <arnaud.lb@gmail.com>                        |
-  +----------------------------------------------------------------------+
-*/
-
-extern const zend_function_entry rdkafka_functions[];
diff --git a/fun.stub.php b/fun.stub.php
new file mode 100644
index 00000000..4d50c463
--- /dev/null
+++ b/fun.stub.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @generate-function-entries
+ * @generate-legacy-arginfo
+ */
+
+function rd_kafka_get_err_descs(): array {}
+
+function rd_kafka_err2name(int $err): ?string {}
+
+function rd_kafka_err2str(int $err): ?string {}
+
+/** @deprecated */
+function rd_kafka_errno2err(int $errnox): int {}
+
+/** @deprecated */
+function rd_kafka_errno(): int {}
+
+function rd_kafka_offset_tail(int $cnt): int {}
+
+function rd_kafka_thread_cnt(): int {}
diff --git a/fun_arginfo.h b/fun_arginfo.h
new file mode 100644
index 00000000..a5b729d2
--- /dev/null
+++ b/fun_arginfo.h
@@ -0,0 +1,45 @@
+/* This is a generated file, edit the .stub.php file instead.
+ * Stub hash: 0e1e56d853a47168a1f7f0950b674c2de6a91976 */
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rd_kafka_get_err_descs, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rd_kafka_err2name, 0, 1, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, err, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_rd_kafka_err2str arginfo_rd_kafka_err2name
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rd_kafka_errno2err, 0, 1, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, errnox, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rd_kafka_errno, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rd_kafka_offset_tail, 0, 1, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, cnt, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_rd_kafka_thread_cnt arginfo_rd_kafka_errno
+
+
+ZEND_FUNCTION(rd_kafka_get_err_descs);
+ZEND_FUNCTION(rd_kafka_err2name);
+ZEND_FUNCTION(rd_kafka_err2str);
+ZEND_FUNCTION(rd_kafka_errno2err);
+ZEND_FUNCTION(rd_kafka_errno);
+ZEND_FUNCTION(rd_kafka_offset_tail);
+ZEND_FUNCTION(rd_kafka_thread_cnt);
+
+
+static const zend_function_entry ext_functions[] = {
+	ZEND_FE(rd_kafka_get_err_descs, arginfo_rd_kafka_get_err_descs)
+	ZEND_FE(rd_kafka_err2name, arginfo_rd_kafka_err2name)
+	ZEND_FE(rd_kafka_err2str, arginfo_rd_kafka_err2str)
+	ZEND_DEP_FE(rd_kafka_errno2err, arginfo_rd_kafka_errno2err)
+	ZEND_DEP_FE(rd_kafka_errno, arginfo_rd_kafka_errno)
+	ZEND_FE(rd_kafka_offset_tail, arginfo_rd_kafka_offset_tail)
+	ZEND_FE(rd_kafka_thread_cnt, arginfo_rd_kafka_thread_cnt)
+	ZEND_FE_END
+};
diff --git a/fun_legacy_arginfo.h b/fun_legacy_arginfo.h
new file mode 100644
index 00000000..8cfb2a3d
--- /dev/null
+++ b/fun_legacy_arginfo.h
@@ -0,0 +1,44 @@
+/* This is a generated file, edit the .stub.php file instead.
+ * Stub hash: 0e1e56d853a47168a1f7f0950b674c2de6a91976 */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_rd_kafka_get_err_descs, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_rd_kafka_err2name, 0, 0, 1)
+	ZEND_ARG_INFO(0, err)
+ZEND_END_ARG_INFO()
+
+#define arginfo_rd_kafka_err2str arginfo_rd_kafka_err2name
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_rd_kafka_errno2err, 0, 0, 1)
+	ZEND_ARG_INFO(0, errnox)
+ZEND_END_ARG_INFO()
+
+#define arginfo_rd_kafka_errno arginfo_rd_kafka_get_err_descs
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_rd_kafka_offset_tail, 0, 0, 1)
+	ZEND_ARG_INFO(0, cnt)
+ZEND_END_ARG_INFO()
+
+#define arginfo_rd_kafka_thread_cnt arginfo_rd_kafka_get_err_descs
+
+
+ZEND_FUNCTION(rd_kafka_get_err_descs);
+ZEND_FUNCTION(rd_kafka_err2name);
+ZEND_FUNCTION(rd_kafka_err2str);
+ZEND_FUNCTION(rd_kafka_errno2err);
+ZEND_FUNCTION(rd_kafka_errno);
+ZEND_FUNCTION(rd_kafka_offset_tail);
+ZEND_FUNCTION(rd_kafka_thread_cnt);
+
+
+static const zend_function_entry ext_functions[] = {
+	ZEND_FE(rd_kafka_get_err_descs, arginfo_rd_kafka_get_err_descs)
+	ZEND_FE(rd_kafka_err2name, arginfo_rd_kafka_err2name)
+	ZEND_FE(rd_kafka_err2str, arginfo_rd_kafka_err2str)
+	ZEND_DEP_FE(rd_kafka_errno2err, arginfo_rd_kafka_errno2err)
+	ZEND_DEP_FE(rd_kafka_errno, arginfo_rd_kafka_errno)
+	ZEND_FE(rd_kafka_offset_tail, arginfo_rd_kafka_offset_tail)
+	ZEND_FE(rd_kafka_thread_cnt, arginfo_rd_kafka_thread_cnt)
+	ZEND_FE_END
+};
diff --git a/rdkafka.c b/rdkafka.c
index d04c3202..2e4d622b 100644
--- a/rdkafka.c
+++ b/rdkafka.c
@@ -41,11 +41,12 @@
 #include "message.h"
 #include "kafka_consumer.h"
 #include "topic_partition.h"
-#include "fun.h"
 #if PHP_VERSION_ID < 80000
 #include "rdkafka_legacy_arginfo.h"
+#include "fun_legacy_arginfo.h"
 #else
 #include "rdkafka_arginfo.h"
+#include "fun_arginfo.h"
 #endif
 
 #if RD_KAFKA_VERSION < 0x000b0000
@@ -1007,7 +1008,7 @@ PHP_MINFO_FUNCTION(rdkafka)
 zend_module_entry rdkafka_module_entry = {
     STANDARD_MODULE_HEADER,
     "rdkafka",
-    rdkafka_functions,
+    ext_functions,
     PHP_MINIT(rdkafka),
     NULL,
     NULL,