diff --git a/pngpriv.h b/pngpriv.h
index 31aff6209..ff68b27cc 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1707,7 +1707,6 @@ PNG_INTERNAL_FUNCTION(int,png_read_finish_IDAT,(png_structrp png_ptr),
     *           is more IDAT data available the caller should output an
     *           appropriate (too much IDAT) error message.
     */
-#endif /* READ */
 
 #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 PNG_INTERNAL_FUNCTION(void,png_cache_known_unknown,(png_structrp png_ptr,
@@ -1752,6 +1751,7 @@ PNG_INTERNAL_FUNCTION(void,png_handle_chunk,(png_structrp png_ptr,
     * has returned png_chunk_process_all and all the data is available for
     * png_handle_chunk (via the libpng read callback.)
     */
+#endif /* READ */
 
 PNG_INTERNAL_FUNCTION(void,png_init_row_info,(png_structrp png_ptr),PNG_EMPTY);
    /* Set the png_struct::row_ members from the PNG file information, running
diff --git a/pngrutil.c b/pngrutil.c
index c438a0a1d..6f9d30c5c 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -824,7 +824,6 @@ png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr)
    png_ptr->interlaced = interlace_type;
    png_ptr->color_type = color_type;
    png_ptr->filter_method = filter_method;
-   png_ptr->compression_type = compression_type;
 
    png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
        color_type, interlace_type, compression_type, filter_method);
diff --git a/pngstruct.h b/pngstruct.h
index 2267e7561..c6ca8475e 100644
--- a/pngstruct.h
+++ b/pngstruct.h
@@ -391,7 +391,9 @@ struct png_struct_def
    png_uint_32 width;          /* width of image in pixels */
    png_uint_32 height;         /* height of image in pixels */
    png_uint_32 chunk_name;     /* PNG_CHUNK() id of current chunk */
+#ifdef PNG_READ_SUPPORTED
    png_uint_32 chunk_length;   /* Length (possibly remaining) in said chunk. */
+#endif /* READ */
    png_uint_32 crc;            /* current chunk CRC value */
 
    unsigned int mode                :6; /* where we are in the PNG file */
@@ -420,7 +422,6 @@ struct png_struct_def
    /* Single byte values, typically used either to save space or to hold 1-byte
     * values from the PNG chunk specifications.
     */
-   png_byte compression_type; /* file compression type (always 0) */
    png_byte filter_method;    /* file filter type (only non-0 with MNG) */
    png_byte interlaced;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
    png_byte color_type;       /* color type of file */
@@ -449,7 +450,6 @@ struct png_struct_def
     */
 #ifdef PNG_READ_SUPPORTED
    png_bytep        row_buffer;          /* primary row buffer */
-#endif /* READ */
 #if (defined(PNG_PROGRESSIVE_READ_SUPPORTED) ||\
      defined(PNG_READ_INTERLACING_SUPPORTED)) &&\
     defined(PNG_TRANSFORM_MECH_SUPPORTED)
@@ -458,11 +458,11 @@ struct png_struct_def
                                           */
 #endif /* (PROGRESSIVE_READ || READ_INTERLACING) && TRANSFORM_MECH */
 
-#ifdef PNG_READ_SUPPORTED
    png_alloc_size_t row_bytes_read;   /* Total read in row */
 #endif /* READ */
 
    png_uint_32      row_number;       /* current row in pass */
+#ifdef PNG_READ_SUPPORTED
 #ifdef PNG_READ_GAMMA_SUPPORTED
    png_fixed_point  row_gamma;        /* Gamma of final output */
 #if 0 /* NYI */
@@ -487,23 +487,22 @@ struct png_struct_def
    unsigned int invalid_info;      /* PNG_INFO_* for invalidated chunks */
    unsigned int palette_updated:1; /* png_struct::palette changed */
 #endif /* READ_TRANSFORMS */
-#ifdef PNG_WRITE_SUPPORTED
-   unsigned int write_rows     :1; /* libpng has complete rows to write */
-#endif /* WRITE */
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
    unsigned int read_started   :1; /* at least one call to png_read_row */
 #endif /* SEQUENTIAL_READ */
-#if defined (PNG_READ_INTERLACING_SUPPORTED) ||\
-    defined (PNG_WRITE_INTERLACING_SUPPORTED)
-   unsigned int do_interlace   :1; /* libpng handles the interlace */
-#  endif /* R/W INTERLACING */
-   unsigned int pass           :3; /* current (interlace) pass (0 - 6) */
-
-   /* The next two fields are just used by the IDAT process functions to store
+   /* The next field is just used by the read IDAT process functions to store
     * the state of IDAT processing; they should not be altered or used by other
     * functions.
     */
    unsigned int row_state      :2; /* state of row parsing (internal) */
+#endif /* READ */
+
+#if defined (PNG_READ_INTERLACING_SUPPORTED) ||\
+    defined (PNG_WRITE_INTERLACING_SUPPORTED)
+   unsigned int do_interlace   :1; /* libpng handles the interlace */
+#  endif /* R/W INTERLACING */
+
+   unsigned int pass           :3; /* current (interlace) pass (0 - 6) */
 
    /* The following fields are set by png_row_init to the pixel depths of the
     * pixels at various states.  If transforms are not supported they will
diff --git a/pngwutil.c b/pngwutil.c
index 3bca45c8d..4c312263d 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -2148,7 +2148,6 @@ png_write_IHDR(png_structrp png_ptr, png_uint_32 width, png_uint_32 height,
    png_ptr->color_type = png_check_byte(png_ptr, color_type);
    png_ptr->interlaced = png_check_byte(png_ptr, interlace_type);
    png_ptr->filter_method = png_check_byte(png_ptr, filter_method);
-   png_ptr->compression_type = png_check_byte(png_ptr, compression_type);
    png_ptr->width = width;
    png_ptr->height = height;