diff --git a/CHANGES b/CHANGES
index c9294e818..d1932ff19 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2304,9 +2304,8 @@ version 1.4.0beta93 [November 7, 2009]
     applications (John Bowler).
   Added -DPNG_CONFIGURE_LIBPNG to the makefile CFLAGS, to prevent warnings
     about direct access to png structs by libpng functions while building
-    libpng.
-  Updated scripts/makefile* to add "-DPNG_CONFIGURE_LIBPNG" to CFLAGS.
-    They need to be tested, especially those using compilers other than gcc.
+    libpng.  The scripts/makefiles need to be tested, especially those using
+    compilers other than gcc.
   Updated projects/visualc6 and visualc71 with "/d PNG_CONFIGURE_LIBPNG".
     They should work but still need to be updated to remove
     references to pnggccrd.c or pngvcrd.c and ASM building.
diff --git a/libpng.3 b/libpng.3
index c7d522713..543882283 100644
--- a/libpng.3
+++ b/libpng.3
@@ -64,18 +64,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta93
 
 \fI\fB
 
-\fBint png_debug(int \fP\fIlevel\fP\fB, png_const_charp \fImessage\fP\fB);\fP
-
-\fI\fB
-
-\fBint png_debug1(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fIp1\fP\fB);\fP
-
-\fI\fB
-
-\fBint png_debug2(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fP\fIp1\fP\fB, \fIp2\fP\fB);\fP
-
-\fI\fB
-
 \fBvoid png_destroy_info_struct (png_structp \fP\fIpng_ptr\fP\fB, png_infopp \fIinfo_ptr_ptr\fP\fB);\fP
 
 \fI\fB
@@ -378,10 +366,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta93
 
 \fI\fB
 
-\fBvoid png_read_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_infop \fIend_info_ptr\fP\fB);\fP
-
-\fI\fB
-
 \fBvoid png_read_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 
 \fI\fB
@@ -750,10 +734,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta93
 
 \fI\fB
 
-\fBvoid png_write_destroy (png_structp \fIpng_ptr\fP\fB);\fP
-
-\fI\fB
-
 \fBvoid png_write_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
 
 \fI\fB
diff --git a/libpngpf.3 b/libpngpf.3
index 5daa2eb41..70138726c 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -97,6 +97,18 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta93
 
 \fI\fB
 
+\fBint png_debug(int \fP\fIlevel\fP\fB, png_const_charp \fImessage\fP\fB);\fP
+
+\fI\fB
+
+\fBint png_debug1(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fIp1\fP\fB);\fP
+
+\fI\fB
+
+\fBint png_debug2(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fP\fIp1\fP\fB, \fIp2\fP\fB);\fP
+
+\fI\fB
+
 \fBvoid png_decompress_chunk (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcomp_type\fP\fB, png_size_t \fP\fIchunklength\fP\fB, png_size_t \fP\fIprefix_length\fP\fB, png_size_t \fI*data_length\fP\fB);\fP
 
 \fI\fB
@@ -559,6 +571,8 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta93
 
 \fI\fB
 
+\fBvoid png_read_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_infop \fIend_info_ptr\fP\fB);\fP
+
 \fI\fB
 
 \fBvoid png_read_filter_row (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIprev_row\fP\fB, int \fIfilter\fP\fB);\fP
@@ -619,6 +633,8 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta93
 
 \fI\fB
 
+\fBvoid png_write_destroy (png_structp \fIpng_ptr\fP\fB);\fP
+
 \fI\fB
 
 \fBvoid png_write_filtered_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIfiltered_row\fP\fB);\fP