[svn-r7181] Purpose:

    Version update

Description:
    Removed 1.4 compatibility code in the library.

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    h5committest

46 files changed, 21 insertions, 1748 deletions

diff --git a/c++/src/H5DxferProp.cpp b/c++/src/H5DxferProp.cpp
index e663eeb..8a7b06c 100644
--- a/c++/src/H5DxferProp.cpp
+++ b/c++/src/H5DxferProp.cpp
@@ -33,30 +33,6 @@ DSetMemXferPropList::DSetMemXferPropList() : PropList( H5P_DATASET_XFER) {}
 // Copy constructor: makes a copy of the original DSetMemXferPropList object;
 DSetMemXferPropList::DSetMemXferPropList( const DSetMemXferPropList& orig ) : PropList( orig ) {}
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-// Sets type conversion and background buffers
-void DSetMemXferPropList::setBuffer( hsize_t size, void* tconv, void* bkg ) const
-{
-   herr_t ret_value = H5Pset_buffer( id, size, tconv, bkg );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::setBuffer",
-		"H5Pset_buffer failed");
-   }
-}
-
-// Reads buffer settings
-hsize_t DSetMemXferPropList::getBuffer( void** tconv, void** bkg ) const
-{
-   hsize_t buffer_size = H5Pget_buffer( id, tconv, bkg );
-   if( buffer_size == 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::getBuffer",
-		"H5Pget_buffer returned 0 for buffer size - failure");
-   }
-   return( buffer_size );
-}
-#else /* H5_WANT_H5_V1_4_COMPAT */
 // Sets type conversion and background buffers
 void DSetMemXferPropList::setBuffer( size_t size, void* tconv, void* bkg ) const
 {
@@ -79,7 +55,6 @@ size_t DSetMemXferPropList::getBuffer( void** tconv, void** bkg ) const
    }
    return( buffer_size );
 }
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 // Sets the dataset transfer property list status to TRUE or FALSE
 void DSetMemXferPropList::setPreserve( bool status ) const
@@ -107,35 +82,6 @@ bool DSetMemXferPropList::getPreserve() const
    }
 }
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-// Indicates whether to cache hyperslab blocks during I/O
-void DSetMemXferPropList::setHyperCache( bool cache, unsigned limit ) const
-{
-   herr_t ret_value = H5Pset_hyper_cache( id, cache, limit );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::setHyperCache",
-		"H5Pset_hyper_cache failed");
-   }
-}
-
-// Returns information regarding the caching of hyperslab blocks during I/O
-void DSetMemXferPropList::getHyperCache( bool& cache, unsigned& limit ) const
-{
-   unsigned temp_cache;  // C routine takes hid_t, unsigned*, unsigned*
-   herr_t ret_value = H5Pget_hyper_cache( id, &temp_cache, &limit );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("DSetMemXferPropList::getHyperCache",
-		"H5Pget_hyper_cache failed");
-   }
-   if( temp_cache > 0 )
-      cache = true;
-   else
-      cache = false;
-}
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-
 // Sets B-tree split ratios for a dataset transfer property list 
 void DSetMemXferPropList::setBtreeRatios( double left, double middle, double right ) const
 {
diff --git a/c++/src/H5DxferProp.h b/c++/src/H5DxferProp.h
index e071870..036bbb1 100644
--- a/c++/src/H5DxferProp.h
+++ b/c++/src/H5DxferProp.h
@@ -30,19 +30,11 @@ class H5_DLLCPP DSetMemXferPropList : public PropList {
 	// Copy constructor: creates a copy of a DSetMemXferPropList object
 	DSetMemXferPropList( const DSetMemXferPropList& orig );
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-	// Sets type conversion and background buffers
-	void setBuffer( hsize_t size, void* tconv, void* bkg ) const;
-
-	// Reads buffer settings
-	hsize_t getBuffer( void** tconv, void** bkg ) const;
-#else /* H5_WANT_H5_V1_4_COMPAT */
 	// Sets type conversion and background buffers
 	void setBuffer( size_t size, void* tconv, void* bkg ) const;
 
 	// Reads buffer settings
 	size_t getBuffer( void** tconv, void** bkg ) const;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 	// Sets the dataset transfer property list status to TRUE or FALSE
 	void setPreserve( bool status ) const;
@@ -50,14 +42,6 @@ class H5_DLLCPP DSetMemXferPropList : public PropList {
 	// Checks status of the dataset transfer property list
 	bool getPreserve() const;
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-	// Indicates whether to cache hyperslab blocks during I/O
-	void setHyperCache( bool cache, unsigned limit = 0 ) const;
-
-	// Returns information regarding the caching of hyperslab blocks during I/O
-	void getHyperCache( bool& cache, unsigned& limit ) const;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-
 	// Sets B-tree split ratios for a dataset transfer property list 
 	void setBtreeRatios( double left, double middle, double right ) const;
 
diff --git a/c++/src/H5FaccProp.cpp b/c++/src/H5FaccProp.cpp
index 1e33ce3..465c79a 100644
--- a/c++/src/H5FaccProp.cpp
+++ b/c++/src/H5FaccProp.cpp
@@ -203,25 +203,6 @@ void FileAccPropList::getMpi( MPI_Comm& comm, MPI_Info& info ) const
 }
 */
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-void FileAccPropList::setCache( int mdc_nelmts, int rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0 ) const
-{
-   herr_t ret_value = H5Pset_cache( id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0 );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::setCache", "H5Pset_cache failed");
-   }
-}
-
-void FileAccPropList::getCache( int& mdc_nelmts, int& rdcc_nelmts, size_t& rdcc_nbytes, double& rdcc_w0 ) const
-{
-   herr_t ret_value = H5Pget_cache( id, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0 );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileAccPropList::getCache", "H5Pget_cache failed");
-   }
-}
-#else /* H5_WANT_H5_V1_4_COMPAT */
 void FileAccPropList::setCache( int mdc_nelmts, size_t rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0 ) const
 {
    herr_t ret_value = H5Pset_cache( id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0 );
@@ -239,7 +220,6 @@ void FileAccPropList::getCache( int& mdc_nelmts, size_t& rdcc_nelmts, size_t& rd
       throw PropListIException("FileAccPropList::getCache", "H5Pget_cache failed");
    }
 }
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 void FileAccPropList::setGcReferences( unsigned gc_ref ) const
 {
diff --git a/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h
index c55d70d..91f2222 100644
--- a/c++/src/H5FaccProp.h
+++ b/c++/src/H5FaccProp.h
@@ -75,21 +75,12 @@ class H5_DLLCPP FileAccPropList : public PropList {
 	// family driver and retrieves the member's file access property list.
 	// bool getFamily( hsize_t& memb_size, FileAccPropList& memb_plist ) const;
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-	// Sets the meta data cache and raw data chunk cache parameters.
-	void setCache( int mdc_nelmts, int rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0 ) const;
-
-	// Retrieves maximum sizes of data caches and the preemption 
-	// policy value.
-	void getCache( int& mdc_nelmts, int& rdcc_nelmts, size_t& rdcc_nbytes, double& rdcc_w0 ) const;
-#else /* H5_WANT_H5_V1_4_COMPAT */
 	// Sets the meta data cache and raw data chunk cache parameters.
 	void setCache( int mdc_nelmts, size_t rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0 ) const;
 
 	// Retrieves maximum sizes of data caches and the preemption 
 	// policy value.
 	void getCache( int& mdc_nelmts, size_t& rdcc_nelmts, size_t& rdcc_nbytes, double& rdcc_w0 ) const;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 	// Sets the low-level driver to split meta data from raw data.
 	// void setSplit( FileAccPropList& meta_plist, FileAccPropList& raw_plist, 
diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp
index 404aca2..c59aa11 100644
--- a/c++/src/H5FcreatProp.cpp
+++ b/c++/src/H5FcreatProp.cpp
@@ -86,27 +86,6 @@ void FileCreatPropList::getSizes( size_t& sizeof_addr, size_t& sizeof_size ) con
    }
 }
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-void FileCreatPropList::setSymk( int ik, int lk ) const
-{
-   herr_t ret_value = H5Pset_sym_k( id, ik, lk );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileCreatPropList::setSymk", 
-		"H5Pset_sym_k failed");
-   }
-}
-
-void FileCreatPropList::getSymk( int& ik, int& lk ) const
-{
-   herr_t ret_value = H5Pget_sym_k( id, &ik, &lk );
-   if( ret_value < 0 )
-   {
-      throw PropListIException("FileCreatPropList::getSymk", 
-		"H5Pget_sym_k failed");
-   }
-}
-#else /* H5_WANT_H5_V1_4_COMPAT */
 void FileCreatPropList::setSymk( int ik, unsigned lk ) const
 {
    herr_t ret_value = H5Pset_sym_k( id, ik, lk );
@@ -126,7 +105,6 @@ void FileCreatPropList::getSymk( int& ik, unsigned& lk ) const
 		"H5Pget_sym_k failed");
    }
 }
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 void FileCreatPropList::setIstorek( int ik ) const
 {
diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h
index 79a7e25..d1ec817 100644
--- a/c++/src/H5FcreatProp.h
+++ b/c++/src/H5FcreatProp.h
@@ -47,21 +47,12 @@ class H5_DLLCPP FileCreatPropList : public PropList {
 	// file according to this file creation property list.
 	void getSizes( size_t& sizeof_addr, size_t& sizeof_size ) const;
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-	// Sets the size of parameters used to control the symbol table nodes.
-	void setSymk( int int_nodes_k, int leaf_nodes_k ) const;
-
-	// Retrieves the size of the symbol table B-tree 1/2 rank and the
-	// symbol table leaf node 1/2 size.
-	void getSymk( int& int_nodes_k, int& leaf_nodes_k ) const;
-#else /* H5_WANT_H5_V1_4_COMPAT */
 	// Sets the size of parameters used to control the symbol table nodes.
 	void setSymk( int int_nodes_k, unsigned leaf_nodes_k ) const;
 
 	// Retrieves the size of the symbol table B-tree 1/2 rank and the
 	// symbol table leaf node 1/2 size.
 	void getSymk( int& int_nodes_k, unsigned& leaf_nodes_k ) const;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 	// Sets the size of parameter used to control the B-trees for
 	// indexing chunked datasets.
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index b92381a..0d58cd0 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -648,11 +648,7 @@ test_compression(H5File& file)
 	*/
 	TESTING("compression (app-defined method)");
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-        if (H5Zregister (H5Z_FILTER_BOGUS, "bogus", bogus)<0) goto error;
-#else /* H5_WANT_H5_V1_4_COMPAT */
         if (H5Zregister (H5Z_BOGUS)<0) goto error;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 	if (H5Pset_filter (dscreatplist.getId(), H5Z_FILTER_BOGUS, 0, 0, NULL)<0) goto error;
 	dscreatplist.setFilter (H5Z_FILTER_BOGUS, 0, 0, NULL);
 
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index 82d7338..37cc5e1 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -153,11 +153,7 @@ test_file_create(void)
     	VERIFY(parm2, F1_LENGTH_SIZE, "FileCreatPropList::getSizes");
 
     	int  iparm1;		/*file-creation parameters	*/
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    	int  iparm2;	/*file-creation parameters	*/
-#else /* H5_WANT_H5_V1_4_COMPAT */
     	unsigned  iparm2;	/*file-creation parameters	*/
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     	tmpl1.getSymk( iparm1, iparm2);
     	VERIFY(iparm1, F1_SYM_INTERN_K, "FileCreatPropList::getSymk");
     	VERIFY(iparm2, F1_SYM_LEAF_K, "FileCreatPropList::getSymk");
@@ -207,11 +203,7 @@ test_file_create(void)
     	VERIFY(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes");
 
     	int  iparm1;		/*file-creation parameters	*/
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    	int  iparm2;	/*file-creation parameters	*/
-#else /* H5_WANT_H5_V1_4_COMPAT */
     	unsigned  iparm2;	/*file-creation parameters	*/
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     	tmpl1->getSymk( iparm1, iparm2);
     	VERIFY(iparm1, F2_SYM_INTERN_K, "FileCreatPropList::getSymk");
     	VERIFY(iparm2, F2_SYM_LEAF_K, "FileCreatPropList::getSymk");
@@ -294,11 +286,7 @@ test_file_open(void)
 	VERIFY(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes");
 
 	int  iparm1;            /*file-creation parameters      */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-	int  iparm2;       /*file-creation parameters      */
-#else /* H5_WANT_H5_V1_4_COMPAT */
 	unsigned  iparm2;       /*file-creation parameters      */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 	tmpl1.getSymk( iparm1, iparm2);
 	VERIFY(iparm1, F2_SYM_INTERN_K, "FileCreatPropList::getSymk");
 	VERIFY(iparm2, F2_SYM_LEAF_K, "FileCreatPropList::getSymk");
diff --git a/doc/html/RM_H5P.html b/doc/html/RM_H5P.html
index 661325b..65ec152 100644
--- a/doc/html/RM_H5P.html
+++ b/doc/html/RM_H5P.html
@@ -233,8 +233,6 @@ which require many different parameters to be easily manipulated.
     <li><a href="#Property-SetEdcCheck">H5Pset_edc_check</a>
     <li><a href="#Property-GetEdcCheck">H5Pget_edc_check</a>
     <li><a href="#Property-SetFilterCallback">H5Pset_filter_callback</a>
-    <li><a href="#Property-SetHyperCache">H5Pset_hyper_cache</a> *
-    <li><a href="#Property-GetHyperCache">H5Pget_hyper_cache</a> *
     <li><a href="#Property-SetHyperVectorSize">H5Pset_hyper_vector_size</a>
     <li><a href="#Property-GetHyperVectorSize">H5Pget_hyper_vector_size</a>
     <li><a href="#Property-SetBTreeRatios">H5Pset_btree_ratios</a>
@@ -322,7 +320,6 @@ See further notes in the description of each function.
       <li><a href="#Property-GetFilter">H5Pget_filter</a>
       <li><a href="#Property-GetFilterById">H5Pget_filter_by_id</a>
       <li><a href="#Property-GetGCReferences">H5Pget_gc_references</a>
-      <li><a href="#Property-GetHyperCache">H5Pget_hyper_cache</a> *
       <li><a href="#Property-GetHyperVectorSize">H5Pget_hyper_vector_size</a>
       <li><a href="#Property-GetIstoreK">H5Pget_istore_k</a>
       <li><a href="#Property-GetLayout">H5Pget_layout</a>
@@ -383,7 +380,6 @@ See further notes in the description of each function.
       <li><a href="#Property-SetFilterCallback">H5Pset_filter_callback</a>
       <li><a href="#Property-SetFletcher32">H5Pset_fletcher32</a>
       <li><a href="#Property-SetGCReferences">H5Pset_gc_references</a>
-      <li><a href="#Property-SetHyperCache">H5Pset_hyper_cache</a> *
       <li><a href="#Property-SetHyperVectorSize">H5Pset_hyper_vector_size</a>
       <li><a href="#Property-SetIstoreK">H5Pset_istore_k</a>
       <li><a href="#Property-SetLayout">H5Pset_layout</a>
@@ -575,8 +571,6 @@ facilitate moving easily between them.</i>
     <li><a href="#Property-GetPreserve">h5pget_preserve_f</a> 
     <li><a href="#Property-SetEdcCheck">h5pset_edc_check_f</a>
     <li><a href="#Property-GetEdcCheck">h5pget_edc_check_f</a>
-    <li><a href="#Property-SetHyperCache">h5pset_hyper_cache_f</a>
-    <li><a href="#Property-GetHyperCache">h5pget_hyper_cache_f</a>
     <li><a href="#Property-SetHyperVectorSize">h5pset_hyper_vector_size_f</a>
     <li><a href="#Property-GetHyperVectorSize">h5pget_hyper_vector_size_f</a>
     <li><a href="#Property-SetBTreeRatios">h5pset_btree_ratios_f</a>
@@ -4724,126 +4718,6 @@ END LIBRARY-SET OPTION TAGS -->
 
 <hr>
 <dl>
-  <dt><strong>Name:</strong> <a name="Property-SetHyperCache">H5Pset_hyper_cache</a>
-  <dt><strong>Signature:</strong>
-    <dd><em>herr_t</em> <code>H5Pset_hyper_cache</code>(<em>hid_t</em> <code>plist</code>,
-        <em>unsigned</em> <code>cache</code>,
-        <em>unsigned</em> <code>limit</code>
-    )
-  <dt><strong>Purpose:</strong>
-    <dd>Indicates whether to cache hyperslab blocks during I/O.
-  <dt><strong>Description:</strong>
-    <dd>[<strong>NOTE:</strong>
-        <span class="1_4_compat">
-	This function is deprecated in HDF5 Release 1.6 
-	and will eventually be removed from the HDF5 distribution.
-        It is provided in this release only to enable backward compatibility
-        with HDF5 Releases 1.4.<i>x</i> 
-	and is enabled only if the HDF5 library is configured 
-	with the flag <code>H5_WANT_H5_V1_4_COMPAT</code>;
-        the function is not enabled in the binaries distributed by NCSA.
-        </span>]
-        <p>
-        Given a dataset transfer property list, <code>H5Pset_hyper_cache</code> 
-        indicates whether to cache hyperslab blocks during I/O, 
-        a process which can significantly increase I/O speeds.  
-        <p>
-        When working with hyperslab selections, it is possible to 
-        significantly speed up I/O operations by retrieving an 
-        entire hyperslab from the file in one operation and 
-        caching it in memory.  
-        The <code>cache</code> parameter specifies whether to turn 
-        caching on for hyperslab I/O operations.
-        If <code>cache</code> is set to <code>1</code>, 
-        caching is turned on; 
-        if set to <code>0</code>, caching is turned off.
-        <p>
-        The parameter <code>limit</code> sets the maximum size of the 
-        hyperslab block to cache.  If a block is smaller than that limit, 
-        it may still not be cached if no memory is available. 
-        Setting <code>limit</code> to <code>0</code> (zero) indicates 
-        no limitation on the size of block to attempt to cache.
-        <p>
-        The default is to cache blocks with no limit on block size 
-        for serial I/O and to not cache blocks for parallel I/O.
-  <dt><strong>Parameters:</strong>
-    <dl>
-        <dt><em>hid_t</em> <code>plist</code>
-            <dd>IN: Dataset transfer property list identifier.
-        <dt><em>unsigned</em> <code>cache</code>
-            <dd>IN: A flag indicating whether caching is to be 
-                set to on (<code>1</code>) or off (<code>0</code>).
-        <dt><em>unsigned</em> <code>limit</code>
-            <dd>IN: Maximum size of the hyperslab block to cache. 
-                <code>0</code> (zero) indicates no limit.
-    </dl>
-  <dt><strong>Returns:</strong>
-    <dd>Returns a non-negative value if successful;
-        otherwise returns a negative value.
-  <dt><strong>Non-C API(s):</strong>
-    <dd><a href="fortran/h5p_FORTRAN.html#h5pset_hyper_cache_f" 
-        target="FortranWin"><img src="Graphics/FORTRAN.gif" border=0></a>
-        <!--
-        <img src="Graphics/Java.gif"> 
-        <img src="Graphics/C++.gif">
-        -->
-</dl>
-
-
-<hr>
-<dl>
-  <dt><strong>Name:</strong> <a name="Property-GetHyperCache">H5Pget_hyper_cache</a>
-  <dt><strong>Signature:</strong>
-    <dd><em>herr_t</em> <code>H5Pget_hyper_cache</code>(<em>hid_t</em> <code>plist</code>,
-        <em>unsigned</em> *<code>cache</code>,
-        <em>unsigned</em> *<code>limit</code>
-    )
-  <dt><strong>Purpose:</strong>
-    <dd>[<strong>NOTE:</strong>
-        <span class="1_4_compat">
-	This function is deprecated in HDF5 Release 1.6 
-	and will eventually be removed from the HDF5 distribution.
-        It is provided in this release only to enable backward compatibility
-        with HDF5 Releases 1.4.<i>x</i> 
-	and is enabled only if the HDF5 library is configured 
-	with the flag <code>H5_WANT_H5_V1_4_COMPAT</code>;
-        the function is not enabled in the binaries distributed by NCSA.
-	</span>]
-        <p>
-        Returns information regarding the caching of hyperslab blocks during I/O.
-  <dt><strong>Description:</strong>
-    <dd>Given a dataset transfer property list, <code>H5Pget_hyper_cache</code> 
-        returns instructions regarding the caching of hyperslab blocks during I/O.
-        These parameters are set with the <code>H5Pset_hyper_cache</code> function.
-  <dt><strong>Parameters:</strong>
-    <dl>
-        <dt><em>hid_t</em> <code>plist</code>
-            <dd>IN: Dataset transfer property list identifier.
-        <dt><em>unsigned</em> *<code>cache</code>
-            <dd>OUT: A flag indicating whether caching is 
-                set to on (<code>1</code>) or off (<code>0</code>).
-        <dt><em>unsigned</em> *<code>limit</code>
-            <dd>OUT: Maximum size of the hyperslab block to cache. 
-                <code>0</code> (zero) indicates no limit.
-    </dl>
-  <dt><strong>Returns:</strong>
-    <dd>Returns a non-negative value if successful;
-        otherwise returns a negative value.
-  <dt><strong>Non-C API(s):</strong>
-    <dd><a href="fortran/h5p_FORTRAN.html#h5pget_hyper_cache_f" 
-        target="FortranWin"><img src="Graphics/FORTRAN.gif" border=0></a>
-        <!--
-        <img src="Graphics/Java.gif"> 
-        <img src="Graphics/C++.gif">
-        -->
-</dl>
-
-
-
-
-
-<hr>
-<dl>
   <dt><strong>Name:</strong> <a name="Property-SetHyperVectorSize">H5Pset_hyper_vector_size</a>
   <dt><strong>Signature:</strong>
     <dd><em>herr_t</em> <code>H5Pset_hyper_vector_size</code>(<em>hid_t</em> <code>dxpl_id</code>,
diff --git a/doc/html/RM_H5R.html b/doc/html/RM_H5R.html
index 4c4fece..5c2c4bd 100644
--- a/doc/html/RM_H5R.html
+++ b/doc/html/RM_H5R.html
@@ -83,7 +83,6 @@ to specific objects and data regions in an HDF5 file.
 <ul>
     <li><a href="#Reference-GetRegion">H5Rget_region</a>
     <li><a href="#Reference-GetObjType">H5Rget_obj_type</a>
-    <li><span class="1_4_compat"><a href="#Reference-GetObjectType">H5Rget_object_type</a></span> *
 </ul>
 </td><td valign=top width=20%>
 <ul>
@@ -110,7 +109,6 @@ See further notes in the description of each function.
     
     <td valign="top">
       <li><a href="#Reference-GetObjType">H5Rget_obj_type</a>
-      <li><a href="#Reference-GetObjectType">H5Rget_object_type</a> *
     </td>
     
     <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
@@ -145,7 +143,6 @@ facilitate moving easily between them.</i>
 </td><td valign=top width=40%>
 <ul>
     <li><a href="#Reference-GetRegion">h5rget_region_f</a>
-    <li><a href="#Reference-GetObjectType">h5rget_object_type_f</a>
 </ul>
 </td><td valign=top width=20%>
 <ul>
@@ -375,53 +372,7 @@ facilitate moving easily between them.</i>
     <dd>Returns an object type as defined in <code>H5Gpublic.h</code> if successful;
         otherwise returns <code>H5G_UNKNOWN</code>.
 <dt><strong>Non-C API(s):</strong>
-    <dd><a href="fortran/h5r_FORTRAN.html#h5rget_object_type_f" 
-        target="FortranWin"><img src="Graphics/FORTRAN.gif" border=0></a>
-        <!--
-        <img src="Graphics/Java.gif"> 
-        <img src="Graphics/C++.gif">
-        -->
-</dl>
-
-
-<hr>
-<dl>
-<dt><strong>Name:</strong> <a name="Reference-GetObjectType">H5Rget_object_type</a>
-<dt><strong>Signature:</strong>
-    <dd><em>int</em> <code>H5Rget_object_type</code>(<em>hid_t</em> <code>id</code>,
-    <em>void *</em><code>ref</code>
-    )
-<dt><strong>Purpose:</strong>
-    <dd>Retrieves the type of object that an object reference points to.
-<dt><strong>Description:</strong>
-    <dd>[<strong>NOTE:</strong>
-        <span class="1_4_compat">
-        This function is provided only to enable backward compatibility
-        with HDF5 Releases 1.4.<i>x</i>. 
-	This function is enabled only if the HDF5 library is configured 
-	with the flag <code>H5_WANT_H5_V1_4_COMPAT</code> and is not
-	enabled in the binaries distributed by NCSA.
-	This function has been replaced in Release 1.6 by the function 
-	<a href="#Reference-GetObjType"><code>H5Rget_obj_type</code></a>
-	and will eventually be deleted from the HDF5 distribution.</span>]
-        <p>
-	</p>Given a reference to an object <code>ref</code>, 
-        <code>H5Rget_object_type</code> returns the 
-        type of the object pointed to.
-<dt><strong>Parameters:</strong>
-    <dl>
-        <dt><em>hid_t</em> <code>id</code>,
-            <dd>IN: The dataset containing the reference object or 
-                the location identifier of the object that the dataset 
-                is located within.
-        <dt><em>void *</em><code>ref</code>
-            <dd>IN: Reference to query.
-    </dl>
-<dt><strong>Returns:</strong>
-    <dd>Returns an object type as defined in <code>H5Gpublic.h</code>;
-        otherwise returns <code>H5G_UNKNOWN</code>.
-<dt><strong>Non-C API(s):</strong>
-    <dd><a href="fortran/h5r_FORTRAN.html#h5rget_object_type_f" 
+    <dd><a href="fortran/h5r_FORTRAN.html#h5rget_obj_type_f" 
         target="FortranWin"><img src="Graphics/FORTRAN.gif" border=0></a>
         <!--
         <img src="Graphics/Java.gif"> 
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 1ca819b..98d88cb 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -660,11 +660,7 @@ nh5pget_sym_k_c (hid_t_f *prp_id, int_f* ik, int_f* lk)
      hid_t c_prp_id;
      herr_t ret;
      int c_ik;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-     int c_lk;
-#else /* H5_WANT_H5_V1_4_COMPAT */
      unsigned c_lk;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
      /*
       * Call H5Pget_sym_k function.
@@ -1666,78 +1662,6 @@ DONE:
 } 
 
 /*----------------------------------------------------------------------------
- * Name:        h5pset_hyper_cache_c
- * Purpose:     Call H5Pset__hyper_cache to indicate whether to 
- *              cache hyperslab blocks during I/O. 
- * Inputs:      prp_id - property list identifier
- *              cache - 
- *              limit - Maximum size of the hyperslab block to cache.
- *                      0 (zero) indicates no limit.
- * Returns:     0 on success, -1 on failure
- * Programmer:  Xiangyang Su
- *              Friday, February 25, 2000
- * Modifications:
- *---------------------------------------------------------------------------*/
-int_f
-nh5pset_hyper_cache_c(hid_t_f *prp_id, int_f * cache, int_f * limit)
-{
-     int ret_value = -1;
-     hid_t c_prp_id;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-     herr_t ret;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-     unsigned c_cache, c_limit;
-
-     c_cache = (unsigned) *cache;
-     c_limit = (unsigned) *limit;
-
-     /*
-      * Call H5Pset_hyper_cache function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-     ret = H5Pset_hyper_cache(c_prp_id, c_cache, c_limit);
-     if (ret < 0) return ret_value;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-     ret_value = 0;
-     return ret_value;
-} 
-
-/*----------------------------------------------------------------------------
- * Name:        h5pget_hyper_cache_c
- * Purpose:     Call H5Pget_hyper_cache to get information regarding 
- *              the caching of hyperslab blocks 
- * Inputs:      prp_id - property list identifier
- *              cache - 
- *              limit - Maximum size of the hyperslab block to cache.
- *                      0 (zero) indicates no limit.
- * Returns:     0 on success, -1 on failure
- * Programmer:  Xiangyang Su
- *              Friday, February 25, 2000
- * Modifications:
- *---------------------------------------------------------------------------*/
-int_f
-nh5pget_hyper_cache_c(hid_t_f *prp_id, int_f * cache, int_f * limit)
-{
-     int ret_value = -1;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-     hid_t c_prp_id;
-     herr_t ret;
-     unsigned c_cache, c_limit;
-     /*
-      * Call H5Pget__hyper_cache function.
-      */
-     c_prp_id = (hid_t)*prp_id;
-     ret = H5Pget_hyper_cache(c_prp_id, &c_cache, &c_limit);
-     if (ret < 0) return ret_value;
-     *cache = (int_f)c_cache;
-     *limit = (int_f)c_limit;   
-     ret_value = 0;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-     return ret_value;
-} 
-
-/*----------------------------------------------------------------------------
  * Name:        h5pset_btree_ratios_c
  * Purpose:     Call H5Pset_btree_ratios to set B-tree split ratios for B-tree split ratios for a dataset transfer property list. a 
  *              dataset transfer property list. 
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index c59ad55..e70a573 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -2970,128 +2970,6 @@
           END SUBROUTINE h5pget_external_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_hyper_cache_f 
-!
-! Purpose: 	Indicates whether to cache hyperslab blocks during I/O
-!
-! Inputs:  
-!		prp_id		- dataset transfer property list identifier
-!		cache		- A flag indicating whether caching is to 
-!				  be set to on (1) or off (0). 
-!		limit		- maximum size of the hyperslab block to
-!			          cache; 0 (zero) indicates no limit
-! Outputs:  
-!		hdferr:		- error code		
-!				 	Success:  0
-!				 	Failure: -1   
-! Optional parameters:
-!				NONE
-!
-! Programmer:	Elena Pourmal
-!		August 12, 1999	
-!
-! Modifications: 	Explicit Fortran interfaces were added for 
-!			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
-!
-! Comment:		
-!----------------------------------------------------------------------
-
-          SUBROUTINE h5pset_hyper_cache_f(prp_id, cache, limit, hdferr) 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5pset_hyper_cache_f
-!DEC$endif
-!
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-            INTEGER, INTENT(IN) :: cache !
-            INTEGER, INTENT(IN) :: limit ! Maximum size of the hyperslab block to 
-                                         !cache. 0 (zero) indicates no limit.
-            INTEGER, INTENT(OUT) :: hdferr  ! Error code
-
-!            INTEGER, EXTERNAL :: h5pset_hyper_cache_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5pset_hyper_cache_c(prp_id, cache, limit)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5PSET_HYPER_CACHE_C'::h5pset_hyper_cache_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id
-              INTEGER, INTENT(IN) :: cache 
-              INTEGER, INTENT(IN) :: limit 
-              END FUNCTION h5pset_hyper_cache_c
-            END INTERFACE
-
-            hdferr = h5pset_hyper_cache_c(prp_id, cache, limit)
-          END SUBROUTINE h5pset_hyper_cache_f
-
-!----------------------------------------------------------------------
-! Name:		h5pget_hyper_cache_f 
-!
-! Purpose: 	Returns information regarding the caching of hyperslab 
-!		blocks during I/O. 
-!
-! Inputs:  
-!		prp_id		- dataset transfer property list identifier
-! Outputs:  
-!		cache		- a flag indicating whether caching is  
-!				  set to on (1) or off (0). 
-!		limit		- maximum size of the hyperslab block to
-!			          cache; 0 (zero) indicates no limit
-!		hdferr:		- error code		
-!				 	Success:  0
-!				 	Failure: -1   
-! Optional parameters:
-!				NONE
-!
-! Programmer:	Elena Pourmal
-!		August 12, 1999	
-!
-! Modifications: 	Explicit Fortran interfaces were added for 
-!			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
-!
-! Comment:		
-!----------------------------------------------------------------------
-
-          SUBROUTINE h5pget_hyper_cache_f(prp_id, cache, limit, hdferr) 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5pget_hyper_cache_f
-!DEC$endif
-!
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-            INTEGER, INTENT(OUT) :: cache !
-            INTEGER, INTENT(OUT) :: limit ! Maximum size of the hyperslab block to 
-                                         !cache. 0 (zero) indicates no limit.
-            INTEGER, INTENT(OUT) :: hdferr  ! Error code
-
-
-!            INTEGER, EXTERNAL :: h5pget_hyper_cache_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5pget_hyper_cache_c(prp_id, cache, limit)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5PGET_HYPER_CACHE_C'::h5pget_hyper_cache_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id
-              INTEGER, INTENT(OUT) :: cache 
-              INTEGER, INTENT(OUT) :: limit 
-              END FUNCTION h5pget_hyper_cache_c
-            END INTERFACE
-
-            hdferr = h5pget_hyper_cache_c(prp_id, cache, limit)
-          END SUBROUTINE h5pget_hyper_cache_f
-
-!----------------------------------------------------------------------
 ! Name:		h5pset_btree_ratios_f 
 !
 ! Purpose: 	Sets B-tree split ratios for a dataset transfer 
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index a684644..1caa464 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -772,8 +772,6 @@ H5_DLL int_f nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag );
 #   define nh5pset_external_c         FNAME(H5PSET_EXTERNAL_C)
 #   define nh5pget_external_count_c         FNAME(H5PGET_EXTERNAL_COUNT_C)
 #   define nh5pget_external_c         FNAME(H5PGET_EXTERNAL_C)
-#   define nh5pset_hyper_cache_c         FNAME(H5PSET_HYPER_CACHE_C)
-#   define nh5pget_hyper_cache_c         FNAME(H5PGET_HYPER_CACHE_C)
 #   define nh5pget_btree_ratios_c         FNAME(H5PGET_BTREE_RATIOS_C)
 #   define nh5pset_btree_ratios_c         FNAME(H5PSET_BTREE_RATIOS_C)
 #   define nh5pset_fapl_mpio_c         FNAME(H5PSET_FAPL_MPIO_C)
@@ -881,8 +879,6 @@ H5_DLL int_f nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag );
 #   define nh5pset_external_c         FNAME(h5pset_external_c)
 #   define nh5pget_external_count_c         FNAME(h5pget_external_count_c)
 #   define nh5pget_external_c         FNAME(h5pget_external_c)
-#   define nh5pset_hyper_cache_c         FNAME(h5pset_hyper_cache_c)
-#   define nh5pget_hyper_cache_c         FNAME(h5pget_hyper_cache_c)
 #   define nh5pget_btree_ratios_c         FNAME(h5pget_btree_ratios_c)
 #   define nh5pset_btree_ratios_c         FNAME(h5pset_btree_ratios_c)
 #   define nh5pset_fapl_mpio_c         FNAME(h5pset_fapl_mpio_c)
@@ -1048,10 +1044,6 @@ H5_DLL int_f
 nh5pget_external_count_c (hid_t_f *prp_id, int_f* count);
 H5_DLL int_f
 nh5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f* name_size, _fcd name, int_f* offset, hsize_t_f*bytes);
-H5_DLL int_f
-nh5pset_hyper_cache_c(hid_t_f *prp_id, int_f* cache, int_f* limit);
-H5_DLL int_f
-nh5pget_hyper_cache_c(hid_t_f *prp_id, int_f* cache, int_f* limit);
 H5_DLL int_f 
 nh5pget_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* middle, real_f* right);
 H5_DLL int_f 
diff --git a/perform/chunk.c b/perform/chunk.c
index 0348e6d..3c159ca 100644
--- a/perform/chunk.c
+++ b/perform/chunk.c
@@ -152,11 +152,7 @@ create_dataset (void)
     dcpl = H5Pcreate (H5P_DATASET_CREATE);
     size[0] = size[1] = CH_SIZE;
     H5Pset_chunk (dcpl, 2, size);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    H5Zregister (FILTER_COUNTER, "counter", counter);
-#else /* H5_WANT_H5_V1_4_COMPAT */
     H5Zregister (H5Z_COUNTER);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     H5Pset_filter (dcpl, FILTER_COUNTER, 0, 0, NULL);
         
     /* The dataset */
@@ -198,12 +194,8 @@ test_rowmaj (int op, size_t cache_size, size_t io_size)
     signed char	*buf = calloc (1, (size_t)(SQUARE(io_size)));
     hsize_t	i, j, hs_size[2];
     hssize_t	hs_offset[2];
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int		mdc_nelmts, rdcc_nelmts;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     int		mdc_nelmts;
     size_t	rdcc_nelmts;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     double	w0;
 
     H5Pget_cache (fapl_g, &mdc_nelmts, &rdcc_nelmts, NULL, &w0);
@@ -279,12 +271,8 @@ test_diag (int op, size_t cache_size, size_t io_size, size_t offset)
     hsize_t	nio = 0;
     hssize_t	hs_offset[2];
     signed char	*buf = calloc (1, (size_t)(SQUARE (io_size)));
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int		mdc_nelmts, rdcc_nelmts;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     int		mdc_nelmts;
     size_t	rdcc_nelmts;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     double	w0;
 
     H5Pget_cache (fapl_g, &mdc_nelmts, &rdcc_nelmts, NULL, &w0);
diff --git a/perform/pio_engine.c b/perform/pio_engine.c
index 74e5f02..b4dd5b8 100644
--- a/perform/pio_engine.c
+++ b/perform/pio_engine.c
@@ -1516,11 +1516,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
         /* Use the appropriate VFL driver */
         if(param->h5_use_mpi_posix) {
             /* Set the file driver to the MPI-posix driver */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-            hrc = H5Pset_fapl_mpiposix(acc_tpl, pio_comm_g);
-#else /* H5_WANT_H5_V1_4_COMPAT */
             hrc = H5Pset_fapl_mpiposix(acc_tpl, pio_comm_g, use_gpfs);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
             if (hrc < 0) {
                 fprintf(stderr, "HDF5 Property List Set failed\n");
                 GOTOERROR(FAIL);
diff --git a/src/H5D.c b/src/H5D.c
index ac8d965..5cc0d52 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -156,10 +156,6 @@ H5D_init_interface(void)
     void            *def_bkgr_buf            = H5D_XFER_BKGR_BUF_DEF;   
     H5T_bkg_t       def_bkgr_buf_type        = H5D_XFER_BKGR_BUF_TYPE_DEF;     
     double          def_btree_split_ratio[3] = H5D_XFER_BTREE_SPLIT_RATIO_DEF;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    unsigned        def_hyper_cache          = H5D_XFER_HYPER_CACHE_DEF;     
-    unsigned        def_hyper_cache_lim      = H5D_XFER_HYPER_CACHE_LIM_DEF;   
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     H5MM_allocate_t def_vlen_alloc           = H5D_XFER_VLEN_ALLOC_DEF;     
     void            *def_vlen_alloc_info     = H5D_XFER_VLEN_ALLOC_INFO_DEF;
     H5MM_free_t     def_vlen_free            = H5D_XFER_VLEN_FREE_DEF;    
@@ -234,16 +230,6 @@ H5D_init_interface(void)
         if(H5P_register(xfer_pclass,H5D_XFER_BTREE_SPLIT_RATIO_NAME,H5D_XFER_BTREE_SPLIT_RATIO_SIZE,&def_btree_split_ratio,NULL,NULL,NULL,NULL,NULL,NULL)<0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class");
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-        /* Register the hyperslab caching property */
-        if(H5P_register(xfer_pclass,H5D_XFER_HYPER_CACHE_NAME,H5D_XFER_HYPER_CACHE_SIZE,&def_hyper_cache,NULL,NULL,NULL,NULL,NULL,NULL)<0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class");
-
-        /* Register the hyperslab cache limit property */
-        if(H5P_register(xfer_pclass,H5D_XFER_HYPER_CACHE_LIM_NAME,H5D_XFER_HYPER_CACHE_LIM_SIZE,&def_hyper_cache_lim,NULL,NULL,NULL,NULL,NULL,NULL)<0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-
         /* Register the vlen allocation function property */
         if(H5P_register(xfer_pclass,H5D_XFER_VLEN_ALLOC_NAME,H5D_XFER_VLEN_ALLOC_SIZE,&def_vlen_alloc,NULL,NULL,NULL,NULL,NULL,NULL)<0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class");
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index b1615b0..9b0191c 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -90,20 +90,6 @@
 #define H5D_XFER_BTREE_SPLIT_RATIO_NAME       "btree_split_ratio"
 #define H5D_XFER_BTREE_SPLIT_RATIO_SIZE       sizeof(double[3])
 #define H5D_XFER_BTREE_SPLIT_RATIO_DEF      {0.1, 0.5, 0.9}
-#ifdef H5_WANT_H5_V1_4_COMPAT
-/* Definitions for hyperslab caching property */
-#define H5D_XFER_HYPER_CACHE_NAME       "hyper_cache"
-#define H5D_XFER_HYPER_CACHE_SIZE       sizeof(unsigned)
-#ifndef H5_HAVE_PARALLEL
-#define H5D_XFER_HYPER_CACHE_DEF  1
-#else
-#define H5D_XFER_HYPER_CACHE_DEF  0
-#endif
-/* Definitions for hyperslab cache limit property */
-#define H5D_XFER_HYPER_CACHE_LIM_NAME       "hyper_cache_limit"
-#define H5D_XFER_HYPER_CACHE_LIM_SIZE       sizeof(unsigned)
-#define H5D_XFER_HYPER_CACHE_LIM_DEF  0
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 /* Definitions for vlen allocation function property */
 #define H5D_XFER_VLEN_ALLOC_NAME       "vlen_alloc"
 #define H5D_XFER_VLEN_ALLOC_SIZE       sizeof(H5MM_allocate_t)
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index 1073ab6..6ba47cf 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -273,54 +273,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value);
 }
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_fapl_log
- *
- * Purpose:	Modify the file access property list to use the H5FD_LOG
- *		driver defined in this source file.  There are no driver
- *		specific properties.
- *		
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Robb Matzke
- *		Thursday, February 19, 1998
- *
- * Modifications:
- *              We copy the LOGFILE value into our own access properties.
- *
- * 		Raymond Lu, 2001-10-25
- *		Changed the file access list to the new generic property list.
- *	
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_fapl_log(hid_t fapl_id, const char *logfile, int verbosity)
-{
-    H5FD_log_fapl_t	fa;     /* File access property list information */
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value;
-
-    FUNC_ENTER_API(H5Pset_fapl_log, FAIL);
-    H5TRACE3("e","isIs",fapl_id,logfile,verbosity);
-    
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
-
-    fa.logfile=logfile;
-    if(verbosity>0) {
-        fa.flags=H5FD_LOG_LOC_IO|H5FD_LOG_FLAVOR;
-        if(verbosity>1)
-            fa.flags|=H5FD_LOG_FILE_IO;
-    } /* end if */
-    fa.buf_size=32*(1024*1024);
-    ret_value= H5P_set_driver(plist, H5FD_LOG, &fa);
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-#else /* H5_WANT_H5_V1_4_COMPAT */
 
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_fapl_log
@@ -363,7 +315,6 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned flags, size_t buf_s
 done:
     FUNC_LEAVE_API(ret_value);
 }
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5FDlog.h b/src/H5FDlog.h
index 569220a..4685742 100644
--- a/src/H5FDlog.h
+++ b/src/H5FDlog.h
@@ -58,11 +58,7 @@ extern "C" {
 #endif
 
 H5_DLL hid_t H5FD_log_init(void);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-H5_DLL herr_t H5Pset_fapl_log(hid_t fapl_id, const char *logfile, int verbosity);
-#else /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned flags, size_t buf_size);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 #ifdef __cplusplus
 }
diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c
index a56a18d..7a17016 100644
--- a/src/H5FDmpiposix.c
+++ b/src/H5FDmpiposix.c
@@ -273,124 +273,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5FD_mpiposix_init() */
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_fapl_mpiposix
- *
- * Purpose:	Store the user supplied MPI communicator COMM in
- *		the file access property list FAPL_ID which can then be used
- *		to create and/or open the file.  This function is available
- *		only in the parallel HDF5 library and is not collective.
- *
- *		comm is the MPI communicator to be used for file open as
- *		defined in MPI_FILE_OPEN of MPI-2. This function makes a
- *		duplicate of comm. Any modification to comm after this function
- *		call returns has no effect on the access property list.
- *
- *              If fapl_id has previously set comm value, it will be replaced
- *              and the old communicator is freed.
- *
- * Return:	Success:	Non-negative
- * 		Failure:	Negative
- *
- * Programmer:	Quincey Koziol
- *		Thursday, July 11, 2002
- *
- * Modifications:
- *		Albert Cheng, 2003-04-24
- *		Modified the description of the function that it now stores
- *		a duplicate of the communicator.  Free the old duplicate if
- *		previously set.  (Work is actually done by H5P_set_driver.)
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm)
-{
-    H5FD_mpiposix_fapl_t	fa;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value;
-    
-    FUNC_ENTER_API(H5Pset_fapl_mpiposix, FAIL);
-    H5TRACE2("e","iMc",fapl_id,comm);
-
-    /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
-        HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access list");
-    if (MPI_COMM_NULL == comm)
-	HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a valid communicator");
-
-    /* Initialize driver specific properties */
-    fa.comm = comm;
-    fa.use_gpfs = FALSE;
-
-    /* duplication is done during driver setting. */
-    ret_value= H5P_set_driver(plist, H5FD_MPIPOSIX, &fa);
-
-done:
-    FUNC_LEAVE_API(ret_value);
-} /* end H5Pset_fapl_mpiposix() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_fapl_mpiposix
- *
- * Purpose:	If the file access property list is set to the H5FD_MPIPOSIX
- *		driver then this function returns a duplicate of the MPI
- *		communicator through the comm pointer. It is the responsibility
- *		of the application to free the returned communicator.
- *
- * Return:	Success:	Non-negative with the communicator and
- *				information returned through the COMM 
- *				argument if non-null.  Since it is a duplicate
- *				of the stored object, future modifications to
- *				the access property list do not affect it and
- *				it is the responsibility of the application to
- *				free it.
- *
- * 		Failure:	Negative
- *
- * Programmer:	Quincey Koziol
- *		Thursday, July 11, 2002
- *
- * Modifications:
- *		Albert Cheng, 2003-04-24
- *		Return duplicate of the stored communicator.
- *
- *              Bill Wendling, 2003-05-01
- *              Return the USE_GPFS flag.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/)
-{
-    H5FD_mpiposix_fapl_t	*fa;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    int		mpi_code;		/* mpi return code */
-    herr_t      ret_value=SUCCEED;      /* Return value */
-    
-    FUNC_ENTER_API(H5Pget_fapl_mpiposix, FAIL);
-    H5TRACE2("e","ix",fapl_id,comm);
-
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
-        HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access list");
-    if (H5FD_MPIPOSIX!=H5P_get_driver(plist))
-        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver");
-    if (NULL==(fa=H5P_get_driver_info(plist)))
-        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info");
-
-    /* Get MPI Communicator */
-    if (comm){
-	if (MPI_SUCCESS != (mpi_code=MPI_Comm_dup(fa->comm, comm)))
-	    HMPI_GOTO_ERROR(FAIL, "MPI_Comm_dup failed", mpi_code);
-    }
-
-done:
-    FUNC_LEAVE_API(ret_value);
-} /* end H5Pget_fapl_mpiposix() */
-#else /* H5_WANT_H5_V1_4_COMPAT */
 
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_fapl_mpiposix
@@ -514,7 +396,6 @@ H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/, hbool_t *use_gpfs/*ou
 done:
     FUNC_LEAVE_API(ret_value);
 } /* end H5Pget_fapl_mpiposix() */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5FDmpiposix.h b/src/H5FDmpiposix.h
index b4614c7..cae9370 100644
--- a/src/H5FDmpiposix.h
+++ b/src/H5FDmpiposix.h
@@ -44,13 +44,8 @@ extern "C" {
 #endif
 
 H5_DLL hid_t H5FD_mpiposix_init(void);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-H5_DLL herr_t H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm);
-H5_DLL herr_t H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/);
-#else /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm, hbool_t use_gpfs);
 H5_DLL herr_t H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/, hbool_t *use_gpfs/*out*/);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL MPI_Comm H5FD_mpiposix_communicator(H5FD_t *_file);
 H5_DLL herr_t H5FD_mpiposix_closing(H5FD_t *file);
 H5_DLL int H5FD_mpiposix_mpi_rank(H5FD_t *_file);
diff --git a/src/H5G.c b/src/H5G.c
index fb6928c..c3ecbaf 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -547,35 +547,6 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-int
-H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx)
-{
-    H5G_t		*group = NULL;
-    hsize_t             num_objs;
-    int 		ret_value = H5G_UNKNOWN;
-    
-    FUNC_ENTER_API(H5Gget_objtype_by_idx, FAIL);
-    H5TRACE2("Is","ih",group_id,idx);
-
-    /* Check args */
-    if (NULL==(group = H5I_object_verify(group_id,H5I_GROUP)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group");
-        
-    if (H5G_get_num_objs(group, &num_objs, H5AC_ind_dxpl_id)<0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to retrieve number of members");
-    if(idx >= num_objs)    
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "index out of bound");
-        
-    /*call private function*/
-    ret_value = H5G_get_objtype_by_idx(group, idx, H5AC_ind_dxpl_id);
-
-done:
-    FUNC_LEAVE_API(ret_value);
-
-}
-
-#else /*H5_WANT_H5_V1_4_COMPAT*/
 H5G_obj_t
 H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx)
 {
@@ -602,7 +573,6 @@ done:
     FUNC_LEAVE_API(ret_value);
 
 }
-#endif /*H5_WANT_H5_V1_4_COMPAT*/
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index 5a48e30..88b6c45 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -52,17 +52,6 @@ typedef enum H5G_link_t {
  * application is running.  An object may satisfy the `isa' function for more
  * than one type.
  */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-#define    H5G_UNKNOWN          -1		/* Unknown object type		*/
-#define    H5G_LINK             0		/* Object is a symbolic link	*/
-#define    H5G_GROUP            1		/* Object is a group		*/
-#define    H5G_DATASET          2		/* Object is a dataset		*/
-#define    H5G_TYPE             3		/* Object is a named data type	*/
-#define    H5G_RESERVED_4       4		/* Reserved for future use	*/
-#define    H5G_RESERVED_5       5		/* Reserved for future use	*/
-#define    H5G_RESERVED_6       6		/* Reserved for future use	*/
-#define    H5G_RESERVED_7       7		/* Reserved for future use	*/
-#else /*H5_WANT_H5_V1_4_COMPAT*/
 typedef enum H5G_obj_t {
     H5G_UNKNOWN = -1,		/* Unknown object type		*/
     H5G_LINK,		        /* Object is a symbolic link	*/
@@ -74,7 +63,6 @@ typedef enum H5G_obj_t {
     H5G_RESERVED_6,		/* Reserved for future use	*/
     H5G_RESERVED_7		/* Reserved for future use	*/
 } H5G_obj_t;    
-#endif /*H5_WANT_H5_V1_4_COMPAT*/
 
 #define H5G_NTYPES	256		/* Max possible number of types	*/
 #define H5G_NLIBTYPES	8		/* Number of internal types	*/
@@ -86,11 +74,7 @@ typedef struct H5G_stat_t {
     unsigned long 	fileno[2];	/*file number			*/
     unsigned long 	objno[2];	/*object number			*/
     unsigned 		nlink;		/*number of hard links to object*/
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int 		type;		/*basic object type		*/
-#else /*H5_WANT_H5_V1_4_COMPAT*/
     H5G_obj_t 		type;		/*basic object type		*/
-#endif /*H5_WANT_H5_V1_4_COMPAT*/
     time_t		mtime;		/*modification time		*/
     size_t		linklen;	/*symbolic link value length	*/
 } H5G_stat_t;
@@ -111,11 +95,7 @@ H5_DLL herr_t H5Giterate(hid_t loc_id, const char *name, int *idx,
 			  H5G_iterate_t op, void *op_data);
 H5_DLL herr_t H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs);
 H5_DLL ssize_t H5Gget_objname_by_idx(hid_t group_id, hsize_t idx, char* name, size_t size);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-H5_DLL int H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx);
-#else /*H5_WANT_H5_V1_4_COMPAT*/
 H5_DLL H5G_obj_t H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx);
-#endif /*H5_WANT_H5_V1_4_COMPAT*/
 H5_DLL herr_t H5Gmove2(hid_t src_loc, const char *src, hid_t dst_loc, 
 			const char *dst);
 H5_DLL herr_t H5Glink2(hid_t src_loc, const char *cur_name, H5G_link_t type,
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 6c042c8..3805c68 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -31,112 +31,6 @@ static int             interface_initialize_g = 0;
 
 /* Static function prototypes */
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_buffer
- *
- * Purpose:	Given a dataset transfer property list, set the maximum size
- *		for the type conversion buffer and background buffer and
- *		optionally supply pointers to application-allocated buffers.
- *		If the buffer size is smaller than the entire amount of data
- *		being transfered between application and file, and a type
- *		conversion buffer or background buffer is required then
- *		strip mining will be used.
- *
- *		If TCONV and/or BKG are null pointers then buffers will be
- *		allocated and freed during the data transfer.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Robb Matzke
- *              Monday, March 16, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_buffer(hid_t plist_id, hsize_t _size, void *tconv, void *bkg)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    size_t size=(size_t)_size;  /* Work around size difference */
-    herr_t ret_value=SUCCEED;   /* return value */
-
-    FUNC_ENTER_API(H5Pset_buffer, FAIL);
-    H5TRACE4("e","ihxx",plist_id,_size,tconv,bkg);
-
-    /* Check arguments */
-    if (size<=0)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "buffer size must not be zero");
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Update property list */
-    if(H5P_set(plist, H5D_XFER_MAX_TEMP_BUF_NAME, &size)<0)
-        HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, FAIL, "Can't set transfer buffer size");
-    if(H5P_set(plist, H5D_XFER_TCONV_BUF_NAME, &tconv)<0)
-        HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, FAIL, "Can't set transfer type conversion buffer");
-    if(H5P_set(plist, H5D_XFER_BKGR_BUF_NAME, &bkg)<0)
-        HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, FAIL, "Can't set background type conversion buffer");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_buffer
- *
- * Purpose:	Reads values previously set with H5Pset_buffer().
- *
- * Return:	Success:	Buffer size.
- *
- *		Failure:	0
- *
- * Programmer:	Robb Matzke
- *              Monday, March 16, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-hsize_t
-H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    size_t size;                /* Type conversion buffer size */
-    hsize_t ret_value;          /* Return value */
-
-    FUNC_ENTER_API(H5Pget_buffer, 0);
-    H5TRACE3("h","ixx",plist_id,tconv,bkg);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, 0, "can't find object for ID");
-
-    /* Return values */
-    if (tconv)
-        if(H5P_get(plist, H5D_XFER_TCONV_BUF_NAME, tconv)<0)
-            HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, 0, "Can't get transfer type conversion buffer");
-    if (bkg)
-        if(H5P_get(plist, H5D_XFER_BKGR_BUF_NAME, bkg)<0)
-            HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, 0, "Can't get background type conversion buffer");
-
-    /* Get the size */
-    if(H5P_get(plist, H5D_XFER_MAX_TEMP_BUF_NAME, &size)<0)
-        HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, 0, "Can't set transfer buffer size");
-
-    /* Set the return value */
-    ret_value=(hsize_t)size;
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-
-#else /* H5_WANT_H5_V1_4_COMPAT */
 
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_buffer
@@ -240,99 +134,6 @@ done:
     FUNC_LEAVE_API(ret_value);
 }
 
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-
-#ifdef H5_WANT_H5_V1_4_COMPAT
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_hyper_cache
- *
- * Purpose:	Given a dataset transfer property list, indicate whether to
- *		cache the hyperslab blocks during the I/O (which speeds
- *		things up) and the maximum size of the hyperslab block to
- *		cache.  If a block is smaller than to limit, it may still not
- *		be cached if no memory is available. Setting the limit to 0
- *		indicates no limitation on the size of block to attempt to
- *		cache.
- *
- *		The default is to cache blocks with no limit on block size
- *		for serial I/O and to not cache blocks for parallel I/O
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Monday, September 21, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_hyper_cache(hid_t plist_id, unsigned cache, unsigned limit)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;
-
-    FUNC_ENTER_API(H5Pset_hyper_cache, FAIL);
-    H5TRACE3("e","iIuIu",plist_id,cache,limit);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Update property list */
-    cache = (cache>0) ? 1 : 0;
-    if (H5P_set(plist,H5D_XFER_HYPER_CACHE_NAME,&cache)<0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to set value");
-    if (H5P_set(plist,H5D_XFER_HYPER_CACHE_LIM_NAME,&limit)<0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to set value");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_hyper_cache
- *
- * Purpose:	Reads values previously set with H5Pset_hyper_cache().
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Monday, September 21, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_hyper_cache(hid_t plist_id, unsigned *cache/*out*/,
-		   unsigned *limit/*out*/)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
-
-    FUNC_ENTER_API(H5Pget_hyper_cache, FAIL);
-    H5TRACE3("e","ixx",plist_id,cache,limit);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Return values */
-    if (cache)
-        if (H5P_get(plist,H5D_XFER_HYPER_CACHE_NAME,cache)<0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value");
-    if (limit)
-        if (H5P_get(plist,H5D_XFER_HYPER_CACHE_LIM_NAME,limit)<0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-
 
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_preserve
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index d3f5d6a..d9c32b5 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -811,133 +811,6 @@ done:
 }               
 
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_cache
- *
- * Purpose:	Set the number of objects in the meta data cache and the
- *		maximum number of chunks and bytes in the raw data chunk
- *		cache.
- *
- * 		The RDCC_W0 value should be between 0 and 1 inclusive and
- *		indicates how much chunks that have been fully read or fully
- *		written are favored for preemption.  A value of zero means
- *		fully read or written chunks are treated no differently than
- *		other chunks (the preemption is strictly LRU) while a value
- *		of one means fully read chunks are always preempted before
- *		other chunks.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Robb Matzke
- *              Tuesday, May 19, 1998
- *
- * Modifications:
- *
- *		Raymond Lu 
- *		Tuesday, Oct 23, 2001
- *		Changed the file access list to the new generic property list.
- *	
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_cache(hid_t plist_id, int mdc_nelmts,
-	     int _rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    size_t rdcc_nelmts=(size_t)_rdcc_nelmts;    /* Work around variable changing size */
-    herr_t ret_value=SUCCEED;   /* return value */
-    
-    FUNC_ENTER_API(H5Pset_cache, FAIL);
-    H5TRACE5("e","iIsIszd",plist_id,mdc_nelmts,_rdcc_nelmts,rdcc_nbytes,
-             rdcc_w0);
-
-    /* Check arguments */
-    if (mdc_nelmts<0)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "meta data cache size must be non-negative");
-    if (rdcc_w0<0.0 || rdcc_w0>1.0)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "raw data cache w0 value must be between 0.0 and 1.0 inclusive");
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Set sizes */
-    if(H5P_set(plist, H5F_ACS_META_CACHE_SIZE_NAME, &mdc_nelmts) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set meta data cache size");
-    if(H5P_set(plist, H5F_ACS_DATA_CACHE_ELMT_SIZE_NAME, &rdcc_nelmts) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set data cache element size");
-    if(H5P_set(plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, &rdcc_nbytes) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set data cache byte size");
-    if(H5P_set(plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, &rdcc_w0) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set preempt read chunks");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_cache
- *
- * Purpose:	Retrieves the maximum possible number of elements in the meta
- *		data cache and the maximum possible number of elements and
- *		bytes and the RDCC_W0 value in the raw data chunk cache.  Any
- *		(or all) arguments may be null pointers in which case the
- *		corresponding datum is not returned.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Robb Matzke
- *              Tuesday, May 19, 1998
- *
- * Modifications:
- *
- *		Raymond Lu
- *		Tuesday, Oct 23, 2001
- *		Changed the file access list to the new generic property 
- *		list.
- *	
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_cache(hid_t plist_id, int *mdc_nelmts,
-	     int *_rdcc_nelmts, size_t *rdcc_nbytes, double *rdcc_w0)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    size_t rdcc_nelmts;         /* Work around variable changing size */
-    herr_t ret_value=SUCCEED;   /* return value */
-    
-    FUNC_ENTER_API(H5Pget_cache, FAIL);
-    H5TRACE5("e","i*Is*Is*z*d",plist_id,mdc_nelmts,_rdcc_nelmts,rdcc_nbytes,
-             rdcc_w0);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Get sizes */
-    if (mdc_nelmts)
-        if(H5P_get(plist, H5F_ACS_META_CACHE_SIZE_NAME, mdc_nelmts) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get meta data cache size");
-    if (_rdcc_nelmts) {
-        if(H5P_get(plist, H5F_ACS_DATA_CACHE_ELMT_SIZE_NAME, &rdcc_nelmts) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get data cache element size");
-        *_rdcc_nelmts=rdcc_nelmts;
-    } /* end if */
-    if (rdcc_nbytes)
-        if(H5P_get(plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, rdcc_nbytes) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get data cache byte size");
-    if (rdcc_w0)
-        if(H5P_get(plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, rdcc_w0) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get preempt read chunks");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-
-#else /* H5_WANT_H5_V1_4_COMPAT */
-
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_cache
  *
@@ -1056,7 +929,6 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts,
 done:
     FUNC_LEAVE_API(ret_value);
 }
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*-------------------------------------------------------------------------
@@ -1318,105 +1190,6 @@ done:
     FUNC_LEAVE_API(ret_value);
 }
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_sieve_buf_size
- *
- * Purpose:	Sets the maximum size of the data seive buffer used for file
- *      drivers which are capable of using data sieving.  The data sieve
- *      buffer is used when performing I/O on datasets in the file.  Using a
- *      buffer which is large anough to hold several pieces of the dataset
- *      being read in for hyperslab selections boosts performance by quite a
- *      bit.
- *      
- *		The default value is set to 64KB, indicating that file I/O for raw data
- *      reads and writes will occur in at least 64KB blocks.
- *      Setting the value to 0 with this API function will turn off the
- *      data sieving, even if the VFL driver attempts to use that strategy.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Thursday, September 21, 2000
- *
- * Modifications:
- *
- *		Raymond Lu 
- * 		Tuesday, Oct 23, 2001
- *		Changed the file access list to the new generic property 
- *		list.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_sieve_buf_size(hid_t plist_id, hsize_t _size)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    size_t size=(size_t)_size;  /* Work around size difference */
-    herr_t ret_value=SUCCEED;   /* return value */
-    
-    FUNC_ENTER_API(H5Pset_sieve_buf_size, FAIL);
-    H5TRACE2("e","ih",plist_id,_size);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Set values */
-    if(H5P_set(plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, &size) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set sieve buffer size");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-} /* end H5Pset_sieve_buf_size() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_sieve_buf_size
- *
- * Purpose:	Returns the current settings for the data sieve buffer size
- *      property from a file access property list.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Thursday, September 21, 2000
- *
- * Modifications:
- *
- *		Raymond Lu 
- * 		Tuesday, Oct 23, 2001
- *		Changed the file access list to the new generic property 
- *		list.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_sieve_buf_size(hid_t plist_id, hsize_t *_size/*out*/)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    size_t size;                /* Work around size difference */
-    herr_t ret_value=SUCCEED;   /* return value */
-
-    FUNC_ENTER_API(H5Pget_sieve_buf_size, FAIL);
-    H5TRACE2("e","ix",plist_id,_size);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Get values */
-    if (_size) {
-        if(H5P_get(plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, &size) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get sieve buffer size");
-        *_size=size;
-    } /* end if */
-
-done:
-    FUNC_LEAVE_API(ret_value);
-} /* end H5Pget_sieve_buf_size() */
-#else /* H5_WANT_H5_V1_4_COMPAT */
 
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_sieve_buf_size
@@ -1510,7 +1283,6 @@ H5Pget_sieve_buf_size(hid_t plist_id, size_t *size/*out*/)
 done:
     FUNC_LEAVE_API(ret_value);
 } /* end H5Pget_sieve_buf_size() */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c
index d709859..1fbb7e5 100644
--- a/src/H5Pfcpl.c
+++ b/src/H5Pfcpl.c
@@ -289,117 +289,6 @@ done:
     FUNC_LEAVE_API(ret_value);
 }
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_sym_k
- *
- * Purpose:	IK is one half the rank of a tree that stores a symbol
- *		table for a group.  Internal nodes of the symbol table are on
- *		average 75% full.  That is, the average rank of the tree is
- *		1.5 times the value of IK.
- *
- *		LK is one half of the number of symbols that can be stored in
- *		a symbol table node.  A symbol table node is the leaf of a
- *		symbol table tree which is used to store a group.  When
- *		symbols are inserted randomly into a group, the group's
- *		symbol table nodes are 75% full on average.  That is, they
- *		contain 1.5 times the number of symbols specified by LK.
- *
- *		Either (or even both) of IK and LK can be zero in which case
- *		that value is left unchanged.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Robb Matzke
- *		Tuesday, January  6, 1998
- *
- * Modifications:
- *
- *		Raymond Lu, Oct 14, 2001
- *         	Changed to the new generic property list. 
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_sym_k(hid_t plist_id, int ik, int lk)
-{
-    int btree_k[H5B_NUM_BTREE_ID];
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value=SUCCEED;       /* Return value */
-
-    FUNC_ENTER_API(H5Pset_sym_k, FAIL);
-    H5TRACE3("e","iIsIs",plist_id,ik,lk);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-   
-    /* Set values */
-    if (ik > 0) {
-        if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for btree interanl nodes");
-        btree_k[H5B_SNODE_ID] = ik;
-        if(H5P_set(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for btree nodes");
-    }
-    if (lk > 0)
-        if(H5P_set(plist, H5F_CRT_SYM_LEAF_NAME, &lk) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for symbol table leaf nodes");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_sym_k
- *
- * Purpose:	Retrieves the symbol table B-tree 1/2 rank (IK) and the
- *		symbol table leaf node 1/2 size (LK).  See H5Pset_sym_k() for
- *		details. Either (or even both) IK and LK may be null
- *		pointers.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Robb Matzke
- *		Wednesday, January  7, 1998
- *
- * Modifications:
- *
- *		Raymond Lu
- *		Changed to the new generic property list.
- *	
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_sym_k(hid_t plist_id, int *ik /*out */ , int *lk /*out */ )
-{
-    int btree_k[H5B_NUM_BTREE_ID];
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value=SUCCEED;       /* Return value */
-
-    FUNC_ENTER_API(H5Pget_sym_k, FAIL);
-    H5TRACE3("e","ixx",plist_id,ik,lk);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Get values */
-    if (ik) {
-        if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for btree nodes");
-        *ik = btree_k[H5B_SNODE_ID];
-    }
-    if (lk)
-        if(H5P_get(plist, H5F_CRT_SYM_LEAF_NAME, lk) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for symbol table leaf nodes");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-#else /* H5_WANT_H5_V1_4_COMPAT */
 
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_sym_k
@@ -509,7 +398,6 @@ H5Pget_sym_k(hid_t plist_id, int *ik /*out */ , unsigned *lk /*out */ )
 done:
     FUNC_LEAVE_API(ret_value);
 }
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 65751dc..8d9b9d0 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -39,19 +39,6 @@ typedef long off_t;
 #endif
 /*__MWERKS__*/
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-/* Backward compatibility typedef... */
-typedef hid_t H5P_class_t;      /* Alias H5P_class_t to hid_t */
-
-/* H5P_DATASET_XFER was the name from the beginning through 1.2.  It was
- * changed to H5P_DATA_XFER on v1.3.0.  Then it was changed back to
- * H5P_DATASET_XFER right before the release of v1.4.0-beta2.
- * Define an alias here to help applications that had ported to v1.3.
- * Should be removed in later version.
- */
-#define H5P_DATA_XFER H5P_DATASET_XFER
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -170,13 +157,8 @@ H5_DLL herr_t H5Pset_sizes(hid_t plist_id, size_t sizeof_addr,
        size_t sizeof_size);
 H5_DLL herr_t H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr/*out*/,
        size_t *sizeof_size/*out*/);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-H5_DLL herr_t H5Pset_sym_k(hid_t plist_id, int ik, int lk);
-H5_DLL herr_t H5Pget_sym_k(hid_t plist_id, int *ik/*out*/, int *lk/*out*/);
-#else /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Pset_sym_k(hid_t plist_id, int ik, unsigned lk);
 H5_DLL herr_t H5Pget_sym_k(hid_t plist_id, int *ik/*out*/, unsigned *lk/*out*/);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Pset_istore_k(hid_t plist_id, int ik);
 H5_DLL herr_t H5Pget_istore_k(hid_t plist_id, int *ik/*out*/);
 H5_DLL herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout);
@@ -197,17 +179,10 @@ H5_DLL herr_t H5Pset_family_offset(hid_t fapl_id, hsize_t offset);
 H5_DLL herr_t H5Pget_family_offset(hid_t fapl_id, hsize_t *offset);
 H5_DLL herr_t H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type);
 H5_DLL herr_t H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-H5_DLL herr_t H5Pset_buffer(hid_t plist_id, hsize_t size, void *tconv,
-        void *bkg);
-H5_DLL hsize_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/,
-        void **bkg/*out*/);
-#else /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Pset_buffer(hid_t plist_id, size_t size, void *tconv,
         void *bkg);
 H5_DLL size_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/,
         void **bkg/*out*/);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Pset_preserve(hid_t plist_id, hbool_t status);
 H5_DLL int H5Pget_preserve(hid_t plist_id);
 H5_DLL herr_t H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter,
@@ -236,25 +211,11 @@ H5_DLL herr_t H5Pset_edc_check(hid_t plist_id, H5Z_EDC_t check);
 H5_DLL H5Z_EDC_t H5Pget_edc_check(hid_t plist_id);
 H5_DLL herr_t H5Pset_filter_callback(hid_t plist_id, H5Z_filter_func_t func, 
                                      void* op_data);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-H5_DLL herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, int rdcc_nelmts,
-       size_t rdcc_nbytes, double rdcc_w0);
-H5_DLL herr_t H5Pget_cache(hid_t plist_id, int *mdc_nelmts/*out*/,
-       int *rdcc_nelmts/*out*/,
-       size_t *rdcc_nbytes/*out*/, double *rdcc_w0);
-#else /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, size_t rdcc_nelmts,
        size_t rdcc_nbytes, double rdcc_w0);
 H5_DLL herr_t H5Pget_cache(hid_t plist_id, int *mdc_nelmts/*out*/,
        size_t *rdcc_nelmts/*out*/,
        size_t *rdcc_nbytes/*out*/, double *rdcc_w0);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-H5_DLL herr_t H5Pset_hyper_cache(hid_t plist_id, unsigned cache,
-      unsigned limit);
-H5_DLL herr_t H5Pget_hyper_cache(hid_t plist_id, unsigned *cache,
-      unsigned *limit);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Pset_btree_ratios(hid_t plist_id, double left, double middle,
        double right);
 H5_DLL herr_t H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/,
@@ -287,13 +248,8 @@ H5_DLL herr_t H5Pget_vlen_mem_manager(hid_t plist_id,
                                        void **free_info);
 H5_DLL herr_t H5Pset_meta_block_size(hid_t fapl_id, hsize_t size);
 H5_DLL herr_t H5Pget_meta_block_size(hid_t fapl_id, hsize_t *size/*out*/);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-H5_DLL herr_t H5Pset_sieve_buf_size(hid_t fapl_id, hsize_t size);
-H5_DLL herr_t H5Pget_sieve_buf_size(hid_t fapl_id, hsize_t *size/*out*/);
-#else /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Pset_sieve_buf_size(hid_t fapl_id, size_t size);
 H5_DLL herr_t H5Pget_sieve_buf_size(hid_t fapl_id, size_t *size/*out*/);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Pset_hyper_vector_size(hid_t fapl_id, size_t size);
 H5_DLL herr_t H5Pget_hyper_vector_size(hid_t fapl_id, size_t *size/*out*/);
 H5_DLL herr_t H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size);
diff --git a/src/H5R.c b/src/H5R.c
index 2ac57e0..66b22ef 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -624,111 +624,6 @@ done:
     FUNC_LEAVE_API(ret_value);
 }   /* end H5Rget_region() */
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-
-/*--------------------------------------------------------------------------
- NAME
-    H5R_get_object_type
- PURPOSE
-    Retrieves the type of object that an object reference points to
- USAGE
-    int H5R_get_object_type(file, ref)
-        H5F_t *file;        IN: File the object being dereferenced is within
-        void *ref;          IN: Reference to query.
-        
- RETURNS
-    Success:	An object type defined in H5Gpublic.h
-    Failure:	H5G_UNKNOWN
- DESCRIPTION
-    Given a reference to some object, this function returns the type of object
-    pointed to.
- GLOBAL VARIABLES
- COMMENTS, BUGS, ASSUMPTIONS
- EXAMPLES
- REVISION LOG
---------------------------------------------------------------------------*/
-static int
-H5R_get_object_type(H5F_t *file, hid_t dxpl_id, void *_ref)
-{
-    H5G_entry_t ent;            /* Symbol table entry */
-    hobj_ref_t *ref=(hobj_ref_t *)_ref; /* Only object references currently supported */
-    uint8_t *p;                 /* Pointer to OID to store */
-    int ret_value;
-
-    FUNC_ENTER_NOINIT(H5R_get_object_type);
-
-    assert(ref);
-    assert(file);
-
-    /* Initialize the symbol table entry */
-    HDmemset(&ent,0,sizeof(H5G_entry_t));
-    ent.type=H5G_NOTHING_CACHED;
-    ent.file=file;
-
-    /* Get the object oid */
-    p=(uint8_t *)ref->oid;
-    H5F_addr_decode(ent.file,(const uint8_t **)&p,&(ent.header));
-
-    /* Get the OID type */
-    ret_value=H5G_get_type(&ent, dxpl_id);
-
-#ifdef LATER
-done:
-#endif /* LATER */
-    FUNC_LEAVE_NOAPI(ret_value);
-}   /* end H5R_get_object_type() */
-
-
-/*--------------------------------------------------------------------------
- NAME
-    H5Rget_object_type
- PURPOSE
-    Retrieves the type of object that an object reference points to
- USAGE
-    int H5Rget_object_type(id, ref)
-        hid_t id;       IN: Dataset reference object is in or location ID of
-                            object that the dataset is located within.
-        void *ref;          IN: Reference to query.
-        
- RETURNS
-    Success:	An object type defined in H5Gpublic.h
-    Failure:	H5G_UNKNOWN
- DESCRIPTION
-    Given a reference to some object, this function returns the type of object
-    pointed to.
- GLOBAL VARIABLES
- COMMENTS, BUGS, ASSUMPTIONS
- EXAMPLES
- REVISION LOG
---------------------------------------------------------------------------*/
-int
-H5Rget_object_type(hid_t id, void *_ref)
-{
-    H5G_entry_t *loc = NULL;    /* Symbol table entry */
-    H5F_t *file=NULL;       /* File object */
-    hid_t ret_value;
-
-    FUNC_ENTER_API(H5Rget_object_type, H5G_UNKNOWN);
-    H5TRACE2("Is","ix",id,_ref);
-
-    /* Check args */
-    if (NULL == (loc = H5G_loc(id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
-    if(_ref==NULL)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, H5G_UNKNOWN, "invalid reference pointer");
-
-    /* Get the file pointer from the entry */
-    file=loc->file;
-
-    /* Get the object information */
-    if ((ret_value=H5R_get_object_type(file,H5AC_ind_dxpl_id,_ref))<0)
-	HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type");
-    
-done:
-    FUNC_LEAVE_API(ret_value);
-}   /* end H5Rget_object_type() */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-
 
 /*--------------------------------------------------------------------------
  NAME
@@ -849,21 +744,12 @@ done:
  EXAMPLES
  REVISION LOG
 --------------------------------------------------------------------------*/
-#ifdef H5_WANT_H5_V1_4_COMPAT
-int
-H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref)
-#else /* H5_WANT_H5_V1_4_COMPAT */
 H5G_obj_t
 H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref)
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 {
     H5G_entry_t *loc = NULL;    /* Symbol table entry */
     H5F_t *file=NULL;       /* File object */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int ret_value;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     H5G_obj_t ret_value;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     FUNC_ENTER_API(H5Rget_obj_type, H5G_UNKNOWN);
     H5TRACE3("Is","iRtx",id,ref_type,_ref);
diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h
index cadc826..b567791 100644
--- a/src/H5Rpublic.h
+++ b/src/H5Rpublic.h
@@ -73,12 +73,7 @@ H5_DLL herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name,
 			 H5R_type_t ref_type, hid_t space_id);
 H5_DLL hid_t H5Rdereference(hid_t dataset, H5R_type_t ref_type, void *ref);
 H5_DLL hid_t H5Rget_region(hid_t dataset, H5R_type_t ref_type, void *ref);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-H5_DLL int H5Rget_object_type(hid_t dataset, void *_ref);
-H5_DLL int H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref);
-#else /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL H5G_obj_t H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 #ifdef __cplusplus
 }
diff --git a/src/H5Spublic.h b/src/H5Spublic.h
index 8272dfa..76de620 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -136,11 +136,7 @@ H5_DLL hssize_t H5Sget_select_hyper_nblocks(hid_t spaceid);
 H5_DLL hssize_t H5Sget_select_elem_npoints(hid_t spaceid);
 H5_DLL herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks, hsize_t *buf);
 H5_DLL herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoints, hsize_t *buf);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end);
-#else /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hssize_t *start, hssize_t *end);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL H5S_sel_type H5Sget_select_type(hid_t spaceid);
 
 #ifdef __cplusplus
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index b451ce7..7431715 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -495,39 +495,6 @@ done:
  EXAMPLES
  REVISION LOG
 --------------------------------------------------------------------------*/
-#ifdef H5_WANT_H5_V1_4_COMPAT
-herr_t
-H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end)
-{
-    hssize_t tstart[H5O_LAYOUT_NDIMS];  /* Temporary starting coordinates */
-    hssize_t tend[H5O_LAYOUT_NDIMS];    /* Temporary ending coordinates */
-    H5S_t	*space = NULL;  /* Dataspace to modify selection of */
-    unsigned u;                 /* Local index variable */
-    herr_t ret_value;        /* return value */
-
-    FUNC_ENTER_API(H5Sget_select_bounds, FAIL);
-    H5TRACE3("e","i*h*h",spaceid,start,end);
-
-    /* Check args */
-    if(start==NULL || end==NULL)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid pointer");
-    if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace");
-
-    ret_value = H5S_get_select_bounds(space,tstart,tend);
-
-    if(ret_value>=0) {
-        /* Copy over the start & end values */
-        for(u=0; u<space->extent.u.simple.rank; u++) {
-            H5_ASSIGN_OVERFLOW(start[u],tstart[u],hssize_t,hsize_t);
-            H5_ASSIGN_OVERFLOW(end[u],tend[u],hssize_t,hsize_t);
-        } /* end for */
-    } /* end if */
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}   /* H5Sget_select_bounds() */
-#else /* H5_WANT_H5_V1_4_COMPAT */
 herr_t
 H5Sget_select_bounds(hid_t spaceid, hssize_t *start, hssize_t *end)
 {
@@ -548,7 +515,6 @@ H5Sget_select_bounds(hid_t spaceid, hssize_t *start, hssize_t *end)
 done:
     FUNC_LEAVE_API(ret_value);
 }   /* H5Sget_select_bounds() */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*--------------------------------------------------------------------------
diff --git a/src/H5Z.c b/src/H5Z.c
index b5e0e52..07389ed 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -189,56 +189,6 @@ H5Z_term_interface (void)
     return 0;
 }
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-
-/*-------------------------------------------------------------------------
- * Function:	H5Zregister
- *
- * Purpose:	This function registers new filter. The COMMENT argument is
- *		used for debugging and may be the null pointer.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Robb Matzke
- *              Thursday, April 16, 1998
- *
- * Modifications:
- *              Changed to pass H5Z_class_t struct to H5Z_register
- *              Quincey Koziol, April  5, 2003
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Zregister(H5Z_filter_t id, const char *comment, H5Z_func_t func)
-{
-    H5Z_class_t cls;                    /* Filter class used to bundle parameters */
-    herr_t     ret_value=SUCCEED;       /* Return value */
-
-    FUNC_ENTER_API(H5Zregister, FAIL);
-    H5TRACE3("e","Zfsx",id,comment,func);
-
-    /* Check args */
-    if (id<0 || id>H5Z_FILTER_MAX)
-	HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identification number");
-    if (id<H5Z_FILTER_RESERVED)
-	HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "unable to modify predefined filters");
-    if (!func)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no function specified");
-
-    /* Build class structure */
-    cls.id=id;
-    cls.name=comment;
-    cls.can_apply=cls.set_local=NULL;
-    cls.filter=func;
-
-    /* Do it */
-    if (H5Z_register (&cls)<0)
-	HGOTO_ERROR (H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register filter");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-#else /* H5_WANT_H5_V1_4_COMPAT */
 
 /*-------------------------------------------------------------------------
  * Function:	H5Zregister
@@ -280,7 +230,6 @@ H5Zregister(const H5Z_class_t *cls)
 done:
     FUNC_LEAVE_API(ret_value);
 }
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index 1463598..ac0a718 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -163,12 +163,7 @@ typedef struct H5Z_class_t {
     H5Z_func_t filter;		/* The actual filter function		     */
 } H5Z_class_t;
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-H5_DLL herr_t H5Zregister(H5Z_filter_t id, const char *comment,
-			   H5Z_func_t filter);
-#else /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Zregister(const H5Z_class_t *cls);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 H5_DLL herr_t H5Zunregister(H5Z_filter_t id);
 H5_DLL htri_t H5Zfilter_avail(H5Z_filter_t id);
 
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 4be13d1..b8d57b7 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -128,6 +128,9 @@
 /* Define to 1 if you have the `globus_io' library (-lglobus_io). */
 #undef HAVE_LIBGLOBUS_IO
 
+/* Define to 1 if you have the `lmpe' library (-llmpe). */
+#undef HAVE_LIBLMPE
+
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
@@ -179,6 +182,9 @@
 /* Define if we have MPE support */
 #undef HAVE_MPE
 
+/* Define to 1 if you have the <mpe.h> header file. */
+#undef HAVE_MPE_H
+
 /* Define to 1 if you have the <netinet/tcp.h> header file. */
 #undef HAVE_NETINET_TCP_H
 
@@ -479,8 +485,8 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Define if the HDF5 v1.4 compatibility functions are to be compiled in */
-#undef WANT_H5_V1_4_COMPAT
+/* Define if the HDF5 v1.6 compatibility functions are to be compiled in */
+#undef WANT_H5_V1_6_COMPAT
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/test/dsets.c b/test/dsets.c
index dbe215b..b443ff5 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -114,12 +114,10 @@ double	points_dbl[DSET_DIM1][DSET_DIM2], check_dbl[DSET_DIM1][DSET_DIM2];
 /* Local prototypes for filter functions */
 static size_t filter_bogus(unsigned int flags, size_t cd_nelmts, 
     const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
-#ifndef H5_WANT_H5_V1_4_COMPAT
 static herr_t can_apply_bogus(hid_t dcpl_id, hid_t type_id, hid_t space_id);
 static herr_t set_local_bogus2(hid_t dcpl_id, hid_t type_id, hid_t space_id);
 static size_t filter_bogus2(unsigned int flags, size_t cd_nelmts, 
     const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 static size_t filter_corrupt(unsigned int flags, size_t cd_nelmts, 
     const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
 
@@ -332,11 +330,7 @@ test_simple_io(hid_t fapl)
     tconv_buf = malloc (1000);
     xfer = H5Pcreate (H5P_DATASET_XFER);
     assert (xfer>=0);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    if (H5Pset_buffer (xfer, (hsize_t)1000, tconv_buf, NULL)<0) goto error;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     if (H5Pset_buffer (xfer, (size_t)1000, tconv_buf, NULL)<0) goto error;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Create the dataset */
     if ((dataset = H5Dcreate(file, DSET_SIMPLE_IO_NAME, H5T_NATIVE_INT, space,
@@ -774,11 +768,7 @@ test_conv_buffer(hid_t fid)
     hsize_t     dimsb[1];
     hsize_t     dimsc[1];
     hid_t       xfer_list;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    hsize_t      size;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t      size;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     TESTING("data type conversion buffer size");
     
@@ -966,7 +956,6 @@ const H5Z_class_t H5Z_BOGUS[1] = {{
     filter_bogus,		/* The actual filter function	*/
 }};
 
-#ifndef H5_WANT_H5_V1_4_COMPAT
 
 /*-------------------------------------------------------------------------
  * Function:	can_apply_bogus
@@ -992,7 +981,6 @@ can_apply_bogus(hid_t UNUSED dcpl_id, hid_t type_id, hid_t UNUSED space_id)
     else
         return 1;
 }
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*-------------------------------------------------------------------------
@@ -1019,7 +1007,6 @@ filter_bogus(unsigned int UNUSED flags, size_t UNUSED cd_nelmts,
     return nbytes;
 }
 
-#ifndef H5_WANT_H5_V1_4_COMPAT
 
 /*-------------------------------------------------------------------------
  * Function:	set_local_bogus2
@@ -1132,7 +1119,6 @@ filter_bogus2(unsigned int flags, size_t cd_nelmts,
     else
         return(nbytes);
 }
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 /* This message derives from H5Z */
 const H5Z_class_t H5Z_CORRUPT[1] = {{
@@ -1297,11 +1283,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
      */
     if ((dxpl = H5Pcreate (H5P_DATASET_XFER))<0) goto error;
     tconv_buf = malloc (1000);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    if (H5Pset_buffer (dxpl, (hsize_t)1000, tconv_buf, NULL)<0) goto error;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     if (H5Pset_buffer (dxpl, (size_t)1000, tconv_buf, NULL)<0) goto error;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     if (if_fletcher32==DISABLE_FLETCHER32) {
         if(H5Pset_edc_check(dxpl, H5Z_DISABLE_EDC)<0)
@@ -1656,11 +1638,7 @@ test_filters(hid_t file)
     puts("Testing 'null' filter");
     if((dc = H5Pcreate(H5P_DATASET_CREATE))<0) goto error;
     if (H5Pset_chunk (dc, 2, chunk_size)<0) goto error;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    if (H5Zregister (H5Z_FILTER_BOGUS, "bogus", filter_bogus)<0) goto error;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     if (H5Zregister (H5Z_BOGUS)<0) goto error;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     if (H5Pset_filter (dc, H5Z_FILTER_BOGUS, 0, 0, NULL)<0) goto error;
 
     if(test_filter_internal(file,DSET_BOGUS_NAME,dc,DISABLE_FLETCHER32,DATA_NOT_CORRUPTED,&null_size)<0) goto error;
@@ -1701,11 +1679,7 @@ test_filters(hid_t file)
     data_corrupt[1] = 33;
     data_corrupt[2] = 27;
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    if (H5Zregister (H5Z_FILTER_CORRUPT, "corrupt", filter_corrupt)<0) goto error;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     if (H5Zregister (H5Z_CORRUPT)<0) goto error;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     if (H5Pset_filter (dc, H5Z_FILTER_CORRUPT, 0, 3, data_corrupt)<0) goto error;
     if(test_filter_internal(file,DSET_FLETCHER32_NAME_3,dc,ENABLE_FLETCHER32,DATA_CORRUPTED,&fletcher32_size)<0) goto error;
     if(fletcher32_size<=null_size) {
@@ -2395,7 +2369,6 @@ test_types(hid_t file)
     return -1;
 }
 
-#ifndef H5_WANT_H5_V1_4_COMPAT
 /* This message derives from H5Z */
 const H5Z_class_t H5Z_CAN_APPLY[1] = {{
     H5Z_FILTER_BOGUS,		/* Filter id number		*/
@@ -2559,7 +2532,6 @@ test_can_apply(hid_t file)
 error:
     return -1;
 } /* end test_can_apply() */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*-------------------------------------------------------------------------
@@ -2689,7 +2661,6 @@ error:
 #endif /* H5_HAVE_FILTER_SZIP */
 } /* end test_can_apply_szip() */
 
-#ifndef H5_WANT_H5_V1_4_COMPAT
 /* This message derives from H5Z */
 const H5Z_class_t H5Z_SET_LOCAL[1] = {{
     H5Z_FILTER_BOGUS2,		/* Filter id number		*/
@@ -2960,7 +2931,6 @@ test_set_local(hid_t fapl)
 error:
     return -1;
 } /* end test_set_local() */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*-------------------------------------------------------------------------
@@ -3024,10 +2994,8 @@ main(void)
     nerrors += test_types(file)<0       ?1:0;
     nerrors += test_userblock_offset(fapl)<0     ?1:0;
     nerrors += test_missing_filter(file)<0	?1:0;
-#ifndef H5_WANT_H5_V1_4_COMPAT
     nerrors += test_can_apply(file)<0	?1:0; 
     nerrors += test_set_local(fapl)<0	?1:0;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     nerrors += test_can_apply_szip(file)<0	?1:0; 
 
     if (H5Fclose(file)<0) goto error;
diff --git a/test/h5test.c b/test/h5test.c
index ccee874..a5cbad8 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -436,11 +436,7 @@ h5_fileaccess(void)
     char s[1024];
     hid_t fapl = -1;
     hsize_t fam_size = 100*1024*1024; /*100 MB*/
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    long verbosity = 1;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     long log_flags = H5FD_LOG_LOC_IO;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     H5FD_mem_t	mt;
     
     /* First use the environment variable, then the constant */
@@ -503,21 +499,12 @@ h5_fileaccess(void)
 	}
 	if (H5Pset_fapl_family(fapl, fam_size, H5P_DEFAULT)<0) return -1;
     } else if (!HDstrcmp(name, "log")) {
-#ifdef H5_WANT_H5_V1_4_COMPAT
-        /* Log file access */
-        if ((val = strtok(NULL, " \t\n\r")))
-            verbosity = strtol(val, NULL, 0);
-
-        if (H5Pset_fapl_log(fapl, NULL, (int)verbosity) < 0)
-	    return -1;
-#else /* H5_WANT_H5_V1_4_COMPAT */
         /* Log file access */
         if ((val = HDstrtok(NULL, " \t\n\r")))
             log_flags = HDstrtol(val, NULL, 0);
 
         if (H5Pset_fapl_log(fapl, NULL, (unsigned)log_flags, 0) < 0)
 	    return -1;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     } else {
 	/* Unknown driver */
 	return -1;
diff --git a/test/ntypes.c b/test/ntypes.c
index bd87f12..ce002af 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -1730,13 +1730,8 @@ test_refer_dtype(hid_t file)
     /* Create reference to named datatype */
     if(H5Rcreate(wbuf,file,"/Group1/Datatype1",H5R_OBJECT,-1)<0) 
         TEST_ERROR;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    if(H5Rget_object_type(dataset,wbuf)!=H5G_TYPE)
-        TEST_ERROR;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     if(H5Rget_obj_type(dataset,H5R_OBJECT,wbuf)!=H5G_TYPE)
         TEST_ERROR;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Write selection to disk */
     if(H5Dwrite(dataset,H5T_STD_REF_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,wbuf)<0)
diff --git a/test/tfile.c b/test/tfile.c
index 45d6ca7..c285351 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -80,11 +80,7 @@ test_file_create(void)
     size_t		parm;		/*file-creation parameters	*/
     size_t		parm2;		/*file-creation parameters	*/
     int			iparm;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int		iparm2;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     unsigned		iparm2;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     herr_t		ret;		/*generic return value		*/
 
     /* Output message about test being performed */
@@ -319,11 +315,7 @@ test_file_open(void)
     size_t		parm;		/*file-creation parameters	*/
     size_t		parm2;		/*file-creation parameters	*/
     int			iparm;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int		iparm2;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     unsigned		iparm2;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     herr_t		ret;		/*generic return value		*/
 
     /*
diff --git a/test/titerate.c b/test/titerate.c
index a64bfbb..e8d0e3a 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -197,11 +197,13 @@ static void test_iter_group(void)
         VERIFY(num_membs,NDATASETS+2,"H5Gget_num_objs");
   
         for(i=0; i< (int)num_membs; i++) {
+            H5G_obj_t obj_type;         /* Type of object in file */
+
             ret = H5Gget_objname_by_idx(root_group, (hsize_t)i, dataset_name, 32);
             CHECK(ret, FAIL, "H5Gget_objsname_by_idx");
             
-            ret = (herr_t)H5Gget_objtype_by_idx(root_group, (hsize_t)i);
-            CHECK(ret, FAIL, "H5Gget_objsname_by_idx");
+            obj_type = H5Gget_objtype_by_idx(root_group, (hsize_t)i);
+            CHECK(obj_type, H5G_UNKNOWN, "H5Gget_objsname_by_idx");
         }
     
         H5E_BEGIN_TRY {
@@ -780,22 +782,24 @@ static void test_grp_memb_funcs(void)
     VERIFY(num_membs,NDATASETS+2,"H5Gget_num_objs");
   
     for(i=0; i< (int)num_membs; i++) {
-        ret = (herr_t)H5Gget_objname_by_idx(root_group, (hsize_t)i, dataset_name, 32);
+        H5G_obj_t obj_type;         /* Type of object in file */
+
+        ret = H5Gget_objname_by_idx(root_group, (hsize_t)i, dataset_name, 32);
         CHECK(ret, FAIL, "H5Gget_objsname_by_idx");
         
         /* Keep a copy of the dataset names around for later */
         obj_names[i]=HDstrdup(dataset_name);
         CHECK(dnames[i], NULL, "strdup");           
         
-        ret = (herr_t)H5Gget_objtype_by_idx(root_group, (hsize_t)i);
-        CHECK(ret, FAIL, "H5Gget_objsname_by_idx");
+        obj_type = H5Gget_objtype_by_idx(root_group, (hsize_t)i);
+        CHECK(obj_type, H5G_UNKNOWN, "H5Gget_objsname_by_idx");
 
         if(!HDstrcmp(dataset_name, "grp"))
-            VERIFY(ret, H5G_GROUP, "H5Gget_objsname_by_idx");
+            VERIFY(obj_type, H5G_GROUP, "H5Gget_objsname_by_idx");
         if(!HDstrcmp(dataset_name, "dtype"))
-            VERIFY(ret, H5G_TYPE, "H5Gget_objsname_by_idx");
+            VERIFY(obj_type, H5G_TYPE, "H5Gget_objsname_by_idx");
         if(!HDstrncmp(dataset_name, "Dataset", 7))
-            VERIFY(ret, H5G_DATASET, "H5Gget_objsname_by_idx");
+            VERIFY(obj_type, H5G_DATASET, "H5Gget_objsname_by_idx");
     }
     
     H5E_BEGIN_TRY {
diff --git a/test/tmisc.c b/test/tmisc.c
index 7b82273..f039cb6 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -1062,11 +1062,7 @@ test_misc8(void)
 #endif /* VERIFY_DATA */
     unsigned u,v;               /* Local index variables */
     int mdc_nelmts;             /* Metadata number of elements */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int rdcc_nelmts;            /* Raw data number of elements */
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nelmts;         /* Raw data number of elements */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nbytes;         /* Raw data number of bytes */
     double rdcc_w0;             /* Raw data write percentage */
     hssize_t start[MISC8_RANK]; /* Hyperslab start */
diff --git a/test/trefer.c b/test/trefer.c
index 7a94d62..6183c88 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -162,46 +162,26 @@ test_reference_obj(void)
     /* Create reference to dataset */
     ret = H5Rcreate(&wbuf[0],fid1,"/Group1/Dataset1",H5R_OBJECT,-1);
     CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Rget_object_type(dataset,&wbuf[0]);
-    VERIFY(ret, H5G_DATASET, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[0]);
     VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Create reference to dataset */
     ret = H5Rcreate(&wbuf[1],fid1,"/Group1/Dataset2",H5R_OBJECT,-1);
     CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Rget_object_type(dataset,&wbuf[1]);
-    VERIFY(ret, H5G_DATASET, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[1]);
     VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Create reference to group */
     ret = H5Rcreate(&wbuf[2],fid1,"/Group1",H5R_OBJECT,-1);
     CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Rget_object_type(dataset,&wbuf[2]);
-    VERIFY(ret, H5G_GROUP, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[2]);
     VERIFY(ret, H5G_GROUP, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Create reference to named datatype */
     ret = H5Rcreate(&wbuf[3],fid1,"/Group1/Datatype1",H5R_OBJECT,-1);
     CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Rget_object_type(dataset,&wbuf[3]);
-    VERIFY(ret, H5G_TYPE, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[3]);
     VERIFY(ret, H5G_TYPE, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Write selection to disk */
     ret=H5Dwrite(dataset,H5T_STD_REF_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,wbuf);
@@ -326,13 +306,8 @@ test_reference_region(void)
     hsize_t		block[SPACE2_RANK];     /* Block size of hyperslab */
     hssize_t	coord1[POINT1_NPOINTS][SPACE2_RANK]; /* Coordinates for point selection */
     hsize_t *   coords;             /* Coordinate buffer */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    hsize_t		low[SPACE2_RANK];   /* Selection bounds */
-    hsize_t		high[SPACE2_RANK];     /* Selection bounds */
-#else /* H5_WANT_H5_V1_4_COMPAT */
     hssize_t		low[SPACE2_RANK];   /* Selection bounds */
     hssize_t		high[SPACE2_RANK];     /* Selection bounds */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     hdset_reg_ref_t      *wbuf,      /* buffer to write to disk */
                *rbuf;       /* buffer read from disk */
     uint8_t    *dwbuf,      /* Buffer for writing numeric data to disk */
@@ -882,13 +857,8 @@ test_reference_obj_deleted(void)
     /* Create reference to dataset */
     ret = H5Rcreate(&oref,fid1,"/Dataset1",H5R_OBJECT,-1);
     CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Rget_object_type(dataset,&oref);
-    VERIFY(ret, H5G_DATASET, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Rget_obj_type(dataset,H5R_OBJECT,&oref);
     VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Write selection to disk */
     ret=H5Dwrite(dataset,H5T_STD_REF_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,&oref);
diff --git a/test/tselect.c b/test/tselect.c
index 6e4c07d..59150f4 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -2522,11 +2522,6 @@ test_select_hyper_union(void)
     xfer = H5Pcreate (H5P_DATASET_XFER);
     CHECK(xfer, FAIL, "H5Pcreate");
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Pset_hyper_cache(xfer,0,1);
-    CHECK(ret, FAIL, "H5Pset_hyper_cache");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-
     /* Write selection to disk */
     ret=H5Dwrite(dataset,H5T_NATIVE_UCHAR,sid2,sid1,xfer,wbuf);
     CHECK(ret, FAIL, "H5Dwrite");
@@ -6155,11 +6150,7 @@ test_select(void)
     hid_t plist_id;     /* Property list for reading random hyperslabs */
     hid_t fapl;         /* Property list accessing the file */
     int mdc_nelmts;     /* Metadata number of elements */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int rdcc_nelmts;   /* Raw data number of elements */
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nelmts;   /* Raw data number of elements */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nbytes; /* Raw data number of bytes */
     double rdcc_w0;     /* Raw data write percentage */
     hssize_t offset[SPACE7_RANK]={1,1}; /* Offset for testing selection offsets */
@@ -6173,11 +6164,7 @@ test_select(void)
     CHECK(plist_id, FAIL, "H5Pcreate");
 
     /* test I/O with a very small buffer for reads */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret=H5Pset_buffer(plist_id,(hsize_t)59,NULL,NULL);
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret=H5Pset_buffer(plist_id,(size_t)59,NULL,NULL);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     CHECK(ret, FAIL, "H5Pset_buffer");
 
     /* These next tests use the same file */
diff --git a/test/unlink.c b/test/unlink.c
index 6d8be55..05d8831 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -527,11 +527,7 @@ test_filespace(void)
 
     /* Metadata cache parameters */
     int mdc_nelmts;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int rdcc_nelmts;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nelmts;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nbytes;
     double rdcc_w0;
 
@@ -1326,11 +1322,7 @@ main(void)
 
     /* Metadata cache parameters */
     int mdc_nelmts;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int rdcc_nelmts;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nelmts;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nbytes;
     double rdcc_w0;
 
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 3c48a20..7167782 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -1124,11 +1124,7 @@ extend_writeInd(char *filename)
  */
 {
     int mdc_nelmts;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int rdcc_nelmts;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nelmts;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nbytes;
     double rdcc_w0;
 
@@ -1530,11 +1526,7 @@ extend_writeAll(char *filename)
  */
 {
     int mdc_nelmts;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int rdcc_nelmts;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nelmts;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nbytes;
     double rdcc_w0;
 
diff --git a/testpar/t_ph5basic.c b/testpar/t_ph5basic.c
index 92c4e61..eb0048b 100644
--- a/testpar/t_ph5basic.c
+++ b/testpar/t_ph5basic.c
@@ -219,9 +219,7 @@ test_fapl_mpiposix_dup(void)
     int mpi_size_tmp, mpi_rank_tmp;
     int mrc;			/* MPI return value */
     hid_t acc_pl;		/* File access properties */
-#ifndef H5_WANT_H5_V1_4_COMPAT
     hbool_t use_gpfs = FALSE;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     herr_t ret;			/* hdf5 return value */
 
     if (verbose)
@@ -246,11 +244,7 @@ test_fapl_mpiposix_dup(void)
     acc_pl = H5Pcreate (H5P_FILE_ACCESS);
     VRFY((acc_pl >= 0), "H5P_FILE_ACCESS");
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Pset_fapl_mpiposix(acc_pl, comm);
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Pset_fapl_mpiposix(acc_pl, comm, use_gpfs);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     VRFY((ret >= 0), "");
 
     /* Case 1:
@@ -261,11 +255,7 @@ test_fapl_mpiposix_dup(void)
     mrc = MPI_Comm_free(&comm);
     VRFY((mrc==MPI_SUCCESS), "MPI_Comm_free");
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Pget_fapl_mpiposix(acc_pl, &comm_tmp);
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Pget_fapl_mpiposix(acc_pl, &comm_tmp, &use_gpfs);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     VRFY((ret >= 0), "H5Pget_fapl_mpiposix");
     MPI_Comm_size(comm_tmp,&mpi_size_tmp);
     MPI_Comm_rank(comm_tmp,&mpi_rank_tmp);
@@ -285,20 +275,12 @@ test_fapl_mpiposix_dup(void)
     VRFY((mrc==MPI_SUCCESS), "MPI_Comm_free");
 
     /* check NULL argument options. */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Pget_fapl_mpiposix(acc_pl, NULL);
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Pget_fapl_mpiposix(acc_pl, NULL, NULL);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     VRFY((ret >= 0), "H5Pget_fapl_mpiposix neither");
 
     /* now get it again and check validity too. */
     /* Don't free the returned object which is used in the next case. */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Pget_fapl_mpiposix(acc_pl, &comm_tmp);
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Pget_fapl_mpiposix(acc_pl, &comm_tmp, &use_gpfs);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     VRFY((ret >= 0), "H5Pget_fapl_mpiposix");
     MPI_Comm_size(comm_tmp,&mpi_size_tmp);
     MPI_Comm_rank(comm_tmp,&mpi_rank_tmp);
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 7ab3984..6a4a0b2 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -317,11 +317,7 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type,
 
     if (l_facc_type == FACC_MPIPOSIX) {
 	/* set Parallel access with communicator */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-	ret = H5Pset_fapl_mpiposix(ret_pl, comm);
-#else /* H5_WANT_H5_V1_4_COMPAT */
 	ret = H5Pset_fapl_mpiposix(ret_pl, comm, use_gpfs);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 	VRFY((ret >= 0), "H5Pset_fapl_mpiposix succeeded");
 	return(ret_pl);
     }