diff --git a/ANNOUNCE b/ANNOUNCE
index a0766ce2a..331765ac2 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -846,6 +846,7 @@ Version 1.7.0beta64 [June 10, 2015]
     unsigned char in contrib/tools/png-fix-itxt.c). To use the "secure"
     file handling, define PNG_USE_MKSTEMP, otherwise "tmpfile()" will
     be used.
+  Removed some unused WEIGHTED_FILTER macros from png.h and pngstruct.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 5ab565e90..5b54bffa6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5141,6 +5141,7 @@ Version 1.7.0beta64 [June 10, 2015]
     unsigned char in contrib/tools/png-fix-itxt.c). To use the "secure"
     file handling, define PNG_USE_MKSTEMP, otherwise "tmpfile()" will
     be used.
+  Removed some unused WEIGHTED_FILTER macros from png.h and pngstruct.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/png.h b/png.h
index 5911fa0ae..58a81b561 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.7.0beta64, June 6, 2015
+ * libpng version 1.7.0beta64, June 10, 2015
  *
  * Copyright (c) 1998-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -12,7 +12,7 @@
  * Authors and maintainers:
  *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *   libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.7.0beta64, June 6, 2015: Glenn
+ *   libpng versions 0.97, January 1998, through 1.7.0beta64, June 10, 2015: Glenn
  *   See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -248,7 +248,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta64, June 6, 2015, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta64, June 10, 2015, are
  * Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are
  * distributed according to the same disclaimer and license as libpng-1.2.5
  * with the following individual added to the list of Contributing Authors:
@@ -360,7 +360,7 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    June 6, 2015
+ *    June 10, 2015
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
@@ -430,7 +430,7 @@
 /* Version information for png.h - this should match the version in png.c */
 #define PNG_LIBPNG_VER_STRING "1.7.0beta64"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.7.0beta64 - June 6, 2015\n"
+     " libpng version 1.7.0beta64 - June 10, 2015\n"
 
 #define PNG_LIBPNG_VER_SONUM   17
 #define PNG_LIBPNG_VER_DLLNUM  17
@@ -1757,14 +1757,6 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
     png_const_fixed_point_p filter_costs) PNG_DEPRECATED)
 #endif /*  WRITE_WEIGHTED_FILTER */
 
-/* Heuristic used for row filter selection.  These defines should NOT be
- * changed.  As of libpng-1.7.0beta62, these are no longer used.
- */
-#define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */
-#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1  /* Used by libpng < 0.95 */
-#define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */
-#define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */
-
 /* Set the library compression level.  Currently, valid values range from
  * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
  * (0 - no compression, 9 - "maximal" compression).  Note that tests have
diff --git a/pngstruct.h b/pngstruct.h
index dfe3f2b71..38256ebf5 100644
--- a/pngstruct.h
+++ b/pngstruct.h
@@ -307,16 +307,6 @@ struct png_struct_def
    png_uint_32   flush_rows; /* number of rows written since last flush */
 #endif
 
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-   png_bytep    prev_filters;        /* filter type(s) of previous row(s) */
-   png_uint_16p filter_weights;      /* weight(s) for previous line(s) */
-   png_uint_16p inv_filter_weights;  /* 1/weight(s) for previous line(s) */
-   png_uint_16p filter_costs;        /* relative filter calculation cost */
-   png_uint_16p inv_filter_costs;    /* 1/relative filter calculation cost */
-   png_byte     heuristic_method;    /* heuristic for row filter selection */
-   png_byte     num_prev_filters;    /* number of weights for previous rows */
-#endif
-
 #ifdef PNG_WRITE_SUPPORTED
    png_byte     usr_bit_depth;       /* bit depth of users row */
    png_byte     usr_channels;        /* channels at start of write */