diff --git a/main/SAPI.c b/main/SAPI.c
index 2e33abce3b..9730d401fb 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c

diff --git a/main/SAPI.h b/main/SAPI.h
index 8f6d41423b..e3d7279785 100644
--- a/main/SAPI.h
+++ b/main/SAPI.h

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 469b5c3e6b..ce5aa60b66 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c

diff --git a/main/fopen_wrappers.h b/main/fopen_wrappers.h
index e369075168..c442d76708 100644
--- a/main/fopen_wrappers.h
+++ b/main/fopen_wrappers.h

diff --git a/main/getopt.c b/main/getopt.c
index 8841610fc6..f0d6f8cc32 100644
--- a/main/getopt.c
+++ b/main/getopt.c

diff --git a/main/internal_functions_nw.c b/main/internal_functions_nw.c
index c2e06188ac..4bf1fb20de 100644
--- a/main/internal_functions_nw.c
+++ b/main/internal_functions_nw.c

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index e692686b88..0f7aaf7c75 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c

diff --git a/main/logos.h b/main/logos.h
index e8de9ac016..e234557cb6 100644
--- a/main/logos.h
+++ b/main/logos.h

diff --git a/main/main.c b/main/main.c
index f09b3ebe81..5386a897ed 100644
--- a/main/main.c
+++ b/main/main.c

diff --git a/main/network.c b/main/network.c
index 6afc043b6e..d8996aa556 100644
--- a/main/network.c
+++ b/main/network.c

diff --git a/main/output.c b/main/output.c
index b83eceff16..db82ea10cf 100644
--- a/main/output.c
+++ b/main/output.c

diff --git a/main/php.h b/main/php.h
index f56fc17613..77d499f3db 100644
--- a/main/php.h
+++ b/main/php.h

diff --git a/main/php3_compat.h b/main/php3_compat.h
index 8c06caad63..29b6fb98bb 100644
--- a/main/php3_compat.h
+++ b/main/php3_compat.h

diff --git a/main/php_compat.h b/main/php_compat.h
index 37a9a602c0..e691afe6ad 100644
--- a/main/php_compat.h
+++ b/main/php_compat.h

diff --git a/main/php_content_types.c b/main/php_content_types.c
index 8dc55f89d7..a1daebafd9 100644
--- a/main/php_content_types.c
+++ b/main/php_content_types.c

diff --git a/main/php_content_types.h b/main/php_content_types.h
index bcef06b631..db3ce3cfc1 100644
--- a/main/php_content_types.h
+++ b/main/php_content_types.h

diff --git a/main/php_getopt.h b/main/php_getopt.h
index 2739cc9ee4..dd7f856b43 100644
--- a/main/php_getopt.h
+++ b/main/php_getopt.h

diff --git a/main/php_globals.h b/main/php_globals.h
index 889072bc11..efed5f7cf0 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h

diff --git a/main/php_ini.c b/main/php_ini.c
index 2c2a51daf1..9ed975529e 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c

diff --git a/main/php_ini.h b/main/php_ini.h
index 80034c90bd..d69793ae93 100644
--- a/main/php_ini.h
+++ b/main/php_ini.h

diff --git a/main/php_logos.c b/main/php_logos.c
index 3c1f199e6f..cc691c3601 100644
--- a/main/php_logos.c
+++ b/main/php_logos.c

diff --git a/main/php_logos.h b/main/php_logos.h
index 3c53b3d63f..ec4db54306 100644
--- a/main/php_logos.h
+++ b/main/php_logos.h

diff --git a/main/php_main.h b/main/php_main.h
index 01a1bce420..dcd5f8679f 100644
--- a/main/php_main.h
+++ b/main/php_main.h

diff --git a/main/php_memory_streams.h b/main/php_memory_streams.h
index e4eeaf4de5..ea5f8ba24f 100644
--- a/main/php_memory_streams.h
+++ b/main/php_memory_streams.h

diff --git a/main/php_network.h b/main/php_network.h
index 99392c691f..f5db18f836 100644
--- a/main/php_network.h
+++ b/main/php_network.h

diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index d212fbe59d..559bf70a61 100644
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c

diff --git a/main/php_open_temporary_file.h b/main/php_open_temporary_file.h
index 849815c630..547ac499d5 100644
--- a/main/php_open_temporary_file.h
+++ b/main/php_open_temporary_file.h

diff --git a/main/php_output.h b/main/php_output.h
index cc1211ef96..15b36d98ab 100644
--- a/main/php_output.h
+++ b/main/php_output.h

diff --git a/main/php_reentrancy.h b/main/php_reentrancy.h
index b04b83793a..4022f78cbd 100644
--- a/main/php_reentrancy.h
+++ b/main/php_reentrancy.h

diff --git a/main/php_scandir.c b/main/php_scandir.c
index 5f68b2c12e..320d108224 100644
--- a/main/php_scandir.c
+++ b/main/php_scandir.c

diff --git a/main/php_scandir.h b/main/php_scandir.h
index 204f8a834d..5c6584c616 100644
--- a/main/php_scandir.h
+++ b/main/php_scandir.h

diff --git a/main/php_sprintf.c b/main/php_sprintf.c
index 736e0c126d..29814504d6 100644
--- a/main/php_sprintf.c
+++ b/main/php_sprintf.c

diff --git a/main/php_streams.h b/main/php_streams.h
index f420d9e23c..d013214773 100755
--- a/main/php_streams.h
+++ b/main/php_streams.h

diff --git a/main/php_syslog.h b/main/php_syslog.h
index 3d5fd01c13..afd1d71181 100644
--- a/main/php_syslog.h
+++ b/main/php_syslog.h

diff --git a/main/php_ticks.c b/main/php_ticks.c
index 7823b0a277..c9fa5e4e9b 100644
--- a/main/php_ticks.c
+++ b/main/php_ticks.c

diff --git a/main/php_ticks.h b/main/php_ticks.h
index 8877c82a8c..d3d0ae1509 100644
--- a/main/php_ticks.h
+++ b/main/php_ticks.h

diff --git a/main/php_variables.c b/main/php_variables.c
index 8ce0d5115a..650b5f0219 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c

diff --git a/main/php_variables.h b/main/php_variables.h
index f4b084ea7b..5043f6049c 100644
--- a/main/php_variables.h
+++ b/main/php_variables.h

diff --git a/main/reentrancy.c b/main/reentrancy.c
index b49ba80c7f..8cfab5af06 100644
--- a/main/reentrancy.c
+++ b/main/reentrancy.c

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 9a2beefc44..fcc1850de4 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c

diff --git a/main/rfc1867.h b/main/rfc1867.h
index 333b92ed3a..0f1471c515 100644
--- a/main/rfc1867.h
+++ b/main/rfc1867.h

diff --git a/main/safe_mode.c b/main/safe_mode.c
index e14ba189f9..b791351c3b 100644
--- a/main/safe_mode.c
+++ b/main/safe_mode.c

diff --git a/main/safe_mode.h b/main/safe_mode.h
index ab4fec2561..f2e0c0af3f 100644
--- a/main/safe_mode.h
+++ b/main/safe_mode.h

diff --git a/main/snprintf.c b/main/snprintf.c
index 54820e804e..d42722c79b 100644
--- a/main/snprintf.c
+++ b/main/snprintf.c

diff --git a/main/snprintf.h b/main/snprintf.h
index 9adf0d631f..b3ea02ee82 100644
--- a/main/snprintf.h
+++ b/main/snprintf.h

diff --git a/main/spprintf.c b/main/spprintf.c
index ba88045a50..24a214734c 100644
--- a/main/spprintf.c
+++ b/main/spprintf.c

diff --git a/main/spprintf.h b/main/spprintf.h
index 9d718b7cfd..b3a0481a8d 100644
--- a/main/spprintf.h
+++ b/main/spprintf.h

diff --git a/main/streams/cast.c b/main/streams/cast.c
index 02e2282b68..eb658acb42 100644
--- a/main/streams/cast.c
+++ b/main/streams/cast.c

diff --git a/main/streams/filter.c b/main/streams/filter.c
index 3b26cd3e35..d0ea166403 100644
--- a/main/streams/filter.c
+++ b/main/streams/filter.c

diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c
index ba8459f47b..4345056dd2 100755
--- a/main/streams/glob_wrapper.c
+++ b/main/streams/glob_wrapper.c

diff --git a/main/streams/memory.c b/main/streams/memory.c
index e0b3f88990..1c850e5e1e 100644
--- a/main/streams/memory.c
+++ b/main/streams/memory.c

diff --git a/main/streams/mmap.c b/main/streams/mmap.c
index 41bfe70fe5..2dae36f977 100644
--- a/main/streams/mmap.c
+++ b/main/streams/mmap.c

diff --git a/main/streams/php_stream_context.h b/main/streams/php_stream_context.h
index ffe8acfb31..c7d3f9d492 100644
--- a/main/streams/php_stream_context.h
+++ b/main/streams/php_stream_context.h

diff --git a/main/streams/php_stream_filter_api.h b/main/streams/php_stream_filter_api.h
index 51e54ddd98..91993a62af 100644
--- a/main/streams/php_stream_filter_api.h
+++ b/main/streams/php_stream_filter_api.h

diff --git a/main/streams/php_stream_glob_wrapper.h b/main/streams/php_stream_glob_wrapper.h
index 003cbef6d1..265a09c61f 100755
--- a/main/streams/php_stream_glob_wrapper.h
+++ b/main/streams/php_stream_glob_wrapper.h

diff --git a/main/streams/php_stream_mmap.h b/main/streams/php_stream_mmap.h
index b5884f5eef..d5098c9ed0 100644
--- a/main/streams/php_stream_mmap.h
+++ b/main/streams/php_stream_mmap.h

diff --git a/main/streams/php_stream_plain_wrapper.h b/main/streams/php_stream_plain_wrapper.h
index c49393d2ef..031acc48b0 100644
--- a/main/streams/php_stream_plain_wrapper.h
+++ b/main/streams/php_stream_plain_wrapper.h

diff --git a/main/streams/php_stream_transport.h b/main/streams/php_stream_transport.h
index 0ebaab8f6b..90c0f5a3bf 100644
--- a/main/streams/php_stream_transport.h
+++ b/main/streams/php_stream_transport.h

diff --git a/main/streams/php_stream_userspace.h b/main/streams/php_stream_userspace.h
index 7d2eb0f399..a5d3684301 100644
--- a/main/streams/php_stream_userspace.h
+++ b/main/streams/php_stream_userspace.h

diff --git a/main/streams/php_streams_int.h b/main/streams/php_streams_int.h
index 90b1bc1a4e..5f96014c5a 100644
--- a/main/streams/php_streams_int.h
+++ b/main/streams/php_streams_int.h

diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 20cee91737..484150e2a7 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c

diff --git a/main/streams/streams.c b/main/streams/streams.c
index c87e89d567..366cc40183 100755
--- a/main/streams/streams.c
+++ b/main/streams/streams.c

diff --git a/main/streams/transports.c b/main/streams/transports.c
index 07d0c795e3..56b326e7c7 100644
--- a/main/streams/transports.c
+++ b/main/streams/transports.c

diff --git a/main/streams/userspace.c b/main/streams/userspace.c
index 13749effa5..b2b5c79b2f 100644
--- a/main/streams/userspace.c
+++ b/main/streams/userspace.c

diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index 778d1c7597..2ad13052eb 100644
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c

diff --git a/main/strlcat.c b/main/strlcat.c
index d4168c65f5..97e68bc0d1 100644
--- a/main/strlcat.c
+++ b/main/strlcat.c

diff --git a/main/strlcpy.c b/main/strlcpy.c
index 5b3f6faa91..f26efc1e23 100644
--- a/main/strlcpy.c
+++ b/main/strlcpy.c

diff --git a/main/win95nt.h b/main/win95nt.h
index 572901d450..bbb91a28b4 100644
--- a/main/win95nt.h
+++ b/main/win95nt.h