--- src/xfns.c.~1.587.~	2003-07-23 09:51:51.000000000 +0900
+++ src/xfns.c	2003-07-25 10:45:32.000000000 +0900
@@ -28,6 +28,14 @@ Boston, MA 02111-1307, USA.  */
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_PNG
+# if defined HAVE_LIBPNG_PNG_H
+#  include <libpng/png.h>
+# else
+#  include <png.h>
+# endif
+#endif /* HAVE_PNG */
+
 /* This makes the fields of a Display accessible, in Xlib header files.  */
 
 #define XLIB_ILLEGAL_ACCESS
@@ -7565,12 +7573,6 @@ pbm_load (f, img)
 
 #if HAVE_PNG
 
-#if defined HAVE_LIBPNG_PNG_H
-# include <libpng/png.h>
-#else
-# include <png.h>
-#endif
-
 /* Function prototypes.  */
 
 static int png_image_p P_ ((Lisp_Object object));