Change header protection macros to conform to standard.

Draft 3 of IEEE 1003.1 200x, "2.2 The Compilation Environment"

  All identifiers that begin with an underscore and either an uppercase
  letter or another underscore are always reserved for any use by the
  implementation.

93 files changed, 263 insertions, 260 deletions

diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h
index 1a506481ea..8b0feb739c 100644
--- a/ext/bcmath/php_bcmath.h
+++ b/ext/bcmath/php_bcmath.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_BCMATH_H
-#define _PHP_BCMATH_H
+#ifndef PHP_BCMATH_H
+#define PHP_BCMATH_H
 
 #if WITH_BCMATH
 
@@ -56,4 +56,4 @@ PHP_FUNCTION(bcscale);
 
 #endif
 
-#endif /* _PHP_BCMATH_H */
+#endif /* PHP_BCMATH_H */
diff --git a/ext/calendar/sdncal.h b/ext/calendar/sdncal.h
index f652778836..6621d13682 100644
--- a/ext/calendar/sdncal.h
+++ b/ext/calendar/sdncal.h
@@ -1,5 +1,5 @@
-#ifndef _INCLUDED_SDNCAL_H
-#define _INCLUDED_SDNCAL_H
+#ifndef SDNCAL_H
+#define SDNCAL_H
 /*
  * This code has been modified for use with PHP
  * by Shane Caraveo shane@caraveo.com
@@ -93,4 +93,4 @@ int DayOfWeek(long int sdn);
 extern char *DayNameShort[7];
 extern char *DayNameLong[7];
 
-#endif							/* _INCLUDED_SDNCAL_H */
+#endif							/* SDNCAL_H */
diff --git a/ext/com/php_COM.h b/ext/com/php_COM.h
index 64d9c16548..addb22e7a3 100644
--- a/ext/com/php_COM.h
+++ b/ext/com/php_COM.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_COM_H
-#define _PHP_COM_H
+#ifndef PHP_COM_H
+#define PHP_COM_H
 
 #if WIN32|WINNT
 
@@ -21,4 +21,4 @@ extern zend_module_entry COM_module_entry;
 
 #define phpext_COM_ptr COM_module_ptr
 
-#endif  /* _PHP_COM_H */
+#endif  /* PHP_COM_H */
diff --git a/ext/cpdf/php_cpdf.h b/ext/cpdf/php_cpdf.h
index cf7cd7dc7a..9c44e513ad 100644
--- a/ext/cpdf/php_cpdf.h
+++ b/ext/cpdf/php_cpdf.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP_CPDF_H
-#define _PHP_CPDF_H
+#ifndef PHP_CPDF_H
+#define PHP_CPDF_H
 
 #if HAVE_CPDFLIB
 
diff --git a/ext/cybercash/cybercash.h b/ext/cybercash/cybercash.h
index 24e52ba481..c910e846f4 100644
--- a/ext/cybercash/cybercash.h
+++ b/ext/cybercash/cybercash.h
@@ -27,8 +27,8 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef _CYBERCASH_H
-#define _CYBERCASH_H
+#ifndef CYBERCASH_H
+#define CYBERCASH_H
 
 
 #if HAVE_MCK
diff --git a/ext/dav/php_dav.h b/ext/dav/php_dav.h
index 3b0fbed2fb..68468ac395 100644
--- a/ext/dav/php_dav.h
+++ b/ext/dav/php_dav.h
@@ -29,10 +29,10 @@
 
 /* $Id */
 
-#ifndef _PHP_DAV_H
-# define _PHP_DAV_H
+#ifndef PHP_DAV_H
+#define PHP_DAV_H
 
-# if HAVE_MOD_DAV
+#if HAVE_MOD_DAV
 
 typedef struct {
     int foo;
@@ -41,21 +41,21 @@ typedef struct {
 } phpdav_module;
 
 extern zend_module_entry phpdav_module_entry;
-#  define phpdav_module_ptr &phpdav_module_entry
+#define phpdav_module_ptr &phpdav_module_entry
 
 int phpdav_mkcol_test_handler(request_rec *);
 
 PHP_FUNCTION(dav_set_mkcol_handlers);
 
-# else /* !HAVE_MOD_DAV */
+#else /* !HAVE_MOD_DAV */
 
-#  define phpdav_module_ptr NULL
+#define phpdav_module_ptr NULL
 
-# endif /* HAVE_MOD_DAV */
+#endif /* HAVE_MOD_DAV */
 
 #define phpext_dav_ptr phpdav_module_ptr
 
-#endif /* _PHP_DAV_H */
+#endif /* PHP_DAV_H */
 
 
 /*
diff --git a/ext/db/php_db.h b/ext/db/php_db.h
index d65a94e04d..17e396f931 100644
--- a/ext/db/php_db.h
+++ b/ext/db/php_db.h
@@ -31,8 +31,8 @@
 /* $Id$ */
 
 
-#ifndef _PHP_DB_H
-#define _PHP_DB_H
+#ifndef PHP_DB_H
+#define PHP_DB_H
 
 
 #ifndef DLEXPORT
@@ -89,4 +89,4 @@ PHP_FUNCTION(dbmdelete);
 PHP_FUNCTION(dbmfirstkey);
 PHP_FUNCTION(dbmnextkey);
 
-#endif /* _PHP_DB_H */
+#endif /* PHP_DB_H */
diff --git a/ext/dba/php_cdb.h b/ext/dba/php_cdb.h
index 5574038991..a046f0796b 100644
--- a/ext/dba/php_cdb.h
+++ b/ext/dba/php_cdb.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_CDB_H
-#define _PHP_CDB_H
+#ifndef PHP_CDB_H
+#define PHP_CDB_H
 
 #if DBA_CDB
 
diff --git a/ext/dba/php_db2.h b/ext/dba/php_db2.h
index d88582f1eb..2a95223a85 100644
--- a/ext/dba/php_db2.h
+++ b/ext/dba/php_db2.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_DB2_H
-#define _PHP_DB2_H
+#ifndef PHP_DB2_H
+#define PHP_DB2_H
 
 #if DBA_DB2
 
diff --git a/ext/dba/php_db3.h b/ext/dba/php_db3.h
index 126afe98a6..58bb0b62a0 100644
--- a/ext/dba/php_db3.h
+++ b/ext/dba/php_db3.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_DB3_H
-#define _PHP_DB3_H
+#ifndef PHP_DB3_H
+#define PHP_DB3_H
 
 #if DBA_DB3
 
diff --git a/ext/dba/php_dbm.h b/ext/dba/php_dbm.h
index e99b8cc3a0..4c963d18ed 100644
--- a/ext/dba/php_dbm.h
+++ b/ext/dba/php_dbm.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_DBM_H
-#define _PHP_DBM_H
+#ifndef PHP_DBM_H
+#define PHP_DBM_H
 
 #if DBA_DBM
 
diff --git a/ext/dba/php_gdbm.h b/ext/dba/php_gdbm.h
index 0ee6e612e7..3068404cfe 100644
--- a/ext/dba/php_gdbm.h
+++ b/ext/dba/php_gdbm.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_GDBM_H
-#define _PHP_GDBM_H
+#ifndef PHP_GDBM_H
+#define PHP_GDBM_H
 
 #if DBA_GDBM
 
diff --git a/ext/dba/php_ndbm.h b/ext/dba/php_ndbm.h
index 798916b6c7..b1ebf15af3 100644
--- a/ext/dba/php_ndbm.h
+++ b/ext/dba/php_ndbm.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_NDBM_H
-#define _PHP_NDBM_H
+#ifndef PHP_NDBM_H
+#define PHP_NDBM_H
 
 #if DBA_NDBM
 
diff --git a/ext/dbase/dbf.h b/ext/dbase/dbf.h
index 08bc70dd41..c7ee8fde71 100644
--- a/ext/dbase/dbf.h
+++ b/ext/dbase/dbf.h
@@ -13,8 +13,8 @@
  *	(c) 1986 John Wiley & Sons, Inc.
  */
 
-#ifndef	_DBF_H_
-#define	_DBF_H_
+#ifndef	DBF_H_
+#define	DBF_H_
 
 #include <stdlib.h>
 #include <string.h>
@@ -91,4 +91,4 @@ typedef struct db_head	dbhead_t;
 #include "dbf_misc.h"
 #include "dbf_rec.h"
 
-#endif	/* _DBF_H_ */
+#endif	/* DBF_H_ */
diff --git a/ext/dbase/dbf_ndx.h b/ext/dbase/dbf_ndx.h
index 3faff04025..4bc3d29641 100644
--- a/ext/dbase/dbf_ndx.h
+++ b/ext/dbase/dbf_ndx.h
@@ -12,8 +12,8 @@
  *	by Rick Spence
  */
 
-#ifndef _DBF_NDX_H_
-#define	 _DBF_NDX_H_
+#ifndef DBF_NDX_H_
+#define	 DBF_NDX_H_
 
 #include "dbf.h"
 
@@ -95,4 +95,4 @@ extern ndx_header_t *ndx_get_header(int);
 extern ndx_record_t *ndx_get_first_rec(ndx_header_t *);
 extern ndx_record_t *ndx_get_next_rec(ndx_header_t *, ndx_record_t *);
 
-#endif /* _DBF_NDX_H_ */
+#endif /* DBF_NDX_H_ */
diff --git a/ext/domxml/php_domxml.h b/ext/domxml/php_domxml.h
index 5f8201abde..3b6f1b7b94 100644
--- a/ext/domxml/php_domxml.h
+++ b/ext/domxml/php_domxml.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_DOMXML_H
-#define _PHP_DOMXML_H
+#ifndef PHP_DOMXML_H
+#define PHP_DOMXML_H
 
 #if HAVE_DOMXML
 #include <libxml/parser.h>
diff --git a/ext/ereg/php_ereg.h b/ext/ereg/php_ereg.h
index 57c403eb09..812717e1ae 100644
--- a/ext/ereg/php_ereg.h
+++ b/ext/ereg/php_ereg.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _REG_H
-#define _REG_H
+#ifndef REG_H
+#define REG_H
 
 char *php_reg_replace(const char *pattern, const char *replace, const char *string, int icase, int extended);
 
@@ -68,4 +68,4 @@ PHP_MINFO_FUNCTION(regex);
 #define REGLS_FETCH()
 #endif
 
-#endif /* _REG_H */
+#endif /* REG_H */
diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
index f4dc865163..c418c1f576 100644
--- a/ext/ereg/php_regex.h
+++ b/ext/ereg/php_regex.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_REGEX_H
-#define _PHP_REGEX_H
+#ifndef PHP_REGEX_H
+#define PHP_REGEX_H
 
 /*
  * REGEX means:
@@ -39,4 +39,4 @@
 #endif
 #endif
 
-#endif /* _PHP_REGEX_H */
+#endif /* PHP_REGEX_H */
diff --git a/ext/fdf/php_fdf.h b/ext/fdf/php_fdf.h
index cef900dc01..c02cc4c247 100644
--- a/ext/fdf/php_fdf.h
+++ b/ext/fdf/php_fdf.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP_FDF_H
-#define _PHP_FDF_H
+#ifndef PHP_FDF_H
+#define PHP_FDF_H
 
 #if HAVE_FDFLIB
 #if WIN32|WINNT
@@ -62,4 +62,4 @@ PHP_FUNCTION(fdf_add_template);
 #else
 #define phpext_fdf_ptr NULL
 #endif
-#endif /* _PHP_FDF_H */
+#endif /* PHP_FDF_H */
diff --git a/ext/ftp/ftp.h b/ext/ftp/ftp.h
index 84298d4ded..ea9a25d047 100644
--- a/ext/ftp/ftp.h
+++ b/ext/ftp/ftp.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef	_FTP_H
-#define	_FTP_H
+#ifndef	FTP_H
+#define	FTP_H
 
 #include <stdio.h>
 #ifdef HAVE_NETINET_IN_H
diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
index 3424992d37..19d1b8de76 100644
--- a/ext/gd/php_gd.h
+++ b/ext/gd/php_gd.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_GD_H
-#define _PHP_GD_H
+#ifndef PHP_GD_H
+#define PHP_GD_H
 
 #define HAVE_GDIMAGECREATEFROMPNG 1
 
@@ -159,4 +159,4 @@ static void _php_image_output_wbmp(gdImagePtr im, FILE *fp);
 
 #endif
 
-#endif /* _PHP_GD_H */
+#endif /* PHP_GD_H */
diff --git a/ext/hyperwave/debug.h b/ext/hyperwave/debug.h
index 7b6756a5ab..b596cbf522 100644
--- a/ext/hyperwave/debug.h
+++ b/ext/hyperwave/debug.h
@@ -17,6 +17,9 @@
 * -----------------
 *
 * $Log$
+* Revision 1.1  1999/04/21 23:37:47  ssb
+* moved db
+*
 * Revision 1.1.1.1  1999/04/07 21:03:29  zeev
 * PHP 4.0
 *
@@ -49,8 +52,8 @@
 *
 ****************************************************************************/
 
-#ifndef  __DEBUG_H
-#define  __DEBUG_H
+#ifndef  DEBUG_H
+#define  DEBUG_H
 
 #ifdef  DEBUG
 #    define D(x) x
@@ -191,4 +194,4 @@ typedef  int        bool;
 #define  NO      0
 #define  YES      1
 
-#endif  __DEBUG_H
+#endif  /* DEBUG_H */
diff --git a/ext/hyperwave/hg_comm.h b/ext/hyperwave/hg_comm.h
index 922740a719..31251145cb 100644
--- a/ext/hyperwave/hg_comm.h
+++ b/ext/hyperwave/hg_comm.h
@@ -25,8 +25,8 @@
 
 /* $Id$ */
 
-#ifndef _HG_COMM_H
-#define _HG_COMM_H
+#ifndef HG_COMM_H
+#define HG_COMM_H
 
 #if HYPERWAVE
 
diff --git a/ext/hyperwave/hw_error.h b/ext/hyperwave/hw_error.h
index 6c782a12f5..876bc8f869 100644
--- a/ext/hyperwave/hw_error.h
+++ b/ext/hyperwave/hw_error.h
@@ -24,8 +24,8 @@
 
 
 /* $Id$ */
-#ifndef _HW_ERROR_H
-#define _HW_ERROR_H
+#ifndef HW_ERROR_H
+#define HW_ERROR_H
 
 #if HYPERWAVE
 
diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h
index 21afab7a4d..760e63b623 100644
--- a/ext/ldap/php_ldap.h
+++ b/ext/ldap/php_ldap.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_LDAP_H
-#define _PHP_LDAP_H
+#ifndef PHP_LDAP_H
+#define PHP_LDAP_H
 
 #include <lber.h>
 #include <ldap.h>
@@ -113,4 +113,4 @@ ZEND_END_MODULE_GLOBALS(ldap)
 
 #define phpext_ldap_ptr ldap_module_ptr
 
-#endif /* _PHP_LDAP_H */
+#endif /* PHP_LDAP_H */
diff --git a/ext/msql/php_msql.h b/ext/msql/php_msql.h
index dd115727b8..8f2e436d5f 100644
--- a/ext/msql/php_msql.h
+++ b/ext/msql/php_msql.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_MSQL_H
-#define _PHP_MSQL_H
+#ifndef PHP_MSQL_H
+#define PHP_MSQL_H
 
 #if HAVE_MSQL
 
@@ -91,4 +91,4 @@ typedef struct {
 
 #define phpext_msql_ptr msql_module_ptr
 
-#endif /* _PHP_MSQL_H */
+#endif /* PHP_MSQL_H */
diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h
index 55ef9240de..46db2d9845 100644
--- a/ext/mssql/php_mssql.h
+++ b/ext/mssql/php_mssql.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_MSSQL_H
-#define _PHP_MSSQL_H
+#ifndef PHP_MSSQL_H
+#define PHP_MSSQL_H
 
 
 #if HAVE_MSSQL
@@ -154,4 +154,4 @@ extern PHP_MSSQL_API php_mssql_globals mssql_globals;
 
 #define phpext_mssql_ptr mssql_module_ptr
 
-#endif /* _PHP_MSSQL_H */
+#endif /* PHP_MSSQL_H */
diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h
index 42de8debb8..be3a88b25b 100644
--- a/ext/mysql/php_mysql.h
+++ b/ext/mysql/php_mysql.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_MYSQL_H
-#define _PHP_MYSQL_H
+#ifndef PHP_MYSQL_H
+#define PHP_MYSQL_H
 
 #ifdef PHP_WIN32
 #define PHP_MYSQL_API __declspec(dllexport)
@@ -110,4 +110,4 @@ ZEND_END_MODULE_GLOBALS(mysql)
 
 #define phpext_mysql_ptr mysql_module_ptr
 
-#endif /* _PHP_MYSQL_H */
+#endif /* PHP_MYSQL_H */
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 5d889da993..a1dfbfbb8d 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -31,8 +31,8 @@
 /* $Id */
 
 #if HAVE_OCI8
-# ifndef _PHP_OCI8_H
-#  define _PHP_OCI8_H
+# ifndef PHP_OCI8_H
+#  define PHP_OCI8_H
 # endif
 
 # if (defined(__osf__) && defined(__alpha))
diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h
index ad87e3c410..e3bd5f6b3a 100644
--- a/ext/odbc/php_odbc.h
+++ b/ext/odbc/php_odbc.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_ODBC_H
-#define _PHP_ODBC_H
+#ifndef PHP_ODBC_H
+#define PHP_ODBC_H
 
 #if HAVE_UODBC
 #define ODBCVER 0x0250
@@ -320,7 +320,7 @@ extern ZEND_API php_odbc_globals odbc_globals;
 
 #define phpext_odbc_ptr odbc_module_ptr
 
-#endif /* _PHP_ODBC_H */
+#endif /* PHP_ODBC_H */
 
 /*
  * Local variables:
diff --git a/ext/odbc/php_velocis.h b/ext/odbc/php_velocis.h
index cfcd92af62..8456a4168e 100644
--- a/ext/odbc/php_velocis.h
+++ b/ext/odbc/php_velocis.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_VELOCIS_H
-#define _PHP_VELOCIS_H
+#ifndef PHP_VELOCIS_H
+#define PHP_VELOCIS_H
 
 #if defined(HAVE_VELOCIS) && !HAVE_UODBC
 #define UNIX
@@ -94,7 +94,7 @@ extern velocis_module php_velocis_module;
 #define velocis_module_ptr NULL
 
 #endif /* HAVE_VELOCIS */
-#endif /* _PHP_VELOCIS_H */
+#endif /* PHP_VELOCIS_H */
 
 /*
  * Local variables:
diff --git a/ext/oracle/php_oracle.h b/ext/oracle/php_oracle.h
index 4e183d2008..8f4b3b38f4 100644
--- a/ext/oracle/php_oracle.h
+++ b/ext/oracle/php_oracle.h
@@ -2,8 +2,8 @@
 
 /* synced with oracle.h,v 1.40 1999/06/01 08:11:04 thies Exp $ */
 
-#ifndef _PHP_ORACLE_H
-#define _PHP_ORACLE_H
+#ifndef PHP_ORACLE_H
+#define PHP_ORACLE_H
 
 #if HAVE_ORACLE
 
@@ -132,7 +132,7 @@ typedef struct {
 
 #endif /* HAVE_ORACLE */
 
-#endif /* _PHP_ORACLE_H */
+#endif /* PHP_ORACLE_H */
 
 /*
  * Local Variables:
diff --git a/ext/pcre/pcrelib/pcre.h b/ext/pcre/pcrelib/pcre.h
index 85e2e74259..f55b44c0bf 100644
--- a/ext/pcre/pcrelib/pcre.h
+++ b/ext/pcre/pcrelib/pcre.h
@@ -4,8 +4,8 @@
 
 /* Copyright (c) 1997-2000 University of Cambridge */
 
-#ifndef _PCRE_H
-#define _PCRE_H
+#ifndef PCRE_H
+#define PCRE_H
 
 #define PCRE_MAJOR 3
 #define PCRE_MINOR 1
diff --git a/ext/pcre/pcrelib/pcreposix.h b/ext/pcre/pcrelib/pcreposix.h
index 7660acbd55..e9daaa21ca 100644
--- a/ext/pcre/pcrelib/pcreposix.h
+++ b/ext/pcre/pcrelib/pcreposix.h
@@ -4,8 +4,8 @@
 
 /* Copyright (c) 1997-2000 University of Cambridge */
 
-#ifndef _PCREPOSIX_H
-#define _PCREPOSIX_H
+#ifndef PCREPOSIX_H
+#define PCREPOSIX_H
 
 /* This is the header for the POSIX wrapper interface to the PCRE Perl-
 Compatible Regular Expression library. It defines the things POSIX says should
diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h
index d796caa1e2..addb5f1fec 100644
--- a/ext/pcre/php_pcre.h
+++ b/ext/pcre/php_pcre.h
@@ -18,8 +18,8 @@
  
 /* $Id$ */
 
-#ifndef _PHP_PCRE_H
-#define _PHP_PCRE_H
+#ifndef PHP_PCRE_H
+#define PHP_PCRE_H
 
 #if HAVE_PCRE || HAVE_BUNDLED_PCRE
 
@@ -87,4 +87,4 @@ extern ZEND_API php_pcre_globals pcre_globals;
 
 #define phpext_pcre_ptr pcre_module_ptr
 
-#endif /* _PHP_PCRE_H */
+#endif /* PHP_PCRE_H */
diff --git a/ext/pdf/php_pdf.h b/ext/pdf/php_pdf.h
index 29975c31df..f664cada96 100644
--- a/ext/pdf/php_pdf.h
+++ b/ext/pdf/php_pdf.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP_PDF_H
-#define _PHP_PDF_H
+#ifndef PHP_PDF_H
+#define PHP_PDF_H
 
 #if HAVE_PDFLIB
 
@@ -141,4 +141,4 @@ PHP_FUNCTION(pdf_get_image_height);
 #define pdf_module_ptr NULL
 #endif
 #define phpext_pdf_ptr pdf_module_ptr
-#endif /* _PHP_PDF_H */
+#endif /* PHP_PDF_H */
diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
index 4af5a8fec2..0cd96cac19 100644
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -19,8 +19,8 @@
  
 /* $Id$ */
 
-#ifndef _PHP_PGSQL_H
-#define _PHP_PGSQL_H
+#ifndef PHP_PGSQL_H
+#define PHP_PGSQL_H
 
 #if HAVE_PGSQL
 
@@ -142,4 +142,4 @@ extern PHP_PGSQL_API php_pgsql_globals pgsql_globals;
 
 #define phpext_pgsql_ptr pgsql_module_ptr
 
-#endif /* _PHP_PGSQL_H */
+#endif /* PHP_PGSQL_H */
diff --git a/ext/posix/php_posix.h b/ext/posix/php_posix.h
index 6e363f79ff..33cf2d48df 100644
--- a/ext/posix/php_posix.h
+++ b/ext/posix/php_posix.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_POSIX_H
-#define _PHP_POSIX_H
+#ifndef PHP_POSIX_H
+#define PHP_POSIX_H
 
 #if HAVE_POSIX
 #ifndef DLEXPORT
@@ -90,4 +90,4 @@ typedef struct {
 
 #define phpext_posix_ptr posix_module_ptr
 
-#endif /* _PHP_POSIX_H */
+#endif /* PHP_POSIX_H */
diff --git a/ext/readline/php_readline.h b/ext/readline/php_readline.h
index 5b821f7659..1118e13da3 100644
--- a/ext/readline/php_readline.h
+++ b/ext/readline/php_readline.h
@@ -18,8 +18,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_READLINE_H
-#define _PHP_READLINE_H
+#ifndef PHP_READLINE_H
+#define PHP_READLINE_H
 
 #if HAVE_LIBREADLINE
 #ifdef ZTS 
@@ -39,5 +39,5 @@ extern zend_module_entry readline_module_entry;
 
 #endif /* HAVE_LIBREADLINE */
 
-#endif /* _PHP_READLINE_H */
+#endif /* PHP_READLINE_H */
 
diff --git a/ext/recode/php_recode.h b/ext/recode/php_recode.h
index faaf08a867..02a470992c 100644
--- a/ext/recode/php_recode.h
+++ b/ext/recode/php_recode.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_RECODE_H
-#define _PHP_RECODE_H
+#ifndef PHP_RECODE_H
+#define PHP_RECODE_H
 
 #ifdef PHP_WIN32
 #define PHP_MYSQL_API __declspec(dllexport)
@@ -86,4 +86,4 @@ extern PHP_MYSQL_API php_recode_globals recode_globals;
 #define phpext_recode_ptr NULL
 #endif
 
-#endif /* _PHP_RECODE_H */
+#endif /* PHP_RECODE_H */
diff --git a/ext/rpc/com/php_com.h b/ext/rpc/com/php_com.h
index 64d9c16548..addb22e7a3 100644
--- a/ext/rpc/com/php_com.h
+++ b/ext/rpc/com/php_com.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_COM_H
-#define _PHP_COM_H
+#ifndef PHP_COM_H
+#define PHP_COM_H
 
 #if WIN32|WINNT
 
@@ -21,4 +21,4 @@ extern zend_module_entry COM_module_entry;
 
 #define phpext_COM_ptr COM_module_ptr
 
-#endif  /* _PHP_COM_H */
+#endif  /* PHP_COM_H */
diff --git a/ext/snmp/php_snmp.h b/ext/snmp/php_snmp.h
index 73d4124521..149246035a 100644
--- a/ext/snmp/php_snmp.h
+++ b/ext/snmp/php_snmp.h
@@ -19,8 +19,8 @@
 */
 
 /* $Id$ */
-#ifndef _PHP_SNMP_H
-#define _PHP_SNMP_H
+#ifndef PHP_SNMP_H
+#define PHP_SNMP_H
 
 #if HAVE_SNMP
 #ifndef DLEXPORT
@@ -46,4 +46,4 @@ PHP_MINFO_FUNCTION(snmp);
 
 #define phpext_snmp_ptr snmp_module_ptr
 
-#endif  /* _PHP_SNMP_H */
+#endif  /* PHP_SNMP_H */
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index ec7a2ad7ad..a5e90232f5 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _BASIC_FUNCTIONS_H
-#define _BASIC_FUNCTIONS_H
+#ifndef BASIC_FUNCTIONS_H
+#define BASIC_FUNCTIONS_H
 
 #include <sys/stat.h>
 
@@ -207,4 +207,4 @@ typedef struct {
 #define SAFE_MODE_PROTECTED_ENV_VARS	"LD_LIBRARY_PATH"
 #define SAFE_MODE_ALLOWED_ENV_VARS		"PHP_"
 
-#endif /* _BASIC_FUNCTIONS_H */
+#endif /* BASIC_FUNCTIONS_H */
diff --git a/ext/standard/cyr_convert.h b/ext/standard/cyr_convert.h
index 91eb2346ec..87d6ff8acd 100644
--- a/ext/standard/cyr_convert.h
+++ b/ext/standard/cyr_convert.h
@@ -29,12 +29,12 @@
 
 /* $Id$ */
 
-#ifndef _CYR_CONVERT_H
-#define _CYR_CONVERT_H
+#ifndef CYR_CONVERT_H
+#define CYR_CONVERT_H
 
 PHP_FUNCTION(convert_cyr_string);
 
-#endif /* _CYR_CONVERT_H */
+#endif /* CYR_CONVERT_H */
 
 
 
diff --git a/ext/standard/datetime.h b/ext/standard/datetime.h
index 6171197c61..871c25d25b 100644
--- a/ext/standard/datetime.h
+++ b/ext/standard/datetime.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _DATETIME_H
-#define _DATETIME_H
+#ifndef DATETIME_H
+#define DATETIME_H
 
 PHP_FUNCTION(time);
 PHP_FUNCTION(mktime);
@@ -54,4 +54,4 @@ void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm);
 void _php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm);
 #endif
 
-#endif /* _DATETIME_H */
+#endif /* DATETIME_H */
diff --git a/ext/standard/dl.h b/ext/standard/dl.h
index f816b72c12..be955d35df 100644
--- a/ext/standard/dl.h
+++ b/ext/standard/dl.h
@@ -32,8 +32,8 @@
 
 /* $Id$ */
 
-#ifndef _DL_H
-#define _DL_H
+#ifndef DL_H
+#define DL_H
 
 void php_dl(pval *file,int type,pval *return_value);
 
@@ -43,4 +43,4 @@ PHP_FUNCTION(dl);
 
 PHP_MINFO_FUNCTION(dl);
 
-#endif /* _DL_H */
+#endif /* DL_H */
diff --git a/ext/standard/dns.h b/ext/standard/dns.h
index 1e5b755bd8..3301df8363 100644
--- a/ext/standard/dns.h
+++ b/ext/standard/dns.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _DNS_H
-#define _DNS_H
+#ifndef DNS_H
+#define DNS_H
 
 PHP_FUNCTION(gethostbyaddr);
 PHP_FUNCTION(gethostbyname);
@@ -50,4 +50,4 @@ PHP_FUNCTION(getmxrr);
 #define INT32SZ		4
 #endif
 
-#endif /* _DNS_H */
+#endif /* DNS_H */
diff --git a/ext/standard/exec.h b/ext/standard/exec.h
index 361554b33b..4f8f1b0b37 100644
--- a/ext/standard/exec.h
+++ b/ext/standard/exec.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _EXEC_H
-#define _EXEC_H
+#ifndef EXEC_H
+#define EXEC_H
 
 PHP_FUNCTION(system);
 PHP_FUNCTION(exec);
@@ -40,4 +40,4 @@ PHP_FUNCTION(passthru);
 PHP_FUNCTION(shell_exec);
 
 char *php_escape_shell_cmd(char *);
-#endif /* _EXEC_H */
+#endif /* EXEC_H */
diff --git a/ext/standard/file.h b/ext/standard/file.h
index 17757e8fc2..d87659f17e 100644
--- a/ext/standard/file.h
+++ b/ext/standard/file.h
@@ -31,8 +31,8 @@
 
 /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */
 
-#ifndef _FILE_H
-#define _FILE_H
+#ifndef FILE_H
+#define FILE_H
 
 extern PHP_MINIT_FUNCTION(file);
 
@@ -83,4 +83,4 @@ PHPAPI int php_file_le_popen(void);
 PHPAPI int php_file_le_socket(void);
 PHPAPI int php_file_le_uploads(void);
 
-#endif /* _FILE_H */
+#endif /* FILE_H */
diff --git a/ext/standard/flock_compat.h b/ext/standard/flock_compat.h
index a94be11091..fd16f6e6bc 100644
--- a/ext/standard/flock_compat.h
+++ b/ext/standard/flock_compat.h
@@ -1,5 +1,5 @@
-#ifndef _FLOCK_COMPAT_H
-#define _FLOCK_COMPAT_H
+#ifndef FLOCK_COMPAT_H
+#define FLOCK_COMPAT_H
 
 #ifndef HAVE_FLOCK
 #	define LOCK_SH 1
@@ -26,4 +26,4 @@ int flock(int fd, int operation);
 extern int inet_aton(const char *, struct in_addr *);
 #endif
 
-#endif	/* _FLOCK_COMPAT_H */
+#endif	/* FLOCK_COMPAT_H */
diff --git a/ext/standard/fsock.h b/ext/standard/fsock.h
index 0be635232a..a386daa13f 100644
--- a/ext/standard/fsock.h
+++ b/ext/standard/fsock.h
@@ -31,8 +31,8 @@
 
 /* Synced with php 3.0 revision 1.24 1999-06-18 [ssb] */
 
-#ifndef _FSOCK_H
-#define _FSOCK_H
+#ifndef FSOCK_H
+#define FSOCK_H
 
 #ifdef PHP_WIN32
 # ifndef WINNT
@@ -119,4 +119,4 @@ typedef struct {
 #define FLS_FETCH()
 #endif
 
-#endif /* _FSOCK_H */
+#endif /* FSOCK_H */
diff --git a/ext/standard/head.h b/ext/standard/head.h
index 6207daa6fe..85785d077d 100644
--- a/ext/standard/head.h
+++ b/ext/standard/head.h
@@ -26,8 +26,8 @@
    | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
    +----------------------------------------------------------------------+
  */
-#ifndef _HEAD_H
-#define _HEAD_H
+#ifndef HEAD_H
+#define HEAD_H
 
 
 /* 
diff --git a/ext/standard/html.h b/ext/standard/html.h
index 082a0e9f08..0030de67bc 100644
--- a/ext/standard/html.h
+++ b/ext/standard/html.h
@@ -29,8 +29,8 @@
 
 /* $Id$ */
 
-#ifndef _HTML_H
-#define _HTML_H
+#ifndef HTML_H
+#define HTML_H
 
 void register_html_constants(INIT_FUNC_ARGS);
 
@@ -40,4 +40,4 @@ PHP_FUNCTION(get_html_translation_table);
 
 PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen, int all);
 
-#endif /* _HTML_H */
+#endif /* HTML_H */
diff --git a/ext/standard/info.h b/ext/standard/info.h
index cb8b2aee61..9bf5c2a002 100644
--- a/ext/standard/info.h
+++ b/ext/standard/info.h
@@ -29,8 +29,8 @@
  */
 /* $Id$ */
 
-#ifndef _INFO_H
-#define _INFO_H
+#ifndef INFO_H
+#define INFO_H
 
 #define PHP_ENTRY_NAME_COLOR "#CCCCFF"
 #define PHP_CONTENTS_COLOR "#CCCCCC"
@@ -78,4 +78,4 @@ PHPAPI void php_info_print_hr(void);
 
 void register_phpinfo_constants(INIT_FUNC_ARGS);
 
-#endif /* _INFO_H */
+#endif /* INFO_H */
diff --git a/ext/standard/microtime.h b/ext/standard/microtime.h
index c815bfca82..0ddf204850 100644
--- a/ext/standard/microtime.h
+++ b/ext/standard/microtime.h
@@ -29,11 +29,11 @@
 
 /* $Id$ */
 
-#ifndef _MICROTIME_H
-#define _MICROTIME_H
+#ifndef MICROTIME_H
+#define MICROTIME_H
 
 PHP_FUNCTION(microtime);
 PHP_FUNCTION(gettimeofday);
 PHP_FUNCTION(getrusage);
 
-#endif /* _MICROTIME_H */
+#endif /* MICROTIME_H */
diff --git a/ext/standard/pack.h b/ext/standard/pack.h
index 3550c0270b..4687cfd1ff 100644
--- a/ext/standard/pack.h
+++ b/ext/standard/pack.h
@@ -29,11 +29,11 @@
 
 /* $Id$ */
 
-#ifndef _PACK_H
-#define _PACK_H
+#ifndef PACK_H
+#define PACK_H
 
 extern PHP_MINIT_FUNCTION(pack);
 PHP_FUNCTION(pack);
 PHP_FUNCTION(unpack);
 
-#endif /* _PACK_H */
+#endif /* PACK_H */
diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h
index 3497b626fa..66bbc73844 100644
--- a/ext/standard/php_array.h
+++ b/ext/standard/php_array.h
@@ -21,8 +21,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_ARRAY_H
-#define _PHP_ARRAY_H
+#ifndef PHP_ARRAY_H
+#define PHP_ARRAY_H
 
 PHP_MINIT_FUNCTION(array);
 PHP_MSHUTDOWN_FUNCTION(array);
@@ -99,4 +99,4 @@ extern int array_globals_id;
 extern php_array_globals array_globals;
 #endif
 
-#endif /* _PHP_ARRAY_H */
+#endif /* PHP_ARRAY_H */
diff --git a/ext/standard/php_assert.h b/ext/standard/php_assert.h
index 7d0c8ddf67..8f1d425447 100644
--- a/ext/standard/php_assert.h
+++ b/ext/standard/php_assert.h
@@ -18,8 +18,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_ASSERT_H
-#define _PHP_ASSERT_H
+#ifndef PHP_ASSERT_H
+#define PHP_ASSERT_H
 
 PHP_MINIT_FUNCTION(assert);
 PHP_MSHUTDOWN_FUNCTION(assert);
@@ -29,4 +29,4 @@ PHP_MINFO_FUNCTION(assert);
 PHP_FUNCTION(assert);
 PHP_FUNCTION(assert_options);
 
-#endif /* _PHP_ASSERT_H */
+#endif /* PHP_ASSERT_H */
diff --git a/ext/standard/php_browscap.h b/ext/standard/php_browscap.h
index 04eb072582..1121f51129 100644
--- a/ext/standard/php_browscap.h
+++ b/ext/standard/php_browscap.h
@@ -28,12 +28,12 @@
  */
 
 
-#ifndef _PHP_BROWSCAP_H
-#define _PHP_BROWSCAP_H
+#ifndef PHP_BROWSCAP_H
+#define PHP_BROWSCAP_H
 
 extern PHP_MINIT_FUNCTION(browscap);
 extern PHP_MSHUTDOWN_FUNCTION(browscap);
 
 PHP_FUNCTION(get_browser);
 
-#endif /* _PHP_BROWSCAP_H */
+#endif /* PHP_BROWSCAP_H */
diff --git a/ext/standard/php_dir.h b/ext/standard/php_dir.h
index 566a97c713..6c6593b067 100644
--- a/ext/standard/php_dir.h
+++ b/ext/standard/php_dir.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_DIR_H
-#define _PHP_DIR_H
+#ifndef PHP_DIR_H
+#define PHP_DIR_H
 
 /* directory functions */
 PHP_MINIT_FUNCTION(dir);
@@ -33,4 +33,4 @@ PHP_FUNCTION(rewinddir);
 PHP_FUNCTION(readdir);
 PHP_FUNCTION(getdir);
 
-#endif /* _PHP_DIR_H */
+#endif /* PHP_DIR_H */
diff --git a/ext/standard/php_ext_syslog.h b/ext/standard/php_ext_syslog.h
index bf905fb5fc..e14d0e9e72 100644
--- a/ext/standard/php_ext_syslog.h
+++ b/ext/standard/php_ext_syslog.h
@@ -27,8 +27,8 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef _PHP_EXT_SYSLOG_H
-#define _PHP_EXT_SYSLOG_H
+#ifndef PHP_EXT_SYSLOG_H
+#define PHP_EXT_SYSLOG_H
 
 #ifdef HAVE_SYSLOG_H
 
@@ -45,4 +45,4 @@ PHP_FUNCTION(define_syslog_variables);
 
 #endif
 
-#endif /* _PHP_EXT_SYSLOG_H */
+#endif /* PHP_EXT_SYSLOG_H */
diff --git a/ext/standard/php_link.h b/ext/standard/php_link.h
index f8189e850f..01755c27f4 100644
--- a/ext/standard/php_link.h
+++ b/ext/standard/php_link.h
@@ -29,8 +29,8 @@
  */
 
 /* $Id$ */
-#ifndef _PHP_LINK_H
-#define _PHP_LINK_H
+#ifndef PHP_LINK_H
+#define PHP_LINK_H
 
 #ifdef HAVE_SYMLINK
 
@@ -41,4 +41,4 @@ PHP_FUNCTION(symlink);
 
 #endif
 
-#endif /* _PHP_LINK_H */
+#endif /* PHP_LINK_H */
diff --git a/ext/standard/php_rand.h b/ext/standard/php_rand.h
index e6c50f1745..7ef8b6d9ab 100644
--- a/ext/standard/php_rand.h
+++ b/ext/standard/php_rand.h
@@ -21,8 +21,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP_RAND_H
-#define	_PHP_RAND_H
+#ifndef PHP_RAND_H
+#define	PHP_RAND_H
 
 #include <stdlib.h>
 
@@ -36,4 +36,4 @@
 #define PHP_RAND_MAX RAND_MAX
 #endif
 
-#endif	/* _PHP_RAND_H */
+#endif	/* PHP_RAND_H */
diff --git a/ext/standard/quot_print.h b/ext/standard/quot_print.h
index c8a826a6f5..985e83a4de 100644
--- a/ext/standard/quot_print.h
+++ b/ext/standard/quot_print.h
@@ -29,9 +29,9 @@
 
 /* $Id$ */
 
-#ifndef _QUOT_PRINT_H
-#define _QUOT_PRINT_H
+#ifndef QUOT_PRINT_H
+#define QUOT_PRINT_H
 
 PHP_FUNCTION(quoted_printable_decode);
 
-#endif /* _QUOT_PRINT_H */
+#endif /* QUOT_PRINT_H */
diff --git a/ext/standard/reg.h b/ext/standard/reg.h
index 57c403eb09..812717e1ae 100644
--- a/ext/standard/reg.h
+++ b/ext/standard/reg.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _REG_H
-#define _REG_H
+#ifndef REG_H
+#define REG_H
 
 char *php_reg_replace(const char *pattern, const char *replace, const char *string, int icase, int extended);
 
@@ -68,4 +68,4 @@ PHP_MINFO_FUNCTION(regex);
 #define REGLS_FETCH()
 #endif
 
-#endif /* _REG_H */
+#endif /* REG_H */
diff --git a/ext/standard/type.h b/ext/standard/type.h
index c5c4ae6b36..c9cb00e0cf 100644
--- a/ext/standard/type.h
+++ b/ext/standard/type.h
@@ -26,8 +26,8 @@
    | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
    +----------------------------------------------------------------------+
  */
-#ifndef _TYPE_H
-#define _TYPE_H
+#ifndef TYPE_H
+#define TYPE_H
 
 extern int php_check_type(char *str);
 extern int php_check_ident_type(char *str);
diff --git a/ext/standard/uniqid.h b/ext/standard/uniqid.h
index 3666e0a8c2..9432e6b324 100644
--- a/ext/standard/uniqid.h
+++ b/ext/standard/uniqid.h
@@ -29,9 +29,9 @@
 
 /* $Id$ */
 
-#ifndef _UNIQID_H
-#define _UNIQID_H
+#ifndef UNIQID_H
+#define UNIQID_H
 
 PHP_FUNCTION(uniqid);
 
-#endif /* _UNIQID_H */
+#endif /* UNIQID_H */
diff --git a/ext/standard/url.h b/ext/standard/url.h
index 6b49640dd8..796a218b5f 100644
--- a/ext/standard/url.h
+++ b/ext/standard/url.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _URL_H
-#define _URL_H
+#ifndef URL_H
+#define URL_H
 
 typedef struct url {
 	char *scheme;
@@ -55,7 +55,7 @@ PHP_FUNCTION(urldecode);
 PHP_FUNCTION(rawurlencode);
 PHP_FUNCTION(rawurldecode);
 
-#endif /* _URL_H */
+#endif /* URL_H */
 
 /*
  * Local variables:
diff --git a/ext/swf/php_swf.h b/ext/swf/php_swf.h
index d6db4154db..6c00a97ef4 100644
--- a/ext/swf/php_swf.h
+++ b/ext/swf/php_swf.h
@@ -18,8 +18,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_SWF_H
-#define _PHP_SWF_H
+#ifndef PHP_SWF_H
+#define PHP_SWF_H
 
 #if HAVE_SWF
 
diff --git a/ext/sybase_ct/php_sybase_ct.h b/ext/sybase_ct/php_sybase_ct.h
index 3cb6fc8db1..22c41da29d 100644
--- a/ext/sybase_ct/php_sybase_ct.h
+++ b/ext/sybase_ct/php_sybase_ct.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_SYBASE_CT_H
-#define _PHP_SYBASE_CT_H
+#ifndef PHP_SYBASE_CT_H
+#define PHP_SYBASE_CT_H
 
 #if HAVE_SYBASE_CT
 
@@ -116,4 +116,4 @@ typedef struct {
 
 #define phpext_sybase_ct_ptr sybase_module_ptr
 
-#endif /* _PHP_SYBASE_CT_H */
+#endif /* PHP_SYBASE_CT_H */
diff --git a/ext/sysvsem/php_sysvsem.h b/ext/sysvsem/php_sysvsem.h
index d26195fb10..bc0d74c18e 100644
--- a/ext/sysvsem/php_sysvsem.h
+++ b/ext/sysvsem/php_sysvsem.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_SYSVSEM_H
-#define _PHP_SYSVSEM_H
+#ifndef PHP_SYSVSEM_H
+#define PHP_SYSVSEM_H
 
 #if HAVE_SYSVSEM
 
@@ -64,4 +64,4 @@ extern sysvsem_module php_sysvsem_module;
 
 #define phpext_sysvsem_ptr sysvsem_module_ptr
 
-#endif /* _PHP_SYSVSEM_H */
+#endif /* PHP_SYSVSEM_H */
diff --git a/ext/sysvshm/php_sysvshm.h b/ext/sysvshm/php_sysvshm.h
index 27c8ef6be3..6536255d8b 100644
--- a/ext/sysvshm/php_sysvshm.h
+++ b/ext/sysvshm/php_sysvshm.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_SYSVSHM_H
-#define _PHP_SYSVSHM_H
+#ifndef PHP_SYSVSHM_H
+#define PHP_SYSVSHM_H
 
 #if HAVE_SYSVSHM
 
@@ -94,4 +94,4 @@ extern sysvshm_module php_sysvshm;
 
 #define phpext_sysvshm_ptr sysvshm_module_ptr
 
-#endif /* _PHP_SYSVSHM_H */
+#endif /* PHP_SYSVSHM_H */
diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h
index 4f9b0f3eb5..a1e2db6033 100644
--- a/ext/xml/php_xml.h
+++ b/ext/xml/php_xml.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_XML_H
-#define _PHP_XML_H
+#ifndef PHP_XML_H
+#define PHP_XML_H
 
 #ifdef HAVE_LIBEXPAT
 
@@ -151,7 +151,7 @@ PHPAPI char *xml_utf8_decode(const XML_Char *, int, int *, const XML_Char *);
 #define XMLLS_FETCH()
 #endif
 
-#endif /* _PHP_XML_H */
+#endif /* PHP_XML_H */
 
 /*
  * Local variables:
diff --git a/ext/yp/php_yp.h b/ext/yp/php_yp.h
index bd9a88beee..2d44059ee4 100644
--- a/ext/yp/php_yp.h
+++ b/ext/yp/php_yp.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */ 
 
-#ifndef _PHP_YP_H
-#define _PHP_YP_H
+#ifndef PHP_YP_H
+#define PHP_YP_H
 
 #if HAVE_YP
 
@@ -53,4 +53,4 @@ PHP_MINFO_FUNCTION(yp);
 
 #define phpext_yp_ptr yp_module_ptr
 
-#endif /* _PHP_YP_H */
+#endif /* PHP_YP_H */
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h
index 9c7b322c62..e67f051f03 100644
--- a/ext/zlib/php_zlib.h
+++ b/ext/zlib/php_zlib.h
@@ -25,8 +25,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_ZLIB_H
-#define _PHP_ZLIB_H
+#ifndef PHP_ZLIB_H
+#define PHP_ZLIB_H
 
 #if HAVE_ZLIB
 
@@ -73,4 +73,4 @@ PHP_FUNCTION(gzuncompress);
 
 #define phpext_zlib_ptr zlib_module_ptr
 
-#endif /* _PHP_ZLIB_H */
+#endif /* PHP_ZLIB_H */
diff --git a/main/SAPI.h b/main/SAPI.h
index 5ed4fdb67d..2bd91421a9 100644
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -17,8 +17,8 @@
 */
 
 
-#ifndef _NEW_SAPI_H
-#define _NEW_SAPI_H
+#ifndef SAPI_H
+#define SAPI_H
 
 #include "zend.h"
 #include "zend_llist.h"
@@ -208,7 +208,7 @@ SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
 
 #define STANDARD_SAPI_MODULE_PROPERTIES NULL
 
-#endif /* _NEW_SAPI_H */
+#endif /* SAPI_H */
 
 /*
  * Local variables:
diff --git a/main/internal_functions_registry.h b/main/internal_functions_registry.h
index a06eaa349f..c34a3ec3c4 100644
--- a/main/internal_functions_registry.h
+++ b/main/internal_functions_registry.h
@@ -20,8 +20,8 @@
 
 /* $Id$ */
 
-#ifndef _INTERNAL_FUNCTIONS_REGISTRY_H
-#define _INTERNAL_FUNCTIONS_REGISTRY_H
+#ifndef INTERNAL_FUNCTIONS_REGISTRY_H
+#define INTERNAL_FUNCTIONS_REGISTRY_H
 
 extern int php_init_mime(INIT_FUNC_ARGS);
 
diff --git a/main/php.h b/main/php.h
index f1d743faab..f2d740e239 100644
--- a/main/php.h
+++ b/main/php.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_H
-#define _PHP_H
+#ifndef PHP_H
+#define PHP_H
 
 #ifdef HAVE_DMALLOC
 #include <dmalloc.h>
diff --git a/main/php_content_types.h b/main/php_content_types.h
index af512ed3ab..7752b8c121 100644
--- a/main/php_content_types.h
+++ b/main/php_content_types.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_CONTENT_TYPES_H
-#define _PHP_CONTENT_TYPES_H
+#ifndef PHP_CONTENT_TYPES_H
+#define PHP_CONTENT_TYPES_H
 
 #define DEFAULT_POST_CONTENT_TYPE "application/x-www-form-urlencoded"
 
@@ -7,4 +7,4 @@ SAPI_POST_READER_FUNC(php_default_post_reader);
 SAPI_POST_HANDLER_FUNC(php_std_post_handler);
 int php_startup_sapi_content_types(void);
 
-#endif /* _PHP_CONTENT_TYPES_H */
+#endif /* PHP_CONTENT_TYPES_H */
diff --git a/main/php_globals.h b/main/php_globals.h
index aba2b966bb..ea0e3e511b 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -17,8 +17,8 @@
 */
 
 
-#ifndef _PHP_GLOBALS_H
-#define _PHP_GLOBALS_H
+#ifndef PHP_GLOBALS_H
+#define PHP_GLOBALS_H
 
 #include "zend_globals.h"
 
@@ -115,7 +115,7 @@ struct _php_core_globals {
 };
 
 
-#endif /* _PHP_GLOBALS_H */
+#endif /* PHP_GLOBALS_H */
 
 /*
  * Local variables:
diff --git a/main/php_ini.h b/main/php_ini.h
index 47965baaa5..4fdaf126d8 100644
--- a/main/php_ini.h
+++ b/main/php_ini.h
@@ -16,8 +16,8 @@
    +----------------------------------------------------------------------+
 */
 
-#ifndef _PHP_INI_H
-#define _PHP_INI_H
+#ifndef PHP_INI_H
+#define PHP_INI_H
 
 #define PHP_INI_USER	(1<<0)
 #define PHP_INI_PERDIR	(1<<1)
@@ -155,4 +155,4 @@ PHPAPI PHP_INI_MH(OnUpdateStringUnempty);
 #define PHP_INI_STAGE_DEACTIVATE	(1<<3)
 #define PHP_INI_STAGE_RUNTIME		(1<<4)
 
-#endif /* _PHP_INI_H */
+#endif /* PHP_INI_H */
diff --git a/main/php_realpath.h b/main/php_realpath.h
index 53b72d7f60..8030f2b067 100644
--- a/main/php_realpath.h
+++ b/main/php_realpath.h
@@ -16,8 +16,8 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef _PHP_REALPATH_H_
-#define _PHP_REALPATH_H_
+#ifndef PHP_REALPATH_H
+#define PHP_REALPATH_H
 
 extern char *php_realpath(const char *path, char resolved_path []);
 
diff --git a/main/php_regex.h b/main/php_regex.h
index f4dc865163..c418c1f576 100644
--- a/main/php_regex.h
+++ b/main/php_regex.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_REGEX_H
-#define _PHP_REGEX_H
+#ifndef PHP_REGEX_H
+#define PHP_REGEX_H
 
 /*
  * REGEX means:
@@ -39,4 +39,4 @@
 #endif
 #endif
 
-#endif /* _PHP_REGEX_H */
+#endif /* PHP_REGEX_H */
diff --git a/main/php_ticks.h b/main/php_ticks.h
index 3b06448c1c..6d4bd78046 100644
--- a/main/php_ticks.h
+++ b/main/php_ticks.h
@@ -17,8 +17,8 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef _PHP_TICKS_H
-#define _PHP_TICKS_H
+#ifndef PHP_TICKS_H
+#define PHP_TICKS_H
 
 struct _php_tick_function_entry {
 	void (*func)(int count);
diff --git a/main/php_variables.h b/main/php_variables.h
index 7c36d6fd28..8eb1a2078b 100644
--- a/main/php_variables.h
+++ b/main/php_variables.h
@@ -29,8 +29,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP_VARIABLES_H
-#define _PHP_VARIABLES_H
+#ifndef PHP_VARIABLES_H
+#define PHP_VARIABLES_H
 
 #include "php.h"
 #include "SAPI.h"
@@ -46,4 +46,4 @@ PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array E
 PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array ELS_DC PLS_DC);
 
 
-#endif /* _PHP_VARIABLES_H */
+#endif /* PHP_VARIABLES_H */
diff --git a/main/rfc1867.h b/main/rfc1867.h
index b50cf46549..7e84022fe8 100644
--- a/main/rfc1867.h
+++ b/main/rfc1867.h
@@ -1,5 +1,5 @@
-#ifndef _RFC1867_H
-#define _RFC1867_H
+#ifndef RFC1867_H
+#define RFC1867_H
 
 #include "SAPI.h"
 
@@ -10,4 +10,4 @@ SAPI_POST_HANDLER_FUNC(rfc1867_post_handler);
 
 #define FILE_UPLOAD_INPUT_BUFFER_SIZE 8192
 
-#endif /* _RFC1867_H */
+#endif /* RFC1867_H */
diff --git a/main/safe_mode.h b/main/safe_mode.h
index c765a6e37d..25eba90c4f 100644
--- a/main/safe_mode.h
+++ b/main/safe_mode.h
@@ -1,5 +1,5 @@
-#ifndef _SAFE_MODE_H_
-#define _SAFE_MODE_H_
+#ifndef SAFE_MODE_H
+#define SAFE_MODE_H
 
 extern PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode);
 extern PHPAPI char *php_get_current_user(void);
diff --git a/main/snprintf.h b/main/snprintf.h
index 88900b980b..aa48093061 100644
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -16,8 +16,8 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef _PHP_SNPRINTF_H
-#define _PHP_SNPRINTF_H
+#ifndef SNPRINTF_H
+#define SNPRINTF_H
 
 #ifndef HAVE_SNPRINTF
 extern int ap_php_snprintf(char *, size_t, const char *, ...);
@@ -34,7 +34,7 @@ int php_sprintf (char* s, const char* format, ...);
 #define sprintf php_sprintf
 #endif
 
-#endif /* _PHP_SNPRINTF_H */
+#endif /* SNPRINTF_H */
 
 /*
  * Local variables:
diff --git a/sapi/apache/mod_php4.h b/sapi/apache/mod_php4.h
index 73a087b4ab..9a2efe0428 100644
--- a/sapi/apache/mod_php4.h
+++ b/sapi/apache/mod_php4.h
@@ -17,8 +17,8 @@
  */
 /* $Id$ */
 
-#ifndef _MOD_PHP4_H
-#define _MOD_PHP4_H
+#ifndef MOD_PHP4_H
+#define MOD_PHP4_H
 
 #if !defined(WIN32) && !defined(WINNT)
 #ifndef MODULE_VAR_EXPORT
@@ -40,7 +40,7 @@ extern php_apache_info_struct php_apache_info;
 #define S_IXUSR _S_IEXEC
 #endif
 
-#endif							/* _MOD_PHP4_H */
+#endif							/* MOD_PHP4_H */
 
 /*
  * Local variables:
diff --git a/win32/php_registry.h b/win32/php_registry.h
index ad722a5607..275d89edd2 100644
--- a/win32/php_registry.h
+++ b/win32/php_registry.h
@@ -1,7 +1,7 @@
-#ifndef _PHP_REGISTRY_H
-#define _PHP_REGISTRY_H
+#ifndef PHP_REGISTRY_H
+#define PHP_REGISTRY_H
 
 
 void UpdateIniFromRegistry(char *path);
 
-#endif /* _PHP_REGISTRY_H */
\ No newline at end of file
+#endif /* PHP_REGISTRY_H */
diff --git a/win32/pwd.h b/win32/pwd.h
index d0ae7ac35b..d1f66859d7 100644
--- a/win32/pwd.h
+++ b/win32/pwd.h
@@ -26,8 +26,8 @@
    #define WIN32_LEAN_AND_MEAN
    #include <windows.h>
  */
-#ifndef _PWD_H_
-#define _PWD_H_
+#ifndef PWD_H
+#define PWD_H
 #if 0
 /* This is taken care of in Windows-NT/config.h.  */
 typedef int uid_t;
diff --git a/win32/readdir.h b/win32/readdir.h
index f6c576252c..b0f1ad9e6f 100644
--- a/win32/readdir.h
+++ b/win32/readdir.h
@@ -1,5 +1,5 @@
-#ifndef _READDIR_H
-#define _READDIR_H
+#ifndef READDIR_H
+#define READDIR_H
 
 
 /*
@@ -41,4 +41,4 @@ int closedir(DIR *);
 void rewinddir(DIR *);
 
 
-#endif /* _READDIR_H */
\ No newline at end of file
+#endif /* READDIR_H */
diff --git a/win32/time.h b/win32/time.h
index b8f59ceb3a..457d4fa9e0 100644
--- a/win32/time.h
+++ b/win32/time.h
@@ -9,8 +9,8 @@
  * Modified by Shane Caraveo for PHP
  *
  *****************************************************************************/
-#ifndef _DH_TIME_H
-#define _DH_TIME_H
+#ifndef TIME_H
+#define TIME_H
 
 /* Include stuff ************************************************************ */
 #include <winsock.h>
@@ -40,4 +40,4 @@ extern int gettimeofday(struct timeval *time_Info, struct timezone *timezone_Inf
 extern int setitimer(int which, const struct itimerval *value,
 					 struct itimerval *ovalue);
 
-#endif
\ No newline at end of file
+#endif