diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 1d586944977..cac92c13b32 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -327,6 +327,8 @@ function_entry basic_functions[] = {
 	PHP_FE(extension_loaded,			NULL)
 	PHP_FE(get_extension_funcs,			NULL)
 
+	PHP_FE(warn_not_available,			NULL)
+
 	PHP_FE(parse_ini_file,				NULL)
 
 	/* functions from reg.c */
@@ -2008,6 +2010,15 @@ PHP_FUNCTION(get_extension_funcs)
 /* }}} */
 
 
+
+/* This function is not directly accessible to end users */
+PHP_FUNCTION(warn_not_available)
+{
+	php_error(E_WARNING, "%s() is  not supported in this PHP build", get_active_function_name());
+    RETURN_FALSE;
+}
+
+
 /*
  * Local variables:
  * tab-width: 4
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 76b7ee5430c..c76bb54575a 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -112,6 +112,8 @@ PHP_FUNCTION(get_loaded_extensions);
 PHP_FUNCTION(extension_loaded);
 PHP_FUNCTION(get_extension_funcs);
 
+PHP_FUNCTION(warn_not_available);
+
 /* From the INI parser */
 PHP_FUNCTION(parse_ini_file);
 
diff --git a/ext/standard/php_noavail.c b/ext/standard/php_noavail.c
deleted file mode 100644
index 7a53d3f0e19..00000000000
--- a/ext/standard/php_noavail.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.02 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_02.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.               |
-   +----------------------------------------------------------------------+
-   | Authors: Hartmut Holzgraefe <hartmut@six.de>                         |
-   +----------------------------------------------------------------------+
-*/
-
-#include "php_noavail.h"
-
-PHP_FUNCTION(warn_not_available)
-{
-php_error(E_WARNING, 
-						"%s() is  not supported in this PHP build",
-						get_active_function_name());
-	RETURN_FALSE;
-}                   
diff --git a/ext/standard/php_noavail.h b/ext/standard/php_noavail.h
deleted file mode 100644
index a5dc3d78a5c..00000000000
--- a/ext/standard/php_noavail.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.02 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_02.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.               |
-   +----------------------------------------------------------------------+
-   | Authors: Hartmut Holzgraefe <hartmut@six.de>                         |
-   +----------------------------------------------------------------------+
-*/
-
-
-#ifndef _PHP_NOAVAIL
-#define _PHP_NOAVAIL
-
-#include "php.h"
-
-PHP_FUNCTION(warn_not_available);                                              
-
-#endif /* _PHP_NOAVAIL */