524 files changed, 34238 insertions, 41857 deletions

diff --git a/MANIFEST b/MANIFEST
index ad3c0eb..6b5677b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -190,6 +190,10 @@
 ./fortran/src/H5Gff.f90
 ./fortran/src/H5If.c
 ./fortran/src/H5Iff.f90
+./fortran/src/H5Lf.c
+./fortran/src/H5Lff.f90
+./fortran/src/H5Of.c
+./fortran/src/H5Off.f90
 ./fortran/src/H5Pf.c
 ./fortran/src/H5Pff.f90
 ./fortran/src/H5Rf.c
@@ -213,6 +217,7 @@
 ./fortran/src/Makefile.am
 ./fortran/src/Makefile.in
 ./fortran/src/README
+./fortran/src/README_DEVELOPEMENT 	_DO_NOT_DISTRIBUTE_
 ./fortran/src/h5fc.in
 ./fortran/src/libhdf5_fortran.settings.in
 
@@ -221,15 +226,19 @@
 ./fortran/test/fflush1.f90
 ./fortran/test/fflush2.f90
 ./fortran/test/fortranlib_test.f90
+./fortran/test/fortranlib_test_1_8.f90
 ./fortran/test/t.c
 ./fortran/test/t.h
 ./fortran/test/tf.f90
 ./fortran/test/tH5A.f90
+./fortran/test/tH5A_1_8.f90
 ./fortran/test/tH5D.f90
 ./fortran/test/tH5E.f90
 ./fortran/test/tH5F.f90
 ./fortran/test/tH5G.f90
+./fortran/test/tH5G_1_8.f90
 ./fortran/test/tH5I.f90
+./fortran/test/tH5O.f90
 ./fortran/test/tH5P.f90
 ./fortran/test/tH5R.f90
 ./fortran/test/tH5S.f90
@@ -267,6 +276,7 @@
 ./c++/examples/extend_ds.cpp
 ./c++/examples/h5group.cpp
 ./c++/examples/readdata.cpp
+./c++/examples/testexamples.sh
 ./c++/examples/testh5c++.sh.in
 ./c++/examples/writedata.cpp
 ./c++/examples/Makefile.am
@@ -380,18 +390,10 @@
 ./perform/pio_standalone.h
 ./perform/pio_timer.c
 ./perform/pio_timer.h
-./perform/sio_engine.c
-./perform/sio_perf.c
-./perform/sio_perf.h
-./perform/sio_standalone.c
-./perform/sio_standalone.h
-./perform/sio_timer.c
-./perform/sio_timer.h
 ./perform/zip_perf.c
 
 ./release_docs/COPYING
-./release_docs/HISTORY-1_0-1_8_0_rc3.txt
-./release_docs/HISTORY-1_9.txt
+./release_docs/HISTORY.txt
 ./release_docs/INSTALL
 ./release_docs/INSTALL_Cygwin.txt
 ./release_docs/INSTALL_MinGW.txt
@@ -456,7 +458,6 @@
 ./src/H5CS.c
 ./src/H5CSprivate.h
 ./src/H5D.c
-./src/H5Dchunk.c
 ./src/H5Dcompact.c
 ./src/H5Dcontig.c
 ./src/H5Ddbg.c
@@ -471,7 +472,6 @@
 ./src/H5Dpkg.h
 ./src/H5Dprivate.h
 ./src/H5Dpublic.h
-./src/H5Dscatgath.c
 ./src/H5Dselect.c
 ./src/H5Dtest.c
 ./src/H5E.c
@@ -857,7 +857,6 @@
 ./test/test_filters_le.hdf5
 ./test/test_filters_be.hdf5
 ./test/gen_filters.c
-./test/chunk_info.c
 
 ./test/testfiles/err_compat_1
 ./test/testfiles/err_compat_2
@@ -905,69 +904,39 @@
 ./tools/h5import/h5import.c
 ./tools/h5import/h5importtest.c
 ./tools/h5import/h5importtestutil.sh
-
-#tesfiles for h5import
-./tools/h5import/testfiles/binin32.h5
-./tools/h5import/testfiles/binin16.h5
-./tools/h5import/testfiles/txtfp32.txt
-./tools/h5import/testfiles/txtstr.conf
-./tools/h5import/testfiles/txtfp32.conf
-./tools/h5import/testfiles/binin8w.conf
-./tools/h5import/testfiles/binin8.h5
-./tools/h5import/testfiles/txtfp64.conf
-./tools/h5import/testfiles/binuin32.conf
-./tools/h5import/testfiles/txtuin32.txt
-./tools/h5import/testfiles/binuin16.conf
-./tools/h5import/testfiles/txtstr.h5
-./tools/h5import/testfiles/txtfp32.h5
-./tools/h5import/testfiles/txtin32.h5
-./tools/h5import/testfiles/txtin16.h5
-./tools/h5import/testfiles/binin8w.h5
-./tools/h5import/testfiles/txtin32.txt
-./tools/h5import/testfiles/binfp64.conf
-./tools/h5import/testfiles/binin8.conf
-./tools/h5import/testfiles/txtin8.conf
-./tools/h5import/testfiles/binfp64.h5
-./tools/h5import/testfiles/txtstr.txt
-./tools/h5import/testfiles/txtin32.conf
-./tools/h5import/testfiles/txtin16.conf
-./tools/h5import/testfiles/txtin8.h5
-./tools/h5import/testfiles/txtuin32.conf
-./tools/h5import/testfiles/txtuin16.conf
-./tools/h5import/testfiles/binin32.conf
-./tools/h5import/testfiles/binin16.conf
-./tools/h5import/testfiles/txtfp64.h5
-./tools/h5import/testfiles/txtin16.txt
-./tools/h5import/testfiles/txtfp64.txt
-./tools/h5import/testfiles/binuin32.h5
-./tools/h5import/testfiles/binuin16.h5
-./tools/h5import/testfiles/txtuin32.h5
-./tools/h5import/testfiles/txtuin16.h5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+./tools/h5import/testfiles/conbfp32
+./tools/h5import/testfiles/conbfp64
+./tools/h5import/testfiles/conbin16
+./tools/h5import/testfiles/conbin32
+./tools/h5import/testfiles/conbin8
+./tools/h5import/testfiles/conbuin16
+./tools/h5import/testfiles/conbuin32
+./tools/h5import/testfiles/fp1
+./tools/h5import/testfiles/fp2
+./tools/h5import/testfiles/in1
+./tools/h5import/testfiles/textfp32
+./tools/h5import/testfiles/textfp64
+./tools/h5import/testfiles/textin16
+./tools/h5import/testfiles/textin32
+./tools/h5import/testfiles/textin8
+./tools/h5import/testfiles/textuin16
+./tools/h5import/testfiles/textuin32
+./tools/h5import/testfiles/test1.h5
+./tools/h5import/testfiles/test2.h5
+./tools/h5import/testfiles/test3.h5
+./tools/h5import/testfiles/test4.h5
+./tools/h5import/testfiles/test5.h5
+./tools/h5import/testfiles/test6.h5
+./tools/h5import/testfiles/test7.h5
+./tools/h5import/testfiles/test8.h5
+./tools/h5import/testfiles/test9.h5
+./tools/h5import/testfiles/test10.h5
+./tools/h5import/testfiles/test11.h5
+./tools/h5import/testfiles/test12.h5
+./tools/h5import/testfiles/test13.h5
+./tools/h5import/testfiles/teststr.h5
+./tools/h5import/testfiles/txtstr
+./tools/h5import/testfiles/textstr
 
 
 
@@ -1697,7 +1666,6 @@
 ./windows/COPYING
 ./windows/hdf5bt.BAT
 ./windows/hdf5build.BAT
-./windows/hdf5build_examples.BAT
 ./windows/hdf5check.BAT
 ./windows/InstallcppExamples.BAT
 ./windows/install_dll.BAT
@@ -1815,46 +1783,16 @@
 ./windows/hl/examples/test_hl_cexamples.BAT
 ./windows/hl/examples/allhlcexamples/allhlcexamples.sln
 ./windows/hl/examples/allhlcexamples/allhlcexamples.vcproj
-./windows/hl/examples/ex_ds1/ex_ds1.vcproj
-./windows/hl/examples/ex_ds1dll/ex_ds1dll.vcproj
-./windows/hl/examples/ex_image1/ex_image1.vcproj
-./windows/hl/examples/ex_image1dll/ex_image1dll.vcproj
-./windows/hl/examples/ex_image2/ex_image2.vcproj
-./windows/hl/examples/ex_image2dll/ex_image2dll.vcproj
-./windows/hl/examples/ex_lite1/ex_lite1.vcproj
-./windows/hl/examples/ex_lite1dll/ex_lite1dll.vcproj
-./windows/hl/examples/ex_lite2/ex_lite2.vcproj
-./windows/hl/examples/ex_lite2dll/ex_lite2dll.vcproj
-./windows/hl/examples/ex_lite3/ex_lite3.vcproj
-./windows/hl/examples/ex_lite3dll/ex_lite3dll.vcproj
-./windows/hl/examples/ex_table01/ex_table01.vcproj
-./windows/hl/examples/ex_table01dll/ex_table01dll.vcproj
-./windows/hl/examples/ex_table02/ex_table02.vcproj
-./windows/hl/examples/ex_table02dll/ex_table02dll.vcproj
-./windows/hl/examples/ex_table03/ex_table03.vcproj
-./windows/hl/examples/ex_table03dll/ex_table03dll.vcproj
-./windows/hl/examples/ex_table04/ex_table04.vcproj
-./windows/hl/examples/ex_table04dll/ex_table04dll.vcproj
-./windows/hl/examples/ex_table05/ex_table05.vcproj
-./windows/hl/examples/ex_table05dll/ex_table05dll.vcproj
-./windows/hl/examples/ex_table06/ex_table06.vcproj
-./windows/hl/examples/ex_table06dll/ex_table06dll.vcproj
-./windows/hl/examples/ex_table07/ex_table07.vcproj
-./windows/hl/examples/ex_table07dll/ex_table07dll.vcproj
-./windows/hl/examples/ex_table08/ex_table08.vcproj
-./windows/hl/examples/ex_table08dll/ex_table08dll.vcproj
-./windows/hl/examples/ex_table09/ex_table09.vcproj
-./windows/hl/examples/ex_table09dll/ex_table09dll.vcproj
-./windows/hl/examples/ex_table10/ex_table10.vcproj
-./windows/hl/examples/ex_table10dll/ex_table10dll.vcproj
-./windows/hl/examples/ex_table11/ex_table11.vcproj
-./windows/hl/examples/ex_table11dll/ex_table11dll.vcproj
-./windows/hl/examples/ex_table12/ex_table12.vcproj
-./windows/hl/examples/ex_table12dll/ex_table12dll.vcproj
-./windows/hl/examples/ptExampleFL/ptExampleFL.vcproj
-./windows/hl/examples/ptExampleFLdll/ptExampleFLdll.vcproj
-./windows/hl/examples/ptExampleVL/ptExampleVL.vcproj
-./windows/hl/examples/ptExampleVLdll/ptExampleVLdll.vcproj
+./windows/hl/examples/ex_ds/ex_ds.vcproj
+./windows/hl/examples/ex_dsdll/ex_dsdll.vcproj
+./windows/hl/examples/ex_images/ex_images.vcproj
+./windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
+./windows/hl/examples/ex_lite/ex_lite.vcproj
+./windows/hl/examples/ex_litedll/ex_litedll.vcproj
+./windows/hl/examples/ex_packet/ex_packet.vcproj
+./windows/hl/examples/ex_packetdll/ex_packetdll.vcproj
+./windows/hl/examples/ex_table/ex_table.vcproj
+./windows/hl/examples/ex_tabledll/ex_tabledll.vcproj
 
 # High-Level Fortran Examples
 ./windows/hl/fortran/examples/test_hl_f90examples.BAT
@@ -1923,9 +1861,6 @@
 ./windows/proj/hdf5_hl_fortran/hdf5_hl_fortran.vfproj
 ./windows/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.vfproj
 
-# Visual Studio Property Sheets
-./windows/proj/property_sheets/remove-posix-warnings.vsprops
-
 # Windows-maintainted Source
 ./windows/src/H5pubconf.h
 ./windows/src/H5Tinit.c
@@ -1944,8 +1879,6 @@
 ./windows/test/cache_apidll/cache_apidll.vcproj
 ./windows/test/cachedll/cachedll.vcproj
 ./windows/test/chunk/chunk.vcproj
-./windows/test/chunk_info/chunk_info.vcproj
-./windows/test/chunk_infodll/chunk_infodll.vcproj
 ./windows/test/chunkdll/chunkdll.vcproj
 ./windows/test/cmpd_dset/cmpd_dset.vcproj
 ./windows/test/cmpd_dsetdll/cmpd_dsetdll.vcproj
@@ -2006,6 +1939,7 @@
 ./windows/test/objcopydll/objcopydll.vcproj
 ./windows/test/ohdr/ohdr.vcproj
 ./windows/test/ohdrdll/ohdrdll.vcproj
+./windows/test/ohdr_gentst/ohdr_gentst.vcproj
 ./windows/test/overhead/overhead.vcproj
 ./windows/test/overheaddll/overheaddll.vcproj
 ./windows/test/pool/pool.vcproj
@@ -2120,46 +2054,16 @@
 ./windows_vnet/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj
 ./windows_vnet/hl/examples/allhlcexamples/allhlcexamples.vcproj
 ./windows_vnet/hl/examples/allhlcexamples/allhlcexamples.sln
-./windows_vnet/hl/examples/ex_ds1/ex_ds1.vcproj
-./windows_vnet/hl/examples/ex_ds1dll/ex_ds1dll.vcproj
-./windows_vnet/hl/examples/ex_image1/ex_image1.vcproj
-./windows_vnet/hl/examples/ex_image1dll/ex_image1dll.vcproj
-./windows_vnet/hl/examples/ex_image2/ex_image2.vcproj
-./windows_vnet/hl/examples/ex_image2dll/ex_image2dll.vcproj
-./windows_vnet/hl/examples/ex_lite1/ex_lite1.vcproj
-./windows_vnet/hl/examples/ex_lite1dll/ex_lite1dll.vcproj
-./windows_vnet/hl/examples/ex_lite2/ex_lite2.vcproj
-./windows_vnet/hl/examples/ex_lite2dll/ex_lite2dll.vcproj
-./windows_vnet/hl/examples/ex_lite3/ex_lite3.vcproj
-./windows_vnet/hl/examples/ex_lite3dll/ex_lite3dll.vcproj
-./windows_vnet/hl/examples/ex_table01/ex_table01.vcproj
-./windows_vnet/hl/examples/ex_table01dll/ex_table01dll.vcproj
-./windows_vnet/hl/examples/ex_table02/ex_table02.vcproj
-./windows_vnet/hl/examples/ex_table02dll/ex_table02dll.vcproj
-./windows_vnet/hl/examples/ex_table03/ex_table03.vcproj
-./windows_vnet/hl/examples/ex_table03dll/ex_table03dll.vcproj
-./windows_vnet/hl/examples/ex_table04/ex_table04.vcproj
-./windows_vnet/hl/examples/ex_table04dll/ex_table04dll.vcproj
-./windows_vnet/hl/examples/ex_table05/ex_table05.vcproj
-./windows_vnet/hl/examples/ex_table05dll/ex_table05dll.vcproj
-./windows_vnet/hl/examples/ex_table06/ex_table06.vcproj
-./windows_vnet/hl/examples/ex_table06dll/ex_table06dll.vcproj
-./windows_vnet/hl/examples/ex_table07/ex_table07.vcproj
-./windows_vnet/hl/examples/ex_table07dll/ex_table07dll.vcproj
-./windows_vnet/hl/examples/ex_table08/ex_table08.vcproj
-./windows_vnet/hl/examples/ex_table08dll/ex_table08dll.vcproj
-./windows_vnet/hl/examples/ex_table09/ex_table09.vcproj
-./windows_vnet/hl/examples/ex_table09dll/ex_table09dll.vcproj
-./windows_vnet/hl/examples/ex_table10/ex_table10.vcproj
-./windows_vnet/hl/examples/ex_table10dll/ex_table10dll.vcproj
-./windows_vnet/hl/examples/ex_table11/ex_table11.vcproj
-./windows_vnet/hl/examples/ex_table11dll/ex_table11dll.vcproj
-./windows_vnet/hl/examples/ex_table12/ex_table12.vcproj
-./windows_vnet/hl/examples/ex_table12dll/ex_table12dll.vcproj
-./windows_vnet/hl/examples/ptExampleFL/ptExampleFL.vcproj
-./windows_vnet/hl/examples/ptExampleFLdll/ptExampleFLdll.vcproj
-./windows_vnet/hl/examples/ptExampleVL/ptExampleVL.vcproj
-./windows_vnet/hl/examples/ptExampleVLdll/ptExampleVLdll.vcproj
+./windows_vnet/hl/examples/ex_ds/ex_ds.vcproj
+./windows_vnet/hl/examples/ex_dsdll/ex_dsdll.vcproj
+./windows_vnet/hl/examples/ex_images/ex_images.vcproj
+./windows_vnet/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
+./windows_vnet/hl/examples/ex_lite/ex_lite.vcproj
+./windows_vnet/hl/examples/ex_litedll/ex_litedll.vcproj
+./windows_vnet/hl/examples/ex_packet/ex_packet.vcproj
+./windows_vnet/hl/examples/ex_packetdll/ex_packetdll.vcproj
+./windows_vnet/hl/examples/ex_table/ex_table.vcproj
+./windows_vnet/hl/examples/ex_tabledll/ex_tabledll.vcproj
 ./windows_vnet/hl/test/hl_test_ds/hl_test_ds.vcproj
 ./windows_vnet/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj
 ./windows_vnet/hl/test/hl_test_image/hl_test_image.vcproj
@@ -2196,8 +2100,6 @@
 ./windows_vnet/test/cache_apidll/cache_apidll.vcproj
 ./windows_vnet/test/cachedll/cachedll.vcproj
 ./windows_vnet/test/chunk/chunk.vcproj
-./windows_vnet/test/chunk_info/chunk_info.vcproj
-./windows_vnet/test/chunk_infodll/chunk_infodll.vcproj
 ./windows_vnet/test/chunkdll/chunkdll.vcproj
 ./windows_vnet/test/cmpd_dset/cmpd_dset.vcproj
 ./windows_vnet/test/cmpd_dsetdll/cmpd_dsetdll.vcproj
@@ -2258,6 +2160,7 @@
 ./windows_vnet/test/objcopydll/objcopydll.vcproj
 ./windows_vnet/test/ohdr/ohdr.vcproj
 ./windows_vnet/test/ohdrdll/ohdrdll.vcproj
+./windows_vnet/test/ohdr_gentst/ohdr_gentst.vcproj
 ./windows_vnet/test/overhead/overhead.vcproj
 ./windows_vnet/test/overheaddll/overheaddll.vcproj
 ./windows_vnet/test/pool/pool.vcproj
diff --git a/README.txt b/README.txt
index 0f6d28a..4ac4bfe 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.9.5 currently under development
+HDF5 version 1.8.0 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
@@ -9,8 +9,8 @@ instructions on compiling and installing the library.  The INSTALL_parallel
 file contains instructions on installing the parallel version of the
 library.  The INSTALL* files can be found in the release_docs/ directory.
 
-Documentation for this snapshot can be found at the following URL:
-http://www.hdfgroup.uiuc.edu/HDF5/doc_dev_snapshot/H5_dev/
+Documentation for this release can be found at the following URL:
+http://www.hdfgroup.uiuc.edu/HDF5/release/beta/obtain518.html
 
 Four mailing lists are currently set up for use with the HDF5
 library.
diff --git a/bin/runtest b/bin/runtest
index 4356db3..34386e4 100755
--- a/bin/runtest
+++ b/bin/runtest
@@ -419,34 +419,6 @@ RUNSNAPTEST()
     fi
 }
 
-TIMELIMIT_PARSE()
-{
-    # Function returns timeparam for timekeeper via standard out - 
-    # any debug statements should be 'echo "Debug string" >&2' or timekeeper 
-    # will declare timeparam to be non-numeric and ignore it.
-    while read x y ; do
-        # Scan for entry for this weekday.
-        xd=`echo $x | cut -f1 -d/`
-        if [ "$xd" = ${WEEKDAY} ]; then
-            # strip away the weekday/ part.
-            timeparam=`echo $x | cut -f2 -d/`
-            break
-        fi
-        case "$x" in
-           '' | '#'*)
-                # blank or comment lines.  Continue.
-                ;;
-            ???/*)
-                # Ignore any entry not of this weekday.
-                ;;
-            *)
-                timeparam="$x"
-                ;;
-        esac
-    done
-    echo $timeparam
-    return
-}
 
 # configuration parsing.
 # Taking configuration from input.
@@ -589,7 +561,7 @@ errcode=0			# error code of the whole test
 skiptest=no			# if test is skipped
 CC_SAVED="$CC"			# CC & PATH maybe changed within a test.
 PATH_SAVED=$PATH		# These save the original values.
-timelimit=300			# default time limit (minutes) for the timekeeper
+timelimit=300			# time limit (minutes) for the timekeeper
 
 #################################
 # Parse options
@@ -875,7 +847,7 @@ if [ -n "$TESTHOST" -a $HOSTNAME != "$TESTHOST" ]; then
     cd ${SNAPYARD}/log
     # Fork off timekeeper if concurrent tests will be used.
     if [ -n "$SRCDIR" ]; then
-        timelimit=`TIMELIMIT_PARSE < $TIMELIMIT`
+	timelimit=`grep -v '^#' $TIMELIMIT`
 	($SNAPYARD/current/bin/timekeeper $timelimit > $TIMEKEEPERLOG 2>&1 &)
 	PRINT "    Fork off timekeeper $timelimit"
     fi
@@ -900,10 +872,10 @@ if [ -n "$TESTHOST" -a $HOSTNAME != "$TESTHOST" ]; then
 
 		# launch concurrent tests only if srcdir is used
 		if [ -n "$SRCDIR" ]; then
-		    $CMD || REPORT_ERR "****FAILED ${h}: Abnormal exit from runtest****" && PRINT_BLANK &
+		    $CMD &
 		    echo $! > PID.${h}_${CONFIGNAME}
 		else
-		    $CMD || REPORT_ERR "****FAILED ${h}: Abnormal exit from runtest****" && PRINT_BLANK
+		    $CMD
 		fi
 		;;
 	    NoRemoteCommand)
@@ -927,7 +899,7 @@ if [ -n "$TESTHOST" -a $HOSTNAME != "$TESTHOST" ]; then
 	TMP_OUTPUT="#${h}_${CONFIGNAME}.out"
 	cat $TMP_OUTPUT
 	# Verify test script did complete by checking the last lines
-	(tail -5 $TMP_OUTPUT | grep -s 'Grand total' > /dev/null 2>&1) ||
+	(tail -2 $TMP_OUTPUT | grep -s 'Grand total' > /dev/null 2>&1) ||
 	    (REPORT_ERR "****FAILED ${h}: snaptest did not complete****" &&
 		PRINT_BLANK)
 	rm -f $TMP_OUTPUT PID.${h}_${CONFIGNAME}
diff --git a/c++/examples/testexamples.sh b/c++/examples/testexamples.sh
new file mode 100755
index 0000000..2b6cc1b
--- /dev/null
+++ b/c++/examples/testexamples.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# Copyright by The HDF Group.
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+
+CMP='cmp -s'
+DIFF='diff -c'
+
+nerrors=0
+verbose=yes
+
+# The build (current) directory might be different than the source directory.
+if test -z "$srcdir"; then
+   srcdir=.
+fi
+
+actual=sample.out
+expect=$srcdir/expected.out
+
+# Print a line-line message left justified in a field of 70 characters
+# beginning with the word "Testing".
+TESTING()
+{
+    SPACES="                                                               "
+    echo "Testing $* $SPACES" |cut -c1-70 |tr -d '\012'
+}
+
+TESTING C++ Examples
+
+(
+   ./create
+   ./readdata
+   ./writedata
+   ./compound
+   ./extend_ds
+   ./chunks
+   ./h5group
+) > $actual
+
+if $CMP $expect $actual; then
+   echo " PASSED"
+else
+   echo "*FAILED*"
+   echo "    Expected result differs from actual result"
+   nerrors="`expr $nerrors + 1`"
+   test yes = "$verbose" && $DIFF $expect $actual | sed 's/^/    /'
+fi
+
+# Clean up output file
+if test -z "$HDF5_NOCLEANUP"; then
+   rm -f $actual
+fi
+
+if test $nerrors -eq 0 ; then
+   echo "All tests passed."
+fi
+
+exit $nerrors
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index 043dc4d..1bca691 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -131,36 +131,22 @@ void Attribute::read( const DataType& mem_type, void *buf ) const
 ///\exception	H5::AttributeIException
 // Programmer	Binh-Minh Ribler - Apr, 2003
 // Modification
-//	Mar 2008
-//		Corrected a misunderstanding that H5Aread would allocate
-//		space for the buffer.  Obtained the attribute size and
-//		allocated memory properly. - BMR
+//		2006/12/9 - H5Aread allocates memory for character string
+//			    buffer with malloc, therefore, no allocation here,
+//			    but HDfree is needed. - BMR
 //--------------------------------------------------------------------------
 void Attribute::read( const DataType& mem_type, H5std_string& strg ) const
 {
-   // Get the attribute size and allocate temporary C-string for C API
-   hsize_t attr_size = H5Aget_storage_size(id);
-   if (attr_size <= 0)
-   {
-      throw AttributeIException("Attribute::read", "Unable to get attribute size before reading");
-   }
-   char* strg_C = new char [attr_size+1];
-   if (strg_C == NULL)
-   {
-      throw AttributeIException("Attribute::read", "Unable to allocate buffer to read the attribute");
-   }
+   char* strg_C;  // temporary C-string for C API
 
-   // Call C API to get the attribute data, a string of chars
-   herr_t ret_value = H5Aread(id, mem_type.getId(), &strg_C);
+   // call C API to get the attribute string of chars
+   herr_t ret_value = H5Aread( id, mem_type.getId(), &strg_C);
    if( ret_value < 0 )
    {
       throw AttributeIException("Attribute::read", "H5Aread failed");
    }
-
-   // Get 'string' from the C char* and release resource
-   strg_C[attr_size] = '\0';
-   strg = strg_C;
-   delete []strg_C;
+   strg = strg_C;	// get 'string' from the C char*
+   HDfree(strg_C);
 }
 
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp
index 76bc089..136fb3b 100644
--- a/c++/src/H5PropList.cpp
+++ b/c++/src/H5PropList.cpp
@@ -25,7 +25,6 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
-#include "H5private.h"		// for HDfree
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -158,7 +157,7 @@ void PropList::copyProp(PropList& dest, const char *name) const
 /// 		It differs from the above function only in what arguments it
 ///		accepts.
 ///\param	dest - IN: Destination property list or class
-///\param	name - IN: Name of the property to copy - \c H5std_string
+///\param	name - IN: Name of the property to copy - \c std::string
 // Programmer	Binh-Minh Ribler - Jul, 2005
 //--------------------------------------------------------------------------
 void PropList::copyProp( PropList& dest, const H5std_string& name ) const
@@ -195,7 +194,7 @@ void PropList::copyProp( PropList& dest, PropList& src, const char *name ) const
 ///		accepts. - Obsolete
 ///\param	dest - IN: Destination property list or class
 ///\param	src  - IN: Source property list or class
-///\param	name - IN: Name of the property to copy - \c H5std_string
+///\param	name - IN: Name of the property to copy - \c std::string
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 void PropList::copyProp( PropList& dest, PropList& src, const H5std_string& name ) const
@@ -274,7 +273,7 @@ bool PropList::propExist(const char* name ) const
 ///\brief	This is an overloaded member function, provided for convenience.
 /// 		It differs from the above function only in what arguments it
 ///		accepts.
-///\param	name - IN: Name of property to check for - \c H5std_string
+///\param	name - IN: Name of property to check for - \c std::string
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
 bool PropList::propExist(const H5std_string& name ) const
@@ -327,7 +326,7 @@ void PropList::getProperty(const char* name, void* value) const
 ///   		It differs from the above function only in what arguments it
 ///		accepts.
 ///\param	name -  IN: Name of property to query - \c char pointer
-///\return	The property that is a \c H5std_string.
+///\return	The property that is a \c std::string.
 ///\exception	H5::PropListIException
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
@@ -344,7 +343,7 @@ H5std_string PropList::getProperty(const char* name) const
    }
 
    // Return propety value as a string after deleting temp C-string
-   H5std_string prop_strg(prop_strg_C);
+   H5std_string prop_strg = H5std_string(prop_strg_C);
    delete []prop_strg_C;
    return (prop_strg);
 }
@@ -353,7 +352,7 @@ H5std_string PropList::getProperty(const char* name) const
 ///\brief	This is an overloaded member function, provided for convenience.
 ///   		It differs from the above function only in what arguments it
 ///		accepts.
-///\param	name -   IN: Name of property to query - \c H5std_string
+///\param	name -   IN: Name of property to query - \c std::string
 ///\param	value - OUT: Pointer to the buffer for the property value
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
@@ -366,8 +365,8 @@ void PropList::getProperty(const H5std_string& name, void* value) const
 ///\brief	This is an overloaded member function, provided for convenience.
 ///   		It differs from the above function only in what arguments it
 ///		accepts.
-///\param	name -  IN: Name of property to query - \c H5std_string
-///\return	The property that is a \c H5std_string.
+///\param	name -  IN: Name of property to query - \c std::string
+///\return	The property that is a \c std::string.
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
 H5std_string PropList::getProperty(const H5std_string& name) const
@@ -403,7 +402,7 @@ size_t PropList::getPropSize(const char *name) const
 ///\brief	This is an overloaded member function, provided for convenience.
 /// 		It differs from the above function only in what arguments it
 ///		accepts.
-///\param	name - IN: Name of property to query - \c H5std_string
+///\param	name - IN: Name of property to query - \c std::string
 ///
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
@@ -422,13 +421,12 @@ size_t PropList::getPropSize(const H5std_string& name) const
 H5std_string PropList::getClassName() const
 {
    char* temp_str;
-   temp_str = H5Pget_class_name(id); // this API specified that temp_str must
-				     // be freed.
+   temp_str = H5Pget_class_name(id);
 
    if (temp_str != NULL)
    {
-      H5std_string class_name(temp_str);
-      HDfree(temp_str);
+      H5std_string class_name = H5std_string(temp_str);
+      free(temp_str);
       return(class_name);
    }
    else
@@ -491,7 +489,7 @@ void PropList::setProperty(const char* name, const char* charptr) const
 /// 		It differs from the above function only in what arguments it
 ///		accepts.
 ///\param	name - IN: Name of property to set - \c char pointer
-///\param	strg - IN: Value for the property is a \c H5std_string
+///\param	strg - IN: Value for the property is a \c std::string
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
 void PropList::setProperty(const char* name, H5std_string& strg) const
@@ -504,7 +502,7 @@ void PropList::setProperty(const char* name, H5std_string& strg) const
 ///\brief	This is an overloaded member function, provided for convenience.
 /// 		It differs from the above function only in what arguments it
 ///		accepts.
-///\param	name  - IN: Name of property to set - \c H5std_string
+///\param	name  - IN: Name of property to set - \c std::string
 ///\param	value - IN: Void pointer to the value for the property
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
@@ -518,7 +516,7 @@ void PropList::setProperty(const H5std_string& name, void* value) const
 ///\brief	This is an overloaded member function, provided for convenience.
 /// 		It differs from the above function only in what arguments it
 ///		accepts.
-///\param	name - IN: Name of property to set - \c H5std_string
+///\param	name - IN: Name of property to set - \c std::string
 ///\param	strg - IN: Value for the property is a \c std::string
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
@@ -571,7 +569,7 @@ void PropList::removeProp(const char *name) const
 ///\brief	This is an overloaded member function, provided for convenience.
 /// 		It differs from the above function only in what arguments it
 ///		accepts.
-///\param	name - IN: Name of property to remove - \c H5std_string
+///\param	name - IN: Name of property to remove - \c std::string
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
 void PropList::removeProp(const H5std_string& name) const
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index 557f400..ac468c4 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -144,6 +144,8 @@ static void test_classes()
  */
 static void test_copy()
 {
+    hid_t               a_copy;
+    herr_t		status;
 
     SUBTEST("DataType::copy() and DataType::operator=");
     try {
@@ -211,6 +213,7 @@ static void test_query()
 	long   c;
 	double d;
     } s_type_t;
+    char	filename[1024];
     short	enum_val;
 
     // Output message about test being performed
@@ -385,9 +388,11 @@ static void test_transient ()
 const H5std_string filename2("dtypes2.h5");
 static void test_named ()
 {
+    herr_t		status;
     static hsize_t	ds_size[2] = {10, 20};
     hsize_t		i;
     unsigned 		attr_data[10][20];
+    char		filename[1024];
     
     SUBTEST("Named datatypes");
     try {
diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
index 007ab10..469e861 100644
--- a/c++/test/tvlstr.cpp
+++ b/c++/test/tvlstr.cpp
@@ -527,6 +527,7 @@ static void test_compact_vlstring()
  *-------------------------------------------------------------------------
  */
 // String for testing attributes
+static const char *string_att = "This is the string for the attribute";
 static char *string_att_write=NULL;
 
 // Info for a string attribute
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 56cd471..e47c16e 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -17,7 +17,7 @@
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 5
-LT_VERS_REVISION = 6
+LT_VERS_REVISION = 0
 LT_VERS_AGE = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and
diff --git a/configure b/configure
index f2f0a90..dd0561a 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in Id: configure.in 14849 2008-04-20 11:32:00Z hdftest .
+# From configure.in Id: configure.in 14460 2008-01-27 17:41:14Z epourmal .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for HDF5 1.9.5.
+# Generated by GNU Autoconf 2.61 for HDF5 1.8.0.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -729,8 +729,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.9.5'
-PACKAGE_STRING='HDF5 1.9.5'
+PACKAGE_VERSION='1.8.0'
+PACKAGE_STRING='HDF5 1.8.0'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 
 ac_unique_file="src/H5.c"
@@ -1478,7 +1478,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.9.5 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.8.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1548,7 +1548,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.9.5:";;
+     short | recursive ) echo "Configuration of HDF5 1.8.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1731,7 +1731,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.9.5
+HDF5 configure 1.8.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1745,7 +1745,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.9.5, which was
+It was created by HDF5 $as_me 1.8.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2440,7 +2440,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.9.5'
+ VERSION='1.8.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22561,7 +22561,7 @@ fi
 
 
 case "X-$enable_production" in
-  X-yes)
+  X-|X-yes)
     enable_production="yes"
     { echo "$as_me:$LINENO: result: production" >&5
 echo "${ECHO_T}production" >&6; }
@@ -22602,7 +22602,7 @@ echo "${ECHO_T}production" >&6; }
     H5_CXXFLAGS="$H5_CXXFLAGS $PROD_CXXFLAGS"
     H5_FCFLAGS="$H5_FCFLAGS $PROD_FCFLAGS"
     ;;
-  X-|X-no)
+  X-no)
     enable_production="no"
     { echo "$as_me:$LINENO: result: development" >&5
 echo "${ECHO_T}development" >&6; }
@@ -45711,22 +45711,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 { echo "$as_me:$LINENO: checking for global timezone variable" >&5
 echo $ECHO_N "checking for global timezone variable... $ECHO_C" >&6; }
-
-case "`uname`" in
-  CYGWIN*)
-    { echo "$as_me:$LINENO: result: disabled in CYGWIN" >&5
-echo "${ECHO_T}disabled in CYGWIN" >&6; }
-    ;;
-  *)
-    cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-    #include <sys/time.h>
-    #include <time.h>
+#include <sys/time.h>
+#include <time.h>
 #ifdef FC_DUMMY_MAIN
 #ifndef FC_DUMMY_MAIN_EQ_F77
 #  ifdef __cplusplus
@@ -45766,7 +45759,7 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_TIMEZONE 1
 _ACEOF
 
-    { echo "$as_me:$LINENO: result: yes" >&5
+{ echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 else
   echo "$as_me: failed program was:" >&5
@@ -45778,8 +45771,6 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-    ;;
-esac
 
 { echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
@@ -50802,29 +50793,6 @@ else
 echo "${ECHO_T}false" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking if the machine has window style path name" >&5
-echo $ECHO_N "checking if the machine has window style path name... $ECHO_C" >&6; }
-if test "${hdf5_have_window_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  hdf5_have_window_path=no
-fi
-
-
-if test ${hdf5_have_window_path} = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WINDOW_PATH 1
-_ACEOF
-
-  { echo "$as_me:$LINENO: result: true" >&5
-echo "${ECHO_T}true" >&6; }
-else
-  { echo "$as_me:$LINENO: result: false" >&5
-echo "${ECHO_T}false" >&6; }
-fi
-
-
 { echo "$as_me:$LINENO: checking if converting from long double to integers is accurate" >&5
 echo $ECHO_N "checking if converting from long double to integers is accurate... $ECHO_C" >&6; }
 
@@ -52712,7 +52680,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.9.5, which was
+This file was extended by HDF5 $as_me 1.8.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -52765,7 +52733,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-HDF5 config.status 1.9.5
+HDF5 config.status 1.8.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.in b/configure.in
index 8a45e38..c34e47a 100644
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,7 @@ dnl
 dnl NOTE: Don't forget to change the version number here when we do a
 dnl release!!!
 dnl
-AC_INIT([HDF5], [1.9.5], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.0], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AM_CONFIG_HEADER([src/H5config.h])
 
@@ -1011,7 +1011,7 @@ AC_ARG_ENABLE(production,
                               [Determines how to run the compiler.])])
 
 case "X-$enable_production" in
-  X-yes)
+  X-|X-yes)
     enable_production="yes"
     AC_MSG_RESULT([production])
 
@@ -1053,7 +1053,7 @@ case "X-$enable_production" in
     H5_CXXFLAGS="$H5_CXXFLAGS $PROD_CXXFLAGS"
     H5_FCFLAGS="$H5_FCFLAGS $PROD_FCFLAGS"
     ;;
-  X-|X-no)
+  X-no)
     enable_production="no"
     AC_MSG_RESULT([development])
     CONFIG_MODE=development
@@ -1728,21 +1728,13 @@ AC_MSG_RESULT([no]))
 
 dnl Check whether the global variable `timezone' is defined.
 AC_MSG_CHECKING([for global timezone variable])
-
-case "`uname`" in
-  CYGWIN*)
-    AC_MSG_RESULT([disabled in CYGWIN])
-    ;;
-  *)
-    AC_TRY_LINK([
-    #include <sys/time.h>
-    #include <time.h>], [timezone=0;],
-    AC_DEFINE([HAVE_TIMEZONE], [1],
-              [Define if `timezone' is a global variable])
-    AC_MSG_RESULT([yes]),
-    AC_MSG_RESULT([no]))
-    ;;
-esac
+AC_TRY_LINK([
+#include <sys/time.h>
+#include <time.h>], [timezone=0;],
+AC_DEFINE([HAVE_TIMEZONE], [1],
+          [Define if `timezone' is a global variable])
+AC_MSG_RESULT([yes]),
+AC_MSG_RESULT([no]))
 
 dnl Check whether `struct timezone' is defined.
 AC_STRUCT_TIMEZONE
@@ -2814,24 +2806,6 @@ else
   AC_MSG_RESULT([false])
 fi
 
-dnl ----------------------------------------------------------------------
-dnl Set the flag to indicate that the machine has window style pathname,
-dnl that is, "drive-letter:\" (e.g. "C:") or "drive-letter:/" (e.g. "C:/").
-dnl (This flag should be _unset_ for all machines, except for Windows, where
-dnl it's set in the custom Windows H5pubconf.h file)
-dnl
-AC_MSG_CHECKING([if the machine has window style path name])
-AC_CACHE_VAL([hdf5_have_window_path], [hdf5_have_window_path=no])
-
-if test ${hdf5_have_window_path} = "yes"; then
-  AC_DEFINE([HAVE_WINDOW_PATH], [1],
-            [Define if your system has window style path name.])
-  AC_MSG_RESULT([true])
-else
-  AC_MSG_RESULT([false])
-fi
-
-
 dnl -----------------------------------------------------------------------
 dnl Set flag to indicate that the machine can handle conversion from 
 dnl long double to integers accurately.  This flag should be set "yes" for 
diff --git a/fortran/src/H5Af.c b/fortran/src/H5Af.c
index 0be225b..5fdc27e 100644
--- a/fortran/src/H5Af.c
+++ b/fortran/src/H5Af.c
@@ -35,7 +35,7 @@
  *---------------------------------------------------------------------------*/
 int_f
 nh5acreate_c(hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id,
-    hid_t_f *space_id, hid_t_f *crt_prp, hid_t_f *attr_id)
+    hid_t_f *space_id, hid_t_f *crt_prp, hid_t_f *aapl, hid_t_f *attr_id)
 {
     char *c_name = NULL;        /* Buffer to hold C string */
     int_f ret_value = 0;        /* Return value */
@@ -49,7 +49,7 @@ nh5acreate_c(hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id,
      /*
       * Call H5Acreate2 function.
       */
-    if((*attr_id = (hid_t_f)H5Acreate2((hid_t)*obj_id, c_name, (hid_t)*type_id, (hid_t)*space_id, (hid_t)*crt_prp, H5P_DEFAULT)) < 0)
+    if((*attr_id = (hid_t_f)H5Acreate2((hid_t)*obj_id, c_name, (hid_t)*type_id, (hid_t)*space_id, (hid_t)*crt_prp, (hid_t)*aapl)) < 0)
         HGOTO_DONE(FAIL);
 
 done:
@@ -959,7 +959,7 @@ done:
  * Name:        h5aget_name_c
  * Purpose:     Call H5Aget_name to get attribute's name
  * Inputs:      attr_id - attribute identifier
- *              bufsize -size of the buffer
+ *              bufsize - size of the buffer
  * Outputs:     buf - buffer to hold the name
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
@@ -969,27 +969,801 @@ done:
 int_f
 nh5aget_name_c(hid_t_f *attr_id, size_t_f *bufsize, _fcd buf)
 {
-    char *c_buf=NULL;           /* Buffer to hold C string */
+  size_t c_bufsize;
+  char *c_buf=NULL;           /* Buffer to hold C string */
+  int_f ret_value=0;          /* Return value */
+    
+  c_bufsize = (size_t)*bufsize+1;
+  /*
+   * Allocate buffer to hold name of an attribute
+   */
+  if ((c_buf = HDmalloc(c_bufsize)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Aget_name function
+   */
+  
+  if ((ret_value = (int_f)H5Aget_name((hid_t)*attr_id, c_bufsize, c_buf)) < 0)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Convert C name to FORTRAN and place it in the given buffer
+   */
+  HD5packFstring(c_buf, _fcdtocp(buf), c_bufsize-1);
+
+done:
+  if(c_buf) HDfree(c_buf);
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5aget_storage_size_c
+ * Purpose:     Call H5Aget_storage_size
+ * Inputs:      attr_id - identifier of an attribute
+ * Outputs:     size    - attributes storage requirements
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M. S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5aget_storage_size_c ( hid_t_f *attr_id,  hsize_t_f *size)
+{
+    int_f ret_value=0;          /* Return value */
+
+    if ((*size = (hsize_t_f)H5Aget_storage_size((hid_t)*attr_id)) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5aget_create_plist_c
+ * Purpose:     Call H5Aget_create_plist 
+ * Inputs:      attr_id - identifier of an attribute
+ * Outputs:     creation_prop_id - Identifier for the attribute’s creation property
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M. S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5aget_create_plist_c ( hid_t_f *attr_id,  hid_t_f *creation_prop_id)
+{
     int_f ret_value=0;          /* Return value */
 
+    if ((*creation_prop_id = (hid_t_f)H5Aget_create_plist((hid_t)*attr_id)) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:      h5arename_by_name_c
+ * Purpose:   Calls H5Arename_by_name
+ * Inputs:    loc_id        - Object identifier 
+ *            obj_name      - Name of object, relative to location, 
+ *                             whose attribute is to be renamed
+ *            obj_name_len      - Object name length
+ *            old_attr_name     - Prior attribute name
+ *            old_attr_name_len - Prior attribute name length
+ *            new_attr_name     - New attribute name
+ *            new_attr_name_len - New attribute name length
+ *            lapl_id       - Link access property list identifier
+ * Outputs:     N/A
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M. S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5arename_by_name_c( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+		      _fcd old_attr_name, size_t_f *old_attr_namelen,
+		      _fcd new_attr_name, size_t_f *new_attr_namelen, 
+		      hid_t_f *lapl_id )
+{
+    char *c_obj_name = NULL;          /* Buffer to hold C string */
+    char *c_old_attr_name = NULL;     /* Buffer to hold C string */
+    char *c_new_attr_name = NULL;     /* Buffer to hold C string */
+    int_f ret_value=0;          /* Return value */
      /*
-      * Allocate buffer to hold name of an attribute
+      * Convert FORTRAN name to C name
       */
-     if ((c_buf = HDmalloc((size_t)*bufsize +1)) == NULL)
-         HGOTO_DONE(FAIL);
+    if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+      HGOTO_DONE(FAIL);  
+    if((c_old_attr_name = HD5f2cstring(old_attr_name, (size_t)*old_attr_namelen)) == NULL)
+      HGOTO_DONE(FAIL);  
+    if((c_new_attr_name = HD5f2cstring(new_attr_name, (size_t)*new_attr_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+
+    if(H5Arename_by_name((hid_t)*loc_id,c_obj_name,c_old_attr_name,c_new_attr_name,(hid_t)*lapl_id) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    if(c_obj_name)
+      HDfree(c_obj_name);
+    if(c_old_attr_name)
+      HDfree(c_old_attr_name);
+    if(c_new_attr_name)
+      HDfree(c_new_attr_name);
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5aopen_c
+ * Purpose:     Call H5Aopen to open an attribute
+ * Inputs:      obj_id       - Identifer for object to which attribute is attached
+ *	        attr_name    - Attribute access property list
+ *              attr_namelen - size of attr_name
+ *              aapl_id      - Link access property list
+ * Outputs:     attr_id - dataset identifier
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5aopen_c (hid_t_f *obj_id, _fcd attr_name, size_t_f *attr_namelen, hid_t_f *aapl_id, hid_t_f *attr_id)
+{
+    char *c_attr_name = NULL;          /* Buffer to hold C string */
+    int_f ret_value = 0;          /* Return value */
 
      /*
-      * Call H5Aget_name function
+      * Convert FORTRAN name to C name
+      */
+     if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+     /*
+      * Call H5Aopen function.
       */
-     if ((ret_value = (int_f)H5Aget_name((hid_t)*attr_id, (size_t)*bufsize, c_buf)) < 0)
-         HGOTO_DONE(FAIL);
+
+      if((*attr_id = (hid_t_f)H5Aopen((hid_t)*obj_id, c_attr_name, (hid_t)*aapl_id)) < 0)
+	HGOTO_DONE(FAIL);
+
+done:
+    if(c_attr_name)
+        HDfree(c_attr_name);
+    return ret_value;
+}
+/*----------------------------------------------------------------------------
+ * Name:        h5adelete_by_name_c 
+ * Purpose:     Call h5adelete_by_name to remove an attribute from a specified location 
+ * Inputs:      loc_id - identifer for object to which attribute is attached
+ *              obj_name - object identifier
+ *              obj_namelen - name length
+ *              attr_name - name of the attribute
+ *              attr_namelen - name length
+ *              lapl_id - link access property list
+ *              
+ * Outputs:     N/A
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5adelete_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id)
+{
+    char *c_obj_name = NULL;          /* Buffer to hold C string */
+    char *c_attr_name = NULL;         /* Buffer to hold C string */
+    int_f ret_value = 0;          /* Return value */
+
+     /*
+      * Convert FORTRAN name to C name
+      */
+    if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+      HGOTO_DONE(FAIL);  
+    if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+
+     /*
+      * Call H5Adelete_by_name function.
+      */
+    if(H5Adelete_by_name((hid_t)*loc_id, c_obj_name, c_attr_name, (hid_t)*lapl_id) < 0)
+      HGOTO_DONE(FAIL);
+
+done:
+    if(c_attr_name)
+        HDfree(c_attr_name);
+    if(c_obj_name)
+        HDfree(c_obj_name);
+    return ret_value;
+}
+/*----------------------------------------------------------------------------
+ * Name:        h5adelete_by_idx_c 
+ * Purpose:     Call h5adelete_by_idx 
+ * Inputs:      loc_id - Location or object identifier; may be dataset or group 
+ *              obj_name - object identifier
+ *              obj_namelen - name length
+ *              attr_name - name of the attribute
+ *              attr_namelen - name length
+ *              lapl_id - link access property list
+ *              
+ * Outputs:     N/A
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+		     int_f *idx_type, int_f *order, size_t_f *n, hid_t_f *lapl_id)
+{
+    char *c_obj_name = NULL;          /* Buffer to hold C string */
+    H5_index_t c_idx_type;
+    H5_iter_order_t c_order;
+    int_f ret_value = 0;          /* Return value */
+
+     /*
+      * Convert FORTRAN name to C name
+      */
+    if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+
+    c_idx_type = (H5_index_t)*idx_type;
+    c_order = (H5_iter_order_t)*order;
+
+     /*
+      * Call H5Adelete_by_name function. 
+      */
+
+    if(H5Adelete_by_idx((hid_t)*loc_id, c_obj_name, c_idx_type, c_order, (hsize_t)*n, (hid_t)*lapl_id) < 0)
+      HGOTO_DONE(FAIL);
+
+
+done:
+    if(c_obj_name)
+        HDfree(c_obj_name);
+    return ret_value;
+}
+/*----------------------------------------------------------------------------
+ * Name:        h5aget_name_by_idx_c
+ * Purpose:     Call h5aget_name_by_idx
+ * Inputs:
+ *
+ *        loc_id - Identifer for object to which attribute is attached
+ *      obj_name - Name of object, relative to location,
+ *                  from which attribute is to be removed *TEST* check NULL
+ *      idx_type - Type of index; Possible values are:
+ *                         H5_INDEX_UNKNOWN   - Unknown index type
+ *                         H5_INDEX_NAME      - Index on names
+ *                         H5_INDEX_CRT_ORDER - Index on creation order
+ *                         H5_INDEX_N	      - Number of indices defined
+ *
+ *      order    - Order in which to iterate over index; Possible values are:
+ *                          H5_ITER_UNKNOWN  - Unknown order
+ *                          H5_ITER_INC      - Increasing order
+ *                          H5_ITER_DEC      - Decreasing order
+ *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
+ *                          H5_ITER_N	     - Number of iteration orders
+ *
+ *            n  - Attribute’s position in index
+ *      attr_id  - Attribute identifier 
+ *         size  - Buffer size ! *TEST* check for 0 value *CHECK* should this return the correct value
+ *   
+ *     lapl_id   - Link access property list
+ *      hdferr   - Error code:
+ *                            Returns attribute name size, -1 if fail
+ *              
+ * Outputs:     name - Attribute name
+ *
+ * Returns:     Size of buffer on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+		       int_f *idx_type, int_f *order, size_t_f *n, _fcd name, 
+		       size_t_f *size, hid_t_f *lapl_id)
+{
+    char *c_obj_name = NULL;          /* Buffer to hold C string */
+    H5_index_t c_idx_type;
+    H5_iter_order_t c_order;
+    int_f ret_value = -1;          /* Return value */
+    ssize_t c_size;
+    size_t c_buf_size;
+    char *c_buf =NULL;
+     /*
+      * Convert FORTRAN name to C name
+      */
+    if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+
+    c_idx_type = (H5_index_t)*idx_type;
+    c_order = (H5_iter_order_t)*order;
+
+    /*
+     * Allocate buffer to hold name of an attribute
+     */
+    c_buf_size = (size_t)*size + 1; 
+    c_buf = (char *)HDmalloc(c_buf_size);
+    if (c_buf == NULL) return ret_value;
+
+     /*
+      * Call H5Aget_name_by_idx function.
+      */
+     c_size = H5Aget_name_by_idx((hid_t)*loc_id, c_obj_name, c_idx_type, c_order, (hsize_t)*n, c_buf, c_buf_size,(hid_t)*lapl_id);
+   
+/*      printf( "In C routine, The attr name is %s %i \n ", c_buf, c_buf_size ); */
+/*      printf( "In C routine, The c_size is %i \n ", c_size );  */
+
+     if (c_size < 0) goto done;
 
      /*
       * Convert C name to FORTRAN and place it in the given buffer
       */
-      HD5packFstring(c_buf, _fcdtocp(buf), (size_t)*bufsize);
+     HD5packFstring(c_buf, _fcdtocp(name), c_buf_size);
+     *size = (size_t_f)c_size;
+     ret_value = 0;
+
+done:
+   if(c_obj_name)
+      HDfree(c_obj_name);
+   HDfree(c_buf);
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5aopen_by_idx_c
+ * Purpose:     Call H5Aopen_by_idx 
+ * Inputs:   loc_id    - Object identifier
+ *            obj_name - Name of object to which attribute is attached
+ *         obj_namelen - name length
+ *            idx_type - Type of index; Possible values are:
+ *                         H5_INDEX_UNKNOWN   - Unknown index type
+ *                         H5_INDEX_NAME      - Index on names
+ *                         H5_INDEX_CRT_ORDER - Index on creation order
+ *                         H5_INDEX_N	      - Number of indices defined
+ *
+ *               order - Order in which to iterate over index; Possible values are:
+ *                          H5_ITER_UNKNOWN  - Unknown order
+ *                          H5_ITER_INC      - Increasing order
+ *                          H5_ITER_DEC      - Decreasing order
+ *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
+ *                          H5_ITER_N	     - Number of iteration orders
+ *                
+ *                   n - Attribute’s position in index
+ *             aapl_id - Attribute access property list
+ *             lapl_id - Link access property list
+ * Outputs:    attr_id - attribute identifer
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+		   int_f *idx_type, int_f *order, size_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id )
+{
+    char *c_obj_name = NULL;          /* Buffer to hold C string */
+    H5_index_t c_idx_type;
+    H5_iter_order_t c_order;
+    int_f ret_value = 0;          /* Return value */
+
+     /*
+      * Convert FORTRAN name to C name
+      */
+    if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+
+    c_idx_type = (H5_index_t)*idx_type;
+    c_order = (H5_iter_order_t)*order;
+
+     /*
+      * Call H5Aopen_by_idx function.
+      */
+    if((*attr_id = (hid_t_f)H5Aopen_by_idx((hid_t)*loc_id, c_obj_name, c_idx_type, c_order, (hsize_t)*n, (hid_t)*aapl_id, (hid_t)*lapl_id)) < 0)
+      HGOTO_DONE(FAIL);
+done:
+    if(c_obj_name)
+        HDfree(c_obj_name);
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5aget_info_c
+ * Purpose:     Call H5Aget_info
+ * Inputs:     loc_id  - Object identifier
+ * Outputs:   
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute 
+ *              corder - Is a positive integer containing the creation order of the attribute
+ *                cset - Indicates the character set used for the attribute’s name
+ *           data_size - indicates the size, in the number of characters, of the attribute
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder, 
+		int_f *cset, hsize_t_f *data_size )
+{
+
+    int_f ret_value = 0;          /* Return value */
+    H5A_info_t ainfo;
+
+
+     /*
+      * Call H5Aget_info function.
+      */
+    if(H5Aget_info((hid_t)*loc_id,&ainfo) < 0)
+      HGOTO_DONE(FAIL);
+
+    /* Unpack the structure */
+
+    *corder_valid = 0;
+    if(ainfo.corder_valid > 0) *corder_valid = 1;
+
+    *corder = (int_f)ainfo.corder;
+    *cset = (int_f)ainfo.cset;
+    *data_size = (hsize_t)ainfo.data_size;
+
+done:
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5aget_info_by_idx_c
+ * Purpose:     Call  H5Aget_info_by_idx
+ * Inputs:    loc_id  - Object identifier
+ *            obj_name - Name of object to which attribute is attached
+ *         obj_namelen - name length
+ *            idx_type - Type of index; Possible values are:
+ *                         H5_INDEX_UNKNOWN   - Unknown index type
+ *                         H5_INDEX_NAME      - Index on names
+ *                         H5_INDEX_CRT_ORDER - Index on creation order
+ *                         H5_INDEX_N	      - Number of indices defined
+ *
+ *               order - Order in which to iterate over index; Possible values are:
+ *                          H5_ITER_UNKNOWN  - Unknown order
+ *                          H5_ITER_INC      - Increasing order
+ *                          H5_ITER_DEC      - Decreasing order
+ *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
+ *                          H5_ITER_N	     - Number of iteration orders
+ *                
+ *                   n - Attribute’s position in index
+ *             lapl_id - Link access property list
+ * Outputs:   
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute 
+ *              corder - Is a positive integer containing the creation order of the attribute
+ *                cset - Indicates the character set used for the attribute’s name
+ *           data_size - indicates the size, in the number of characters, of the attribute
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+		int_f *idx_type, int_f *order, size_t_f *n, hid_t_f *lapl_id,
+		int_f *corder_valid, int_f *corder, 
+		int_f *cset, hsize_t_f *data_size )
+{
+    char *c_obj_name = NULL;          /* Buffer to hold C string */
+    H5_index_t c_idx_type;
+    H5_iter_order_t c_order;
+    int_f ret_value = 0;          /* Return value */
+    H5A_info_t ainfo;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+
+    c_idx_type = (H5_index_t)*idx_type;
+    c_order = (H5_iter_order_t)*order;
+     /*
+      * Call H5Ainfo_by_idx function.
+      */
+    if(H5Aget_info_by_idx((hid_t)*loc_id, c_obj_name, c_idx_type, c_order, (hsize_t)*n,
+		   &ainfo, (hid_t)*lapl_id) < 0)
+      HGOTO_DONE(FAIL);
+
+    /* Unpack the structure */
+
+    *corder_valid = 0;
+    if(ainfo.corder_valid > 0) *corder_valid = 1;
+
+    *corder = (int_f)ainfo.corder;
+    *cset = (int_f)ainfo.cset;
+    *data_size = (hsize_t)ainfo.data_size;
+
+done:
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5aget_info_by_name_c
+ * Purpose:     Call  H5Aget_info_by_name
+ * Inputs:      loc_id - Object identifier
+ *            obj_name - Name of object to which attribute is attached
+ *         obj_namelen - name length
+ *           attr_name - Attribute name
+ *        attr_namelen - attribute name length
+ *             lapl_id - Link access property list
+ * Outputs:   
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute 
+ *              corder - Is a positive integer containing the creation order of the attribute
+ *                cset - Indicates the character set used for the attribute’s name
+ *           data_size - indicates the size, in the number of characters, of the attribute
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5aget_info_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+			_fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id,
+			int_f *corder_valid, int_f *corder, 
+			int_f *cset, hsize_t_f *data_size )
+{
+    char *c_obj_name = NULL;          /* Buffer to hold C string */
+    char *c_attr_name = NULL;          /* Buffer to hold C string */
+    int_f ret_value = 0;          /* Return value */
+    H5A_info_t ainfo;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+    if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+
+     /*
+      * Call H5Ainfo_by_name function.
+      */
+    if(H5Aget_info_by_name((hid_t)*loc_id, c_obj_name, c_attr_name,
+		   &ainfo, (hid_t)*lapl_id) < 0)
+      HGOTO_DONE(FAIL);
+
+    /* Unpack the structure */
+
+    *corder_valid = 0;
+    if(ainfo.corder_valid > 0) *corder_valid = 1;
+
+    *corder = (int_f)ainfo.corder;
+    *cset = (int_f)ainfo.cset;
+    *data_size = (hsize_t)ainfo.data_size;
+
+done:
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5acreate_by_name_c
+ * Purpose:     Call h5acreate_by_name
+
+ * Inputs:
+ *         loc_id  - Object identifier
+ *        obj_name - Name of object to which attribute is attached
+ *     obj_namelen - name length
+ *       attr_name - Attribute name
+ *    attr_namelen - attribute name length
+ *         type_id - Attribute datatype identifier
+ *       space_id  - Attribute dataspace identifier
+ *         acpl_id - Attribute creation property list identifier (Currently not used.)
+ *         aapl_id - Attribute access property list identifier (Currently not used.)
+ *         lapl_id - Link access property list
+ *
+ * Outputs:   
+ *            attr - an attribute identifier 
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5acreate_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+		     _fcd attr_name, size_t_f *attr_namelen,  hid_t_f *type_id,
+		     hid_t_f *space_id, hid_t_f *acpl_id, hid_t_f *aapl_id,
+		     hid_t_f *lapl_id, hid_t_f *attr_id )
+{
+  char *c_obj_name = NULL;      /* Buffer to hold C string */
+  char *c_attr_name = NULL;     /* Buffer to hold C string */
+  int_f ret_value = 0;          /* Return value */
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+  if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Acreate_by_name function.
+   */
+  if((*attr_id = (hid_t_f)H5Acreate_by_name((hid_t)*loc_id, c_obj_name, c_attr_name,
+					    (hid_t)*type_id, (hid_t)*space_id,(hid_t)*acpl_id,(hid_t)*aapl_id,(hid_t)*lapl_id )) < 0)
+    HGOTO_DONE(FAIL);
+
+done:
+  if(c_obj_name)
+    HDfree(c_obj_name);
+  if(c_attr_name)
+    HDfree(c_attr_name);
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5aexists_c
+ * Purpose:     CAll h5aexists 
+ * Inputs:
+ *             obj_id - Object identifier
+ *          attr_name - Attribute name
+ * Outputs:
+ *     attr_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5aexists_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists)
+{
+  char *c_name = NULL;          /* Buffer to hold C string */
+  int_f ret_value = 0;          /* Return value */
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Aexists function.
+   */
+  if((*attr_exists = (hid_t_f)H5Aexists((hid_t)*obj_id, c_name)) < 0)
+         HGOTO_DONE(FAIL);
+
+done:
+    if(c_name)
+        HDfree(c_name);
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5aexists_by_name_c
+ * Purpose:     CAll H5Aexists_by_name 
+ * Inputs:
+ *     loc_id - Location identifier
+ *   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
+ *  attr_name - Attribute name
+ *    lapl_id - Link access property list identifier
+ * Outputs:
+ *     attr_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, 
+		      hid_t_f *lapl_id, hid_t_f *attr_exists)
+{
+  char *c_obj_name = NULL;          /* Buffer to hold object name C string */
+  char *c_attr_name = NULL;          /* Buffer to hold attribute name C string */
+  int_f ret_value = 0;          /* Return value */
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+  if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Aexists_by_name function.
+   */
+  if((*attr_exists = (hid_t_f)H5Aexists_by_name((hid_t)*loc_id, c_obj_name, c_attr_name, (hid_t)*lapl_id)) < 0)
+         HGOTO_DONE(FAIL);
+
+done:
+    if(c_obj_name)
+        HDfree(c_obj_name);
+    if(c_attr_name)
+        HDfree(c_attr_name);
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5aopen_by_name_c
+ * Purpose:     Call H5Aopen_by_name 
+ * Inputs:
+ *     loc_id - Location identifier
+ *   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
+ *  attr_name - Attribute name
+ *    aapl_id - Attribute access property list (Currently unused; should be passed in as H5P_DEFAULT.)
+ *    lapl_id - Link access property list identifier
+ * Outputs:
+ *     attr_id  - attribute identifier
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, 
+		    hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id)
+{
+  char *c_obj_name = NULL;          /* Buffer to hold object name C string */
+  char *c_attr_name = NULL;          /* Buffer to hold attribute name C string */
+  int_f ret_value = 0;          /* Return value */
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+  if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Aopen function.
+   */
+  if((*attr_id = (hid_t_f)H5Aopen_by_name((hid_t)*loc_id, c_obj_name, c_attr_name, (hid_t)*aapl_id, (hid_t)*lapl_id)) < 0)
+    HGOTO_DONE(FAIL);
+
+ done:
+  if(c_obj_name)
+    HDfree(c_obj_name);
+  if(c_attr_name)
+    HDfree(c_attr_name);
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:      h5arename_c
+ * Purpose:   Calls H5Arename
+ * Inputs:    loc_id            - Object identifier
+ *            old_attr_name     - Prior attribute name
+ *            old_attr_name_len - Prior attribute name length
+ *            new_attr_name     - New attribute name
+ *            new_attr_name_len - New attribute name length
+ * Outputs:     N/A
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M. S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5arename_c( hid_t_f *loc_id, 
+		      _fcd old_attr_name, size_t_f *old_attr_namelen,
+		      _fcd new_attr_name, size_t_f *new_attr_namelen)
+{
+  char *c_old_attr_name = NULL;     /* Buffer to hold C string */
+  char *c_new_attr_name = NULL;     /* Buffer to hold C string */
+  int_f ret_value=0;          /* Return value */
+  /*
+   * Convert FORTRAN name to C name
+   */ 
+  if((c_old_attr_name = HD5f2cstring(old_attr_name, (size_t)*old_attr_namelen)) == NULL)
+    HGOTO_DONE(FAIL);  
+  if((c_new_attr_name = HD5f2cstring(new_attr_name, (size_t)*new_attr_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+    if(H5Arename((hid_t)*loc_id,c_old_attr_name,c_new_attr_name) < 0)
+        HGOTO_DONE(FAIL);
 
 done:
-      if(c_buf) HDfree(c_buf);
-      return ret_value;
+    if(c_old_attr_name)
+      HDfree(c_old_attr_name);
+    if(c_new_attr_name)
+      HDfree(c_new_attr_name);
+    return ret_value;
 }
diff --git a/fortran/src/H5Aff.f90 b/fortran/src/H5Aff.f90
index d6f1b6f..4a97a11 100644
--- a/fortran/src/H5Aff.f90
+++ b/fortran/src/H5Aff.f90
@@ -16,96 +16,94 @@
 !
 ! This file contains Fortran90 interfaces for H5A functions.
 !
-      MODULE H5A
+MODULE H5A
 
-        USE H5GLOBAL
+  USE H5GLOBAL
 !
 !On Windows there are no big (integer*8) integers, so overloading 
 !for bug #670 does not work. I have to use DEC compilation directives to make
 !Windows DEC Visual Fortran and OSF compilers happy and do right things.
 !						05/01/02 EP
-          
-!
-          INTERFACE h5awrite_f
-
-            MODULE PROCEDURE h5awrite_integer_scalar 
-            MODULE PROCEDURE h5awrite_integer_1 
-            MODULE PROCEDURE h5awrite_integer_2 
-            MODULE PROCEDURE h5awrite_integer_3 
-            MODULE PROCEDURE h5awrite_integer_4 
-            MODULE PROCEDURE h5awrite_integer_5 
-            MODULE PROCEDURE h5awrite_integer_6 
-            MODULE PROCEDURE h5awrite_integer_7 
-            MODULE PROCEDURE h5awrite_char_scalar 
-            MODULE PROCEDURE h5awrite_char_1 
-            MODULE PROCEDURE h5awrite_char_2 
-            MODULE PROCEDURE h5awrite_char_3 
-            MODULE PROCEDURE h5awrite_char_4 
-            MODULE PROCEDURE h5awrite_char_5 
-            MODULE PROCEDURE h5awrite_char_6 
-            MODULE PROCEDURE h5awrite_char_7 
-            MODULE PROCEDURE h5awrite_real_scalar
-            MODULE PROCEDURE h5awrite_real_1
-            MODULE PROCEDURE h5awrite_real_2
-            MODULE PROCEDURE h5awrite_real_3
-            MODULE PROCEDURE h5awrite_real_4
-            MODULE PROCEDURE h5awrite_real_5
-            MODULE PROCEDURE h5awrite_real_6
-            MODULE PROCEDURE h5awrite_real_7
+!
+  INTERFACE h5awrite_f
+
+     MODULE PROCEDURE h5awrite_integer_scalar 
+     MODULE PROCEDURE h5awrite_integer_1 
+     MODULE PROCEDURE h5awrite_integer_2 
+     MODULE PROCEDURE h5awrite_integer_3 
+     MODULE PROCEDURE h5awrite_integer_4 
+     MODULE PROCEDURE h5awrite_integer_5 
+     MODULE PROCEDURE h5awrite_integer_6 
+     MODULE PROCEDURE h5awrite_integer_7 
+     MODULE PROCEDURE h5awrite_char_scalar 
+     MODULE PROCEDURE h5awrite_char_1 
+     MODULE PROCEDURE h5awrite_char_2 
+     MODULE PROCEDURE h5awrite_char_3 
+     MODULE PROCEDURE h5awrite_char_4 
+     MODULE PROCEDURE h5awrite_char_5 
+     MODULE PROCEDURE h5awrite_char_6 
+     MODULE PROCEDURE h5awrite_char_7 
+     MODULE PROCEDURE h5awrite_real_scalar
+     MODULE PROCEDURE h5awrite_real_1
+     MODULE PROCEDURE h5awrite_real_2
+     MODULE PROCEDURE h5awrite_real_3
+     MODULE PROCEDURE h5awrite_real_4
+     MODULE PROCEDURE h5awrite_real_5
+     MODULE PROCEDURE h5awrite_real_6
+     MODULE PROCEDURE h5awrite_real_7
 ! Comment if on Crays
-            MODULE PROCEDURE h5awrite_double_scalar
-            MODULE PROCEDURE h5awrite_double_1
-            MODULE PROCEDURE h5awrite_double_2
-            MODULE PROCEDURE h5awrite_double_3
-            MODULE PROCEDURE h5awrite_double_4
-            MODULE PROCEDURE h5awrite_double_5
-            MODULE PROCEDURE h5awrite_double_6
-            MODULE PROCEDURE h5awrite_double_7
+     MODULE PROCEDURE h5awrite_double_scalar
+     MODULE PROCEDURE h5awrite_double_1
+     MODULE PROCEDURE h5awrite_double_2
+     MODULE PROCEDURE h5awrite_double_3
+     MODULE PROCEDURE h5awrite_double_4
+     MODULE PROCEDURE h5awrite_double_5
+     MODULE PROCEDURE h5awrite_double_6
+     MODULE PROCEDURE h5awrite_double_7
 ! End commnet if on Crays
 
-
-          END INTERFACE
-
-          INTERFACE h5aread_f
-
-            MODULE PROCEDURE h5aread_integer_scalar
-            MODULE PROCEDURE h5aread_integer_1 
-            MODULE PROCEDURE h5aread_integer_2 
-            MODULE PROCEDURE h5aread_integer_3 
-            MODULE PROCEDURE h5aread_integer_4 
-            MODULE PROCEDURE h5aread_integer_5 
-            MODULE PROCEDURE h5aread_integer_6 
-            MODULE PROCEDURE h5aread_integer_7 
-            MODULE PROCEDURE h5aread_char_scalar 
-            MODULE PROCEDURE h5aread_char_1 
-            MODULE PROCEDURE h5aread_char_2 
-            MODULE PROCEDURE h5aread_char_3 
-            MODULE PROCEDURE h5aread_char_4 
-            MODULE PROCEDURE h5aread_char_5 
-            MODULE PROCEDURE h5aread_char_6 
-            MODULE PROCEDURE h5aread_char_7 
-            MODULE PROCEDURE h5aread_real_scalar
-            MODULE PROCEDURE h5aread_real_1
-            MODULE PROCEDURE h5aread_real_2
-            MODULE PROCEDURE h5aread_real_3
-            MODULE PROCEDURE h5aread_real_4
-            MODULE PROCEDURE h5aread_real_5
-            MODULE PROCEDURE h5aread_real_6
-            MODULE PROCEDURE h5aread_real_7
+  END INTERFACE
+
+  INTERFACE h5aread_f
+
+     MODULE PROCEDURE h5aread_integer_scalar
+     MODULE PROCEDURE h5aread_integer_1 
+     MODULE PROCEDURE h5aread_integer_2 
+     MODULE PROCEDURE h5aread_integer_3 
+     MODULE PROCEDURE h5aread_integer_4 
+     MODULE PROCEDURE h5aread_integer_5 
+     MODULE PROCEDURE h5aread_integer_6 
+     MODULE PROCEDURE h5aread_integer_7 
+     MODULE PROCEDURE h5aread_char_scalar 
+     MODULE PROCEDURE h5aread_char_1 
+     MODULE PROCEDURE h5aread_char_2 
+     MODULE PROCEDURE h5aread_char_3 
+     MODULE PROCEDURE h5aread_char_4 
+     MODULE PROCEDURE h5aread_char_5 
+     MODULE PROCEDURE h5aread_char_6 
+     MODULE PROCEDURE h5aread_char_7 
+     MODULE PROCEDURE h5aread_real_scalar
+     MODULE PROCEDURE h5aread_real_1
+     MODULE PROCEDURE h5aread_real_2
+     MODULE PROCEDURE h5aread_real_3
+     MODULE PROCEDURE h5aread_real_4
+     MODULE PROCEDURE h5aread_real_5
+     MODULE PROCEDURE h5aread_real_6
+     MODULE PROCEDURE h5aread_real_7
 ! Comment if on Crays
-            MODULE PROCEDURE h5aread_double_scalar
-            MODULE PROCEDURE h5aread_double_1
-            MODULE PROCEDURE h5aread_double_2
-            MODULE PROCEDURE h5aread_double_3
-            MODULE PROCEDURE h5aread_double_4
-            MODULE PROCEDURE h5aread_double_5
-            MODULE PROCEDURE h5aread_double_6
-            MODULE PROCEDURE h5aread_double_7
+     MODULE PROCEDURE h5aread_double_scalar
+     MODULE PROCEDURE h5aread_double_1
+     MODULE PROCEDURE h5aread_double_2
+     MODULE PROCEDURE h5aread_double_3
+     MODULE PROCEDURE h5aread_double_4
+     MODULE PROCEDURE h5aread_double_5
+     MODULE PROCEDURE h5aread_double_6
+     MODULE PROCEDURE h5aread_double_7
 ! End commnet if on Crays
 !
-          END INTERFACE
-
-      CONTAINS
+  END INTERFACE
+  
+CONTAINS
 
 !----------------------------------------------------------------------
 ! Name:		h5acreate_f 
@@ -114,7 +112,7 @@
 !		or named datatype 
 !
 ! Inputs:  
-!		obj_id		- identifier of an object (group, dataset,
+!		loc_id		- identifier of an object (group, dataset,
 !				  or named datatype) attribute is attached to
 !		name		- attribute name
 !		type_id		- attribute datatype identifier
@@ -126,7 +124,8 @@
 !				 	Success:  0
 !				 	Failure: -1   
 ! Optional parameters:
-!		creation_prp	- creation property list identifier 			
+!		acpl_id	- Attribute creation property list identifier
+!               appl_id - Attribute access property list identifier			
 !
 ! Programmer:	Elena Pourmal
 !		August 12, 1999	
@@ -136,53 +135,60 @@
 !			port).  February 27, 2001 
 !
 !----------------------------------------------------------------------
-          SUBROUTINE h5acreate_f(obj_id, name, type_id, space_id, attr_id, &
-                                 hdferr, creation_prp) 
+  SUBROUTINE h5acreate_f(loc_id, name, type_id, space_id, attr_id, &
+                                 hdferr, acpl_id, aapl_id ) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5acreate_f
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name    ! Attribute name
-            INTEGER(HID_T), INTENT(IN) :: type_id   
-                                           ! Attribute datatype identifier 
-            INTEGER(HID_T), INTENT(IN) :: space_id  
-                                           ! Attribute dataspace identifier
-            INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: creation_prp
-                                                ! Attribute creation property 
-                                                ! list identifier 
-            INTEGER(HID_T) :: creation_prp_default 
-            INTEGER(SIZE_T) :: namelen
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier 
+    CHARACTER(LEN=*), INTENT(IN) :: name    ! Attribute name
+    INTEGER(HID_T), INTENT(IN) :: type_id   
+    ! Attribute datatype identifier 
+    INTEGER(HID_T), INTENT(IN) :: space_id  
+    ! Attribute dataspace identifier
+    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier 
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+                                         ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: acpl_id ! Attribute creation property list identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id ! Attribute access property list identifier
+    
+    INTEGER(HID_T) :: acpl_id_default
+    INTEGER(HID_T) :: aapl_id_default 
+    INTEGER(SIZE_T) :: namelen
 !            INTEGER, EXTERNAL :: h5acreate_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5acreate_c(obj_id, name, namelen, type_id, &
-                               space_id, creation_prp_default, attr_id)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ACREATE_C'::h5acreate_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: obj_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER(SIZE_T) :: namelen
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HID_T) :: creation_prp_default
-              INTEGER(HID_T), INTENT(OUT) :: attr_id
-              END FUNCTION h5acreate_c
-            END INTERFACE
-
-            creation_prp_default = H5P_DEFAULT_F
-            namelen = LEN(NAME)
-            if (present(creation_prp)) creation_prp_default = creation_prp
-            hdferr = h5acreate_c(obj_id, name, namelen, type_id, space_id, &
-                                 creation_prp_default, attr_id)
-          END SUBROUTINE h5acreate_f
+    INTERFACE
+       INTEGER FUNCTION h5acreate_c(loc_id, name, namelen, type_id, &
+            space_id, acpl_id_default, aapl_id_default, attr_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ACREATE_C'::h5acreate_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: name
+         INTEGER(SIZE_T) :: namelen
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HID_T) :: acpl_id_default
+         INTEGER(HID_T) :: aapl_id_default
+         INTEGER(HID_T), INTENT(OUT) :: attr_id
+       END FUNCTION h5acreate_c
+    END INTERFACE
+    
+    acpl_id_default = H5P_DEFAULT_F
+    aapl_id_default = H5P_DEFAULT_F
+    namelen = LEN(NAME)
+    IF (PRESENT(acpl_id)) acpl_id_default = acpl_id
+    IF (PRESENT(aapl_id)) aapl_id_default = aapl_id
+
+    hdferr = h5acreate_c(loc_id, name, namelen, type_id, space_id, &
+         acpl_id_default, aapl_id_default, attr_id)
+
+  END SUBROUTINE h5acreate_f
 
 
 !----------------------------------------------------------------------
@@ -211,38 +217,38 @@
 !
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5aopen_name_f(obj_id, name, attr_id, hdferr) 
+  SUBROUTINE h5aopen_name_f(obj_id, name, attr_id, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aopen_name_f
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name    ! Attribute name
-            INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-            INTEGER(SIZE_T) :: namelen
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier 
+    CHARACTER(LEN=*), INTENT(IN) :: name    ! Attribute name
+    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier 
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    INTEGER(SIZE_T) :: namelen
 
 !            INTEGER, EXTERNAL :: h5aopen_name_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5aopen_name_c(obj_id, name, namelen, attr_id)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_NAME_C'::h5aopen_name_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: obj_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER(SIZE_T) :: namelen
-              INTEGER(HID_T), INTENT(OUT) :: attr_id
-              END FUNCTION h5aopen_name_c
-            END INTERFACE
-
-            namelen = LEN(name)
-            hdferr = h5aopen_name_c(obj_id, name, namelen, attr_id)
-          END SUBROUTINE h5aopen_name_f
+    INTERFACE
+       INTEGER FUNCTION h5aopen_name_c(obj_id, name, namelen, attr_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_NAME_C'::h5aopen_name_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         CHARACTER(LEN=*), INTENT(IN) :: name
+         INTEGER(SIZE_T) :: namelen
+         INTEGER(HID_T), INTENT(OUT) :: attr_id
+       END FUNCTION h5aopen_name_c
+    END INTERFACE
+    
+    namelen = LEN(name)
+    hdferr = h5aopen_name_c(obj_id, name, namelen, attr_id)
+  END SUBROUTINE h5aopen_name_f
 
 
 !----------------------------------------------------------------------
@@ -271,386 +277,380 @@
 !
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5aopen_idx_f(obj_id, index, attr_id, hdferr) 
+  SUBROUTINE h5aopen_idx_f(obj_id, index, attr_id, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aopen_idx_f
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier 
-            INTEGER, INTENT(IN) :: index            ! Attribute index 
-            INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier 
+    INTEGER, INTENT(IN) :: index            ! Attribute index 
+    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier 
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    
 !            INTEGER, EXTERNAL :: h5aopen_idx_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5aopen_idx_c(obj_id, index, attr_id)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_IDX_C'::h5aopen_idx_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: obj_id
-              INTEGER, INTENT(IN) :: index
-              INTEGER(HID_T), INTENT(OUT) :: attr_id
-              END FUNCTION h5aopen_idx_c
-            END INTERFACE
-
-            hdferr = h5aopen_idx_c(obj_id, index, attr_id)
-          END SUBROUTINE h5aopen_idx_f
-
-
-          SUBROUTINE h5awrite_integer_scalar(attr_id, memtype_id,  buf, dims, hdferr) 
+    INTERFACE
+       INTEGER FUNCTION h5aopen_idx_c(obj_id, index, attr_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_IDX_C'::h5aopen_idx_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         INTEGER, INTENT(IN) :: index
+         INTEGER(HID_T), INTENT(OUT) :: attr_id
+       END FUNCTION h5aopen_idx_c
+    END INTERFACE
+    
+    hdferr = h5aopen_idx_c(obj_id, index, attr_id)
+  END SUBROUTINE h5aopen_idx_f
+
+
+  SUBROUTINE h5awrite_integer_scalar(attr_id, memtype_id,  buf, dims, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_scalar
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
-                                                     ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(IN) :: buf              ! Attribute data 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER, INTENT(IN) :: buf              ! Attribute data 
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_integer_s_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5awrite_integer_s_c(attr_id, memtype_id,  buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_S_C'::h5awrite_integer_s_c
-              !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-              INTEGER(HID_T), INTENT(IN) :: attr_id
-              INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(IN)::buf
-              END FUNCTION h5awrite_integer_s_c
-            END INTERFACE
-
-            hdferr = h5awrite_integer_s_c(attr_id, memtype_id,  buf, dims)
-          END SUBROUTINE h5awrite_integer_scalar
-
-          SUBROUTINE h5awrite_integer_1(attr_id, memtype_id,  buf, dims, hdferr) 
+    INTERFACE
+       INTEGER FUNCTION h5awrite_integer_s_c(attr_id, memtype_id,  buf, dims)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_S_C'::h5awrite_integer_s_c
+         !DEC$ ENDIF
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(HID_T), INTENT(IN) :: memtype_id
+         INTEGER, INTENT(IN)::buf
+       END FUNCTION h5awrite_integer_s_c
+    END INTERFACE
+    
+    hdferr = h5awrite_integer_s_c(attr_id, memtype_id,  buf, dims)
+  END SUBROUTINE h5awrite_integer_scalar
+
+  SUBROUTINE h5awrite_integer_1(attr_id, memtype_id,  buf, dims, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_1
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
-                                                     ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(IN) , &
-            DIMENSION(dims(1)) :: buf
-                                                    ! Attribute data 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER, INTENT(IN) , &
+         DIMENSION(dims(1)) :: buf
+    ! Attribute data 
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    
 !            INTEGER, EXTERNAL :: h5awrite_integer_1_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5awrite_integer_1_c(attr_id, memtype_id,  buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_1_C'::h5awrite_integer_1_c
-              !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-              INTEGER(HID_T), INTENT(IN) :: attr_id
-              INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(IN), &
-              DIMENSION(dims(1)) :: buf
-              END FUNCTION h5awrite_integer_1_c
-            END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5awrite_integer_1_c(attr_id, memtype_id,  buf, dims)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_1_C'::h5awrite_integer_1_c
+         !DEC$ ENDIF
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(HID_T), INTENT(IN) :: memtype_id
+         INTEGER, INTENT(IN), DIMENSION(dims(1)) :: buf
+       END FUNCTION h5awrite_integer_1_c
+    END INTERFACE
 
-            hdferr = h5awrite_integer_1_c(attr_id, memtype_id,  buf, dims)
-          END SUBROUTINE h5awrite_integer_1
+    hdferr = h5awrite_integer_1_c(attr_id, memtype_id,  buf, dims)
 
+  END SUBROUTINE h5awrite_integer_1
 
-          SUBROUTINE h5awrite_integer_2(attr_id, memtype_id,  buf, dims, hdferr) 
+
+  SUBROUTINE h5awrite_integer_2(attr_id, memtype_id,  buf, dims, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_2
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
-                                                     ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(IN) , &
-            DIMENSION(dims(1),dims(2)) :: buf
-                                                    ! Attribute data 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER, INTENT(IN) , &
+         DIMENSION(dims(1),dims(2)) :: buf
+    ! Attribute data 
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    
 !            INTEGER, EXTERNAL :: h5awrite_integer_2_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5awrite_integer_2_c(attr_id, memtype_id,  buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_2_C'::h5awrite_integer_2_c
-              !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-              INTEGER(HID_T), INTENT(IN) :: attr_id
-              INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-              END FUNCTION h5awrite_integer_2_c
-            END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5awrite_integer_2_c(attr_id, memtype_id,  buf, dims)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_2_C'::h5awrite_integer_2_c
+         !DEC$ ENDIF
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(HID_T), INTENT(IN) :: memtype_id
+         INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2)) :: buf
+       END FUNCTION h5awrite_integer_2_c
+    END INTERFACE
 
-            hdferr = h5awrite_integer_2_c(attr_id, memtype_id,  buf, dims)
-          END SUBROUTINE h5awrite_integer_2
+    hdferr = h5awrite_integer_2_c(attr_id, memtype_id,  buf, dims)
+  END SUBROUTINE h5awrite_integer_2
 
 
-          SUBROUTINE h5awrite_integer_3(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_integer_3(attr_id, memtype_id,  buf, dims, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_3
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
-                                                     ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(IN) , &
-            DIMENSION(dims(1),dims(2),dims(3)) :: buf
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3)) :: buf
                                                     ! Attribute data 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_integer_3_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5awrite_integer_3_c(attr_id, memtype_id,  buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_3_C'::h5awrite_integer_3_c
-              !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-              INTEGER(HID_T), INTENT(IN) :: attr_id
-              INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-              END FUNCTION h5awrite_integer_3_c
-            END INTERFACE
-
-            hdferr = h5awrite_integer_3_c(attr_id, memtype_id,  buf, dims)
-          END SUBROUTINE h5awrite_integer_3
-
-
-          SUBROUTINE h5awrite_integer_4(attr_id, memtype_id,  buf, dims, hdferr) 
+    INTERFACE
+       INTEGER FUNCTION h5awrite_integer_3_c(attr_id, memtype_id,  buf, dims)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_3_C'::h5awrite_integer_3_c
+         !DEC$ ENDIF
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(HID_T), INTENT(IN) :: memtype_id
+         INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3)) :: buf
+       END FUNCTION h5awrite_integer_3_c
+    END INTERFACE
+    
+    hdferr = h5awrite_integer_3_c(attr_id, memtype_id,  buf, dims)
+  END SUBROUTINE h5awrite_integer_3
+
+
+  SUBROUTINE h5awrite_integer_4(attr_id, memtype_id,  buf, dims, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_4
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
-                                                     ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(IN), &
-            DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-                                                    ! Attribute data 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER, INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
+    ! Attribute data 
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_integer_4_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5awrite_integer_4_c(attr_id, memtype_id,  buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_4_C'::h5awrite_integer_4_c
-              !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-              INTEGER(HID_T), INTENT(IN) :: attr_id
-              INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-              END FUNCTION h5awrite_integer_4_c
-            END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5awrite_integer_4_c(attr_id, memtype_id,  buf, dims)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_4_C'::h5awrite_integer_4_c
+         !DEC$ ENDIF
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(HID_T), INTENT(IN) :: memtype_id
+         INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
+       END FUNCTION h5awrite_integer_4_c
+    END INTERFACE
 
-            hdferr = h5awrite_integer_4_c(attr_id, memtype_id,  buf, dims)
-          END SUBROUTINE h5awrite_integer_4
+    hdferr = h5awrite_integer_4_c(attr_id, memtype_id,  buf, dims)
+  END SUBROUTINE h5awrite_integer_4
 
 
-          SUBROUTINE h5awrite_integer_5(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_integer_5(attr_id, memtype_id,  buf, dims, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_5
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
-                                                     ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(IN), &
-            DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
                                                     ! Attribute data 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_integer_5_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5awrite_integer_5_c(attr_id, memtype_id,  buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_5_C'::h5awrite_integer_5_c
-              !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-              INTEGER(HID_T), INTENT(IN) :: attr_id
-              INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-              END FUNCTION h5awrite_integer_5_c
-            END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5awrite_integer_5_c(attr_id, memtype_id,  buf, dims)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_5_C'::h5awrite_integer_5_c
+         !DEC$ ENDIF
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(HID_T), INTENT(IN) :: memtype_id
+         INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
+       END FUNCTION h5awrite_integer_5_c
+    END INTERFACE
 
-            hdferr = h5awrite_integer_5_c(attr_id, memtype_id,  buf, dims)
-          END SUBROUTINE h5awrite_integer_5
+    hdferr = h5awrite_integer_5_c(attr_id, memtype_id,  buf, dims)
+  END SUBROUTINE h5awrite_integer_5
 
 
-          SUBROUTINE h5awrite_integer_6(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_integer_6(attr_id, memtype_id,  buf, dims, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_6
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
-                                                     ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(IN), &
-            DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-                                                    ! Attribute data 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER, INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
+    ! Attribute data 
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    
 !            INTEGER, EXTERNAL :: h5awrite_integer_6_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5awrite_integer_6_c(attr_id, memtype_id,  buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_6_C'::h5awrite_integer_6_c
-              !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-              INTEGER(HID_T), INTENT(IN) :: attr_id
-              INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(IN), &
+    INTERFACE
+       INTEGER FUNCTION h5awrite_integer_6_c(attr_id, memtype_id,  buf, dims)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_6_C'::h5awrite_integer_6_c
+         !DEC$ ENDIF
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(HID_T), INTENT(IN) :: memtype_id
+         INTEGER, INTENT(IN), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-              END FUNCTION h5awrite_integer_6_c
-            END INTERFACE
+       END FUNCTION h5awrite_integer_6_c
+    END INTERFACE
 
-            hdferr = h5awrite_integer_6_c(attr_id, memtype_id,  buf, dims)
-          END SUBROUTINE h5awrite_integer_6
+    hdferr = h5awrite_integer_6_c(attr_id, memtype_id,  buf, dims)
+  END SUBROUTINE h5awrite_integer_6
 
 
-          SUBROUTINE h5awrite_integer_7(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_integer_7(attr_id, memtype_id,  buf, dims, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_7
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
-                                                     ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(IN), &
-            DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-                                                    ! Attribute data 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER, INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
+    ! Attribute data 
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_integer_7_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5awrite_integer_7_c(attr_id, memtype_id,  buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_7_C'::h5awrite_integer_7_c
-              !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-              INTEGER(HID_T), INTENT(IN) :: attr_id
-              INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(IN), &
+    INTERFACE
+       INTEGER FUNCTION h5awrite_integer_7_c(attr_id, memtype_id,  buf, dims)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_7_C'::h5awrite_integer_7_c
+         !DEC$ ENDIF
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(HID_T), INTENT(IN) :: memtype_id
+         INTEGER, INTENT(IN), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-              END FUNCTION h5awrite_integer_7_c
-            END INTERFACE
+       END FUNCTION h5awrite_integer_7_c
+    END INTERFACE
 
-            hdferr = h5awrite_integer_7_c(attr_id, memtype_id,  buf, dims)
-          END SUBROUTINE h5awrite_integer_7
+    hdferr = h5awrite_integer_7_c(attr_id, memtype_id,  buf, dims)
+  END SUBROUTINE h5awrite_integer_7
 
 
-          SUBROUTINE h5awrite_real_scalar(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_real_scalar(attr_id, memtype_id,  buf, dims, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_real_scalar
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
-                                                     ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            REAL, INTENT(IN) :: buf                 ! Attribute data 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    REAL, INTENT(IN) :: buf                 ! Attribute data 
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_real_s_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5awrite_real_s_c(attr_id, memtype_id,  buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_S_C'::h5awrite_real_s_c
-              !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-              INTEGER(HID_T), INTENT(IN) :: attr_id
-              INTEGER(HID_T), INTENT(IN) :: memtype_id
-              REAL, INTENT(IN)::buf
-              END FUNCTION h5awrite_real_s_c
-            END INTERFACE
-
-            hdferr = h5awrite_real_s_c(attr_id, memtype_id,  buf, dims)
-          END SUBROUTINE h5awrite_real_scalar
-
-          SUBROUTINE h5awrite_real_1(attr_id, memtype_id,  buf, dims, hdferr) 
+    INTERFACE
+       INTEGER FUNCTION h5awrite_real_s_c(attr_id, memtype_id,  buf, dims)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_S_C'::h5awrite_real_s_c
+         !DEC$ ENDIF
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(HID_T), INTENT(IN) :: memtype_id
+         REAL, INTENT(IN)::buf
+       END FUNCTION h5awrite_real_s_c
+    END INTERFACE
+
+    hdferr = h5awrite_real_s_c(attr_id, memtype_id,  buf, dims)
+  END SUBROUTINE h5awrite_real_scalar
+
+  SUBROUTINE h5awrite_real_1(attr_id, memtype_id,  buf, dims, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_real_1
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
-                                                     ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            REAL, INTENT(IN), &
-            DIMENSION(dims(1)) :: buf
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    REAL, INTENT(IN), &
+         DIMENSION(dims(1)) :: buf
                                                     ! Attribute data 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_real_1_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5awrite_real_1_c(attr_id, memtype_id,  buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_1_C'::h5awrite_real_1_c
-              !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-              INTEGER(HID_T), INTENT(IN) :: attr_id
-              INTEGER(HID_T), INTENT(IN) :: memtype_id
-              REAL, INTENT(IN), &
+    INTERFACE
+       INTEGER FUNCTION h5awrite_real_1_c(attr_id, memtype_id,  buf, dims)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_1_C'::h5awrite_real_1_c
+         !DEC$ ENDIF
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(HID_T), INTENT(IN) :: memtype_id
+         REAL, INTENT(IN), &
               DIMENSION(dims(1)) :: buf
-              END FUNCTION h5awrite_real_1_c
-            END INTERFACE
+       END FUNCTION h5awrite_real_1_c
+    END INTERFACE
 
-            hdferr = h5awrite_real_1_c(attr_id, memtype_id,  buf, dims)
-          END SUBROUTINE h5awrite_real_1
+    hdferr = h5awrite_real_1_c(attr_id, memtype_id,  buf, dims)
+  END SUBROUTINE h5awrite_real_1
 
 
           SUBROUTINE h5awrite_real_2(attr_id, memtype_id,  buf, dims, hdferr) 
@@ -1463,6 +1463,11 @@
 !			dims parameter was added to make code portable;
 !			Aprile 4, 2001
 !
+!                       Changed buf intent to INOUT to be consistant
+!                       with how the C functions handles it. The pg
+!                       compiler will return 0 if a buf value is not set.
+!                       February, 2008
+!
 ! Comment:		This function is overloaded to write INTEGER,
 !			REAL, DOUBLE PRECISION and CHARACTER buffers
 !			up to 7 dimensions.	
@@ -1478,7 +1483,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(OUT) :: buf             ! Attribute data 
+            INTEGER, INTENT(INOUT) :: buf             ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_integer_s_c
@@ -1490,13 +1495,12 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_S_C'::h5aread_integer_s_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+              INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(OUT)::buf
+              INTEGER, INTENT(INOUT)::buf
               END FUNCTION h5aread_integer_s_c
             END INTERFACE
-
             hdferr = h5aread_integer_s_c(attr_id, memtype_id,  buf, dims)
           END SUBROUTINE h5aread_integer_scalar
 
@@ -1510,8 +1514,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(OUT), &
-            DIMENSION(dims(1)) :: buf
+            INTEGER, INTENT(INOUT), DIMENSION(dims(1)) :: buf
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_integer_1_c
@@ -1526,8 +1529,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(OUT), &
-              DIMENSION(dims(1)) :: buf
+              INTEGER, INTENT(INOUT), DIMENSION(dims(1)) :: buf
               END FUNCTION h5aread_integer_1_c
             END INTERFACE
 
@@ -1545,8 +1547,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(OUT), &
-            DIMENSION(dims(1),dims(2)) :: buf
+            INTEGER, INTENT(INOUT),DIMENSION(dims(1),dims(2)) :: buf
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_integer_2_c
@@ -1561,8 +1562,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(OUT), &
-              DIMENSION(dims(1),dims(2)) :: buf
+              INTEGER, INTENT(INOUT), DIMENSION(dims(1),dims(2)) :: buf
               END FUNCTION h5aread_integer_2_c
             END INTERFACE
 
@@ -1580,8 +1580,8 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(OUT), &
-            DIMENSION(dims(1),dims(2),dims(3)) :: buf
+            INTEGER, INTENT(INOUT), &
+                 DIMENSION(dims(1),dims(2),dims(3)) :: buf
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_integer_3_c
@@ -1596,7 +1596,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(OUT), &
+              INTEGER, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf
               END FUNCTION h5aread_integer_3_c
             END INTERFACE
@@ -1615,7 +1615,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(OUT), &
+            INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -1632,7 +1632,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(OUT), &
+              INTEGER, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
               END FUNCTION h5aread_integer_4_c
             END INTERFACE
@@ -1651,7 +1651,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(OUT), &
+            INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -1668,7 +1668,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(OUT), &
+              INTEGER, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
               END FUNCTION h5aread_integer_5_c
             END INTERFACE
@@ -1687,7 +1687,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(OUT), &
+            INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -1704,7 +1704,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(OUT), &
+              INTEGER, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
               END FUNCTION h5aread_integer_6_c
             END INTERFACE
@@ -1723,7 +1723,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(OUT), &
+            INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -1740,7 +1740,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              INTEGER, INTENT(OUT), &
+              INTEGER, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
               END FUNCTION h5aread_integer_7_c
             END INTERFACE
@@ -1759,7 +1759,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            REAL, INTENT(OUT) :: buf                ! Attribute data 
+            REAL, INTENT(INOUT) :: buf                ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_real_s_c
@@ -1774,7 +1774,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              REAL, INTENT(OUT)::buf
+              REAL, INTENT(INOUT)::buf
               END FUNCTION h5aread_real_s_c
             END INTERFACE
 
@@ -1791,7 +1791,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            REAL, INTENT(OUT), &
+            REAL, INTENT(INOUT), &
             DIMENSION(dims(1)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -1808,7 +1808,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              REAL, INTENT(OUT), &
+              REAL, INTENT(INOUT), &
               DIMENSION(dims(1)) :: buf
               END FUNCTION h5aread_real_1_c
             END INTERFACE
@@ -1827,7 +1827,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            REAL, INTENT(OUT), &
+            REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -1844,7 +1844,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              REAL, INTENT(OUT), &
+              REAL, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2)) :: buf
               END FUNCTION h5aread_real_2_c
             END INTERFACE
@@ -1863,7 +1863,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            REAL, INTENT(OUT), &
+            REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -1880,7 +1880,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              REAL, INTENT(OUT), &
+              REAL, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf
               END FUNCTION h5aread_real_3_c
             END INTERFACE
@@ -1899,7 +1899,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            REAL, INTENT(OUT), &
+            REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -1916,7 +1916,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              REAL, INTENT(OUT), &
+              REAL, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
               END FUNCTION h5aread_real_4_c
             END INTERFACE
@@ -1935,7 +1935,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            REAL, INTENT(OUT), &
+            REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -1952,7 +1952,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              REAL, INTENT(OUT), &
+              REAL, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
               END FUNCTION h5aread_real_5_c
             END INTERFACE
@@ -1971,7 +1971,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            REAL, INTENT(OUT), &
+            REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -1988,7 +1988,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              REAL, INTENT(OUT), &
+              REAL, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
               END FUNCTION h5aread_real_6_c
             END INTERFACE
@@ -2007,7 +2007,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            REAL, INTENT(OUT), &
+            REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2024,7 +2024,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              REAL, INTENT(OUT), &
+              REAL, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
               END FUNCTION h5aread_real_7_c
             END INTERFACE
@@ -2043,7 +2043,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            DOUBLE PRECISION, INTENT(OUT) :: buf    ! Attribute data 
+            DOUBLE PRECISION, INTENT(INOUT) :: buf    ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_double_s_c
@@ -2058,7 +2058,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              DOUBLE PRECISION, INTENT(OUT)::buf
+              DOUBLE PRECISION, INTENT(INOUT)::buf
               END FUNCTION h5aread_double_s_c
             END INTERFACE
 
@@ -2075,7 +2075,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            DOUBLE PRECISION, INTENT(OUT), &
+            DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2092,7 +2092,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              DOUBLE PRECISION, INTENT(OUT), &
+              DOUBLE PRECISION, INTENT(INOUT), &
               DIMENSION(dims(1)) :: buf
               END FUNCTION h5aread_double_1_c
             END INTERFACE
@@ -2111,7 +2111,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            DOUBLE PRECISION, INTENT(OUT), &
+            DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2128,7 +2128,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              DOUBLE PRECISION, INTENT(OUT), &
+              DOUBLE PRECISION, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2)) :: buf
               END FUNCTION h5aread_double_2_c
             END INTERFACE
@@ -2147,7 +2147,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            DOUBLE PRECISION, INTENT(OUT), &
+            DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2164,7 +2164,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              DOUBLE PRECISION, INTENT(OUT), &
+              DOUBLE PRECISION, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf
               END FUNCTION h5aread_double_3_c
             END INTERFACE
@@ -2183,7 +2183,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            DOUBLE PRECISION, INTENT(OUT), &
+            DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2200,7 +2200,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              DOUBLE PRECISION, INTENT(OUT), &
+              DOUBLE PRECISION, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
               END FUNCTION h5aread_double_4_c
             END INTERFACE
@@ -2219,7 +2219,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            DOUBLE PRECISION, INTENT(OUT), &
+            DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2236,7 +2236,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              DOUBLE PRECISION, INTENT(OUT), &
+              DOUBLE PRECISION, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
               END FUNCTION h5aread_double_5_c
             END INTERFACE
@@ -2255,7 +2255,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            DOUBLE PRECISION, INTENT(OUT), &
+            DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2272,7 +2272,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              DOUBLE PRECISION, INTENT(OUT), &
+              DOUBLE PRECISION, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
               END FUNCTION h5aread_double_6_c
             END INTERFACE
@@ -2291,7 +2291,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            DOUBLE PRECISION, INTENT(OUT), &
+            DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2308,7 +2308,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              DOUBLE PRECISION, INTENT(OUT), &
+              DOUBLE PRECISION, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
               END FUNCTION h5aread_double_7_c
             END INTERFACE
@@ -2327,7 +2327,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            CHARACTER(LEN=*), INTENT(OUT) :: buf 
+            CHARACTER(LEN=*), INTENT(INOUT) :: buf 
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
@@ -2344,7 +2344,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              CHARACTER(LEN=*) :: buf
+              CHARACTER(LEN=*), INTENT(INOUT) :: buf
               END FUNCTION h5areadc_s_c
             END INTERFACE
 
@@ -2361,7 +2361,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            CHARACTER(LEN=*), INTENT(OUT), &
+            CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2379,8 +2379,8 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              CHARACTER(LEN=*), INTENT(OUT), &
-              DIMENSION(dims(1)) :: buf
+              CHARACTER(LEN=*), INTENT(INOUT), &
+                   DIMENSION(dims(1)) :: buf
               END FUNCTION h5areadc_1_c
             END INTERFACE
 
@@ -2398,8 +2398,8 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            CHARACTER(LEN=*), INTENT(OUT), &
-            DIMENSION(dims(1),dims(2)) :: buf
+            CHARACTER(LEN=*), INTENT(INOUT), &
+                 DIMENSION(dims(1),dims(2)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
@@ -2416,7 +2416,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              CHARACTER(LEN=*), INTENT(OUT), &
+              CHARACTER(LEN=*), INTENT(INOUT), &
               DIMENSION(dims(1),dims(2)) :: buf
               END FUNCTION h5areadc_2_c
             END INTERFACE
@@ -2435,7 +2435,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            CHARACTER(LEN=*), INTENT(OUT), &
+            CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2453,7 +2453,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              CHARACTER(LEN=*), INTENT(OUT), &
+              CHARACTER(LEN=*), INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf
               END FUNCTION h5areadc_3_c
             END INTERFACE
@@ -2472,7 +2472,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            CHARACTER(LEN=*), INTENT(OUT), &
+            CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2490,7 +2490,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              CHARACTER(LEN=*), INTENT(OUT), &
+              CHARACTER(LEN=*), INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
               END FUNCTION h5areadc_4_c
             END INTERFACE
@@ -2509,7 +2509,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            CHARACTER(LEN=*), INTENT(OUT), &
+            CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2527,7 +2527,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              CHARACTER(LEN=*), INTENT(OUT), &
+              CHARACTER(LEN=*), INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
               END FUNCTION h5areadc_5_c
             END INTERFACE
@@ -2546,7 +2546,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            CHARACTER(LEN=*), INTENT(OUT), &
+            CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2564,7 +2564,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              CHARACTER(LEN=*), INTENT(OUT), &
+              CHARACTER(LEN=*), INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
               END FUNCTION h5areadc_6_c
             END INTERFACE
@@ -2583,7 +2583,7 @@
             INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
                                                      ! identifier  (in memory)
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            CHARACTER(LEN=*), INTENT(OUT), &
+            CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
                                                     ! Attribute data 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2601,7 +2601,7 @@
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
-              CHARACTER(LEN=*), INTENT(OUT), &
+              CHARACTER(LEN=*), INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
               END FUNCTION h5areadc_7_c
             END INTERFACE
@@ -2740,37 +2740,147 @@
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5aget_name_f(attr_id, size, buf, hdferr) 
+  SUBROUTINE h5aget_name_f(attr_id, size, buf, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aget_name_f
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier 
-            INTEGER(SIZE_T), INTENT(IN) :: size            ! Buffer size 
-            CHARACTER(LEN=*), INTENT(INOUT) :: buf   
-                                               ! Buffer to hold attribute name
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code:
-                                                   ! name length is successful,
-                                                   ! -1 if fail
-!            INTEGER, EXTERNAL :: h5aget_name_c
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier 
+    INTEGER(SIZE_T), INTENT(IN) :: size    ! Buffer size 
+    CHARACTER(LEN=*), INTENT(INOUT) :: buf   
+                                           ! Buffer to hold attribute name
+    INTEGER, INTENT(OUT) :: hdferr ! Error code:
+                                   ! name length is successful,
+                                   ! -1 if fail
+
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5aget_name_c(attr_id, size, buf)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AGET_NAME_C'::h5aget_name_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf
-              INTEGER(HID_T), INTENT(IN) :: attr_id
-              INTEGER(SIZE_T), INTENT(IN) :: size
-              CHARACTER(LEN=*), INTENT(OUT) :: buf
-              END FUNCTION h5aget_name_c
-            END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5aget_name_c(attr_id, size, buf)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AGET_NAME_C'::h5aget_name_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: buf
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(SIZE_T), INTENT(IN) :: size
+         CHARACTER(LEN=*), INTENT(OUT) :: buf
+       END FUNCTION h5aget_name_c
+    END INTERFACE
+
+    hdferr = h5aget_name_c(attr_id, size, buf)
+  END SUBROUTINE h5aget_name_f
 
-            hdferr = h5aget_name_c(attr_id, size, buf)
-          END SUBROUTINE h5aget_name_f
+!----------------------------------------------------------------------
+! Name:		h5aget_name_by_idx_f
+!
+! Purpose: 	Gets an attribute name, by attribute index position.  
+!
+! Inputs:  
+!          loc_id   - Location of object to which attribute is attached
+!          obj_name - Name of object to which attribute is attached, relative to location
+!          idx_type - Type of index; Possible values are:
+!
+!                  H5_INDEX_UNKNOWN_F = -1  - Unknown index type
+!                  H5_INDEX_NAME_F          - Index on names
+!                  H5_INDEX_CRT_ORDER_F     - Index on creation order
+!                  H5_INDEX_N	 _F         - Number of indices defined
+!
+!          order    - Order in which to iterate over index; Possible values are:
+!
+!                  H5_ITER_UNKNOWN_F   - Unknown order
+!                  H5_ITER_INC_F       - Increasing order
+!                  H5_ITER_DEC_F       - Decreasing order
+!                  H5_ITER_NATIVE_F    - No particular order, whatever is fastest
+!                  H5_ITER_N_F	     - Number of iteration orders
+!
+!          order    - Index traversal order
+!              n    - Attribute’s position in index
+!           size    - Size, in bytes, of attribute name
+!
+! Outputs:  
+!		name            - Attribute name
+!               name_size_out   - Size of Attribute name returned from function
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!        lapl_id    - Link access property list	
+!
+! Programmer:   M.S. Breitenfeld
+!		January, 2008
+!
+! Modifications: N/A
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5aget_name_by_idx_f(loc_id, obj_name, idx_type, order, &
+       n, name, size, hdferr, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5aget_name_by_idx_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifer for object to which attribute is attached
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location,
+                                              !  from which attribute is to be removed *TEST* check NULL
+    INTEGER, INTENT(IN) :: idx_type ! Type of index; Possible values are:
+                                    !    H5_INDEX_UNKNOWN_F   - Unknown index type
+                                    !    H5_INDEX_NAME_F       - Index on names
+                                    !    H5_INDEX_CRT_ORDER_F  - Index on creation order
+                                    !    H5_INDEX_N_F 	      - Number of indices defined
+
+    INTEGER, INTENT(IN) :: order    ! Order in which to iterate over index; Possible values are:
+                                    !    H5_ITER_UNKNOWN_F   - Unknown order
+                                    !    H5_ITER_INC_F      - Increasing order
+                                    !    H5_ITER_DEC_F       - Decreasing order
+                                    !    H5_ITER_NATIVE_F    - No particular order, whatever is fastest
+                                    !    H5_ITER_N_F 	    - Number of iteration orders
+
+    INTEGER(HSIZE_T), INTENT(IN) :: n !  Attribute’s position in index
+     
+    CHARACTER(LEN=*), INTENT(OUT) :: name    ! Attribute name
+
+    INTEGER(SIZE_T), INTENT(INOUT) :: size  ! Buffer size ! *TEST* check for 0 value *CHECK* should this return the correct value
+    
+    INTEGER, INTENT(OUT) :: hdferr    ! Error code:
+                                         ! Returns attribute name size,
+                                         ! -1 if fail
+    INTEGER(SIZE_T) :: obj_namelen
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id   ! Link access property list
+    INTEGER(HID_T) :: lapl_id_default
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5aget_name_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, &
+            n, name, size, lapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AGET_NAME_BY_IDX_C'::h5aget_name_by_idx_c
+         !DEC$ ENDIF
+
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: obj_name
+         INTEGER, INTENT(IN) :: idx_type
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+     
+         CHARACTER(LEN=*), INTENT(OUT) :: name
+         INTEGER(SIZE_T), INTENT(INOUT) :: size
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: obj_namelen
+       END FUNCTION h5aget_name_by_idx_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5aget_name_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, &
+         n, name, size, lapl_id_default)
+
+  END SUBROUTINE h5aget_name_by_idx_f
 
 
 !----------------------------------------------------------------------
@@ -2798,33 +2908,33 @@
 !
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5aget_num_attrs_f(obj_id, attr_num, hdferr) 
+  SUBROUTINE h5aget_num_attrs_f(obj_id, attr_num, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aget_num_attrs_f
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: obj_id  ! Object identifier 
-            INTEGER, INTENT(OUT) :: attr_num      ! Number of attributes of the
-                                                  ! object
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id  ! Object identifier 
+    INTEGER, INTENT(OUT) :: attr_num      ! Number of attributes of the
+    ! object
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code
 
 !            INTEGER, EXTERNAL :: h5aget_num_attrs_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5aget_num_attrs_c(obj_id, attr_num)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AGET_NUM_ATTRS_C'::h5aget_num_attrs_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: obj_id
-              INTEGER, INTENT(OUT) :: attr_num
-              END FUNCTION h5aget_num_attrs_c
-            END INTERFACE
-
-            hdferr = h5aget_num_attrs_c(obj_id, attr_num)
-          END SUBROUTINE h5aget_num_attrs_f
+    INTERFACE
+       INTEGER FUNCTION h5aget_num_attrs_c(obj_id, attr_num)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AGET_NUM_ATTRS_C'::h5aget_num_attrs_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         INTEGER, INTENT(OUT) :: attr_num
+       END FUNCTION h5aget_num_attrs_c
+    END INTERFACE
+    
+    hdferr = h5aget_num_attrs_c(obj_id, attr_num)
+  END SUBROUTINE h5aget_num_attrs_f
 
 !----------------------------------------------------------------------
 ! Name:		h5adelete_f 
@@ -2852,36 +2962,36 @@
 !
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5adelete_f(obj_id, name, hdferr) 
+  SUBROUTINE h5adelete_f(obj_id, name, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5adelete_f
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name    ! Attribute name
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-            INTEGER(SIZE_T) :: namelen
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier 
+    CHARACTER(LEN=*), INTENT(IN) :: name    ! Attribute name
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    INTEGER(SIZE_T) :: namelen
 
 !            INTEGER, EXTERNAL ::  h5adelete_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5adelete_c(obj_id, name, namelen) 
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ADELETE_C'::h5adelete_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: obj_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER(SIZE_T) :: namelen
-              END FUNCTION h5adelete_c
-            END INTERFACE
-
-            namelen = LEN(name)
-            hdferr = h5adelete_c(obj_id, name, namelen)
-          END SUBROUTINE h5adelete_f
+    INTERFACE
+       INTEGER FUNCTION h5adelete_c(obj_id, name, namelen) 
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ADELETE_C'::h5adelete_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         CHARACTER(LEN=*), INTENT(IN) :: name
+         INTEGER(SIZE_T) :: namelen
+       END FUNCTION h5adelete_c
+    END INTERFACE
+    
+    namelen = LEN(name)
+    hdferr = h5adelete_c(obj_id, name, namelen)
+  END SUBROUTINE h5adelete_f
 
 !----------------------------------------------------------------------
 ! Name:		h5aclose_f 
@@ -2907,29 +3017,1177 @@
 !
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5aclose_f(attr_id, hdferr) 
+  SUBROUTINE h5aclose_f(attr_id, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aclose_f
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code:
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier 
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
 
 !            INTEGER, EXTERNAL :: h5aclose_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5aclose_c(attr_id)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ACLOSE_C'::h5aclose_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: attr_id
-              END FUNCTION h5aclose_c
-            END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5aclose_c(attr_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ACLOSE_C'::h5aclose_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+       END FUNCTION h5aclose_c
+    END INTERFACE
+    
+    hdferr = h5aclose_c(attr_id)
+  END SUBROUTINE h5aclose_f
+
+!----------------------------------------------------------------------
+! Name:		h5aget_storage_size_f 
+!
+! Purpose:  	Returns the amount of storage required for an attribute.
+!		
+! Inputs:  
+!		attr_id		- attribute identifier
+! Outputs:  
+!               size            - attribute storage size
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE			
+!
+! Programmer:	M. S. Breitenfeld
+!		January, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5aget_storage_size_f(attr_id, size, hdferr) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5aget_storage_size_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier  
+    INTEGER(HSIZE_T), INTENT(OUT) :: size   ! Attribute storage requirement
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5aget_storage_size_c(attr_id, size)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AGET_STORAGE_SIZE_C'::h5aget_storage_size_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(HSIZE_T), INTENT(OUT) :: size
+       END FUNCTION h5aget_storage_size_c
+    END INTERFACE
+    
+    hdferr = h5aget_storage_size_c(attr_id, size)
+  END SUBROUTINE h5aget_storage_size_f
+
+!----------------------------------------------------------------------
+! Name:		h5aget_create_plist_f 
+!
+! Purpose:  	Gets an attribute creation property list identifier
+!		
+! Inputs:  
+!		attr_id		  - Identifier of the attribute
+! Outputs:  
+!               creation_prop_id  - Identifier for the attribute’s creation property
+!		hdferr:		  - error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE			
+!
+! Programmer:	M. S. Breitenfeld
+!		January, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5aget_create_plist_f(attr_id, creation_prop_id, hdferr) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5aget_create_plist_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Identifier of the attribute 
+    INTEGER(HID_T), INTENT(OUT) :: creation_prop_id   ! Identifier for the attribute’s creation property
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+                                         ! 0 on success and -1 on failure
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5aget_create_plist_c(attr_id, creation_prop_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AGET_CREATE_PLIST_C'::h5aget_create_plist_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(HID_T), INTENT(OUT) :: creation_prop_id
+       END FUNCTION h5aget_create_plist_c
+    END INTERFACE
+    
+    hdferr = h5aget_create_plist_c(attr_id, creation_prop_id)
+  END SUBROUTINE h5aget_create_plist_f
+
+!----------------------------------------------------------------------
+! Name:		h5arename_by_name_f 
+!
+! Purpose: 	Renames an attribute
+!
+! Inputs:  
+!		loc_id        - Location or object identifier; may be dataset or group
+!		obj_name      - Name of object, relative to location, 
+!                                whose attribute is to be renamed
+!               old_attr_name - Prior attribute name
+!               new_attr_name - New attribute name
+!               lapl_id       - Link access property list identifier
+!
+! Outputs:
+!		hdferr:	      - error code		
+!				 	Success:  0
+!				 	Failure: -1   			
+!
+! Programmer:	M.S. Breitenfeld
+!		January, 2008	
+!
+! Modifications: N/A
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5arename_by_name_f(loc_id, obj_name, old_attr_name, new_attr_name, &
+        hdferr, lapl_id) 
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5arename_by_name_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier 
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location, 
+                                              !  whose attribute is to be renamed
+    CHARACTER(LEN=*), INTENT(IN) :: old_attr_name ! Prior attribute name
+    CHARACTER(LEN=*), INTENT(IN) :: new_attr_name ! New attribute name
+    
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+                                         ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
+
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: obj_namelen
+    INTEGER(SIZE_T) :: old_attr_namelen
+    INTEGER(SIZE_T) :: new_attr_namelen
+    
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5arename_by_name_c(loc_id, obj_name, obj_namelen, &
+            old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen, &
+            lapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ARENAME_BY_NAME_C'::h5arename_by_name_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: obj_name
+         INTEGER(SIZE_T) :: obj_namelen
+         CHARACTER(LEN=*), INTENT(IN) :: old_attr_name
+         INTEGER(SIZE_T) :: old_attr_namelen
+         CHARACTER(LEN=*), INTENT(IN) :: new_attr_name
+         INTEGER(SIZE_T) :: new_attr_namelen
+         INTEGER(HID_T) :: lapl_id_default
+         
+       END FUNCTION h5arename_by_name_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+    old_attr_namelen = LEN(old_attr_name)
+    new_attr_namelen = LEN(new_attr_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default=lapl_id
+    
+    hdferr = h5arename_by_name_c(loc_id, obj_name, obj_namelen, &
+         old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen, &
+         lapl_id_default)
+    
+  END SUBROUTINE h5arename_by_name_f
+
+!----------------------------------------------------------------------
+! Name:		h5aopen_f 
+!
+! Purpose:  	Opens an attribute for an object specified by object 
+!               identifier and attribute name
+!
+! Inputs:  	
+!		obj_id      - Identifer for object to which attribute is attached
+!               attr_name   - Name of attribute to open
+! Outputs:  
+!		attr_id     - attribute identifier
+!		hdferr:     - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!		aapl_id     - Attribute access property list
+!
+! Programmer:	M.S. Breitenfeld
+!		January, 2008
+!
+! Modifications: N/A 
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5aopen_f(obj_id, attr_name, attr_id, hdferr, aapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5aopen_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id      ! Object identifier 
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
+    INTEGER(HID_T), INTENT(OUT) :: attr_id    ! Attribute identifier 
+    INTEGER, INTENT(OUT) :: hdferr            ! Error code 		
+                                              !   Success:  0
+                                              !   Failure: -1  
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id     ! Attribute access property list
+    INTEGER(HID_T) :: aapl_id_default
+
+    INTEGER(SIZE_T) :: attr_namelen
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5aopen_c(obj_id, attr_name, attr_namelen, aapl_id_default, attr_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_C'::h5aopen_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         CHARACTER(LEN=*), INTENT(IN) :: attr_name
+         INTEGER(HID_T) :: aapl_id_default
+         INTEGER(SIZE_T) :: attr_namelen 
+         INTEGER(HID_T), INTENT(OUT) :: attr_id
+       END FUNCTION h5aopen_c
+    END INTERFACE
+
+    attr_namelen = LEN(attr_name)
+
+    aapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
+
+    hdferr = h5aopen_c(obj_id, attr_name, attr_namelen, aapl_id_default, attr_id)
+
+  END SUBROUTINE h5aopen_f
+
+!----------------------------------------------------------------------
+! Name:		h5adelete_by_idx_f 
+!
+! Purpose:  	Deletes an attribute from an object according to index order 
+!
+! Inputs:  	
+!		loc_id     - Location or object identifier; may be dataset or group
+!               obj_name   - Name of object, relative to location, from which attribute is to be removed
+!               idx_type   - Type of index; Possible values are:
+!
+!                  H5_INDEX_UNKNOWN_F = -1  - Unknown index type
+!                  H5_INDEX_NAME_F          - Index on names
+!                  H5_INDEX_CRT_ORDER_F     - Index on creation order
+!                  H5_INDEX_N_F	            - Number of indices defined
+!                             
+!               order - Order in which to iterate over index; Possible values are:
+!
+!                  H5_ITER_UNKNOWN_F   - Unknown order
+!                  H5_ITER_INC_F       - Increasing order
+!                  H5_ITER_DEC_F       - Decreasing order
+!                  H5_ITER_NATIVE_F    - No particular order, whatever is fastest
+!                  H5_ITER_N_F 	       - Number of iteration orders
+!
+!               n          - Offset within index
+! Outputs:
+!		hdferr:     - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!               lapl_id    - Link access property list
+!
+! Programmer:	M.S. Breitenfeld
+!		January, 2008
+!
+! Modifications: N/A 
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5adelete_by_idx_f(loc_id, obj_name, idx_type, order, n, hdferr, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5adelete_by_idx_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifer for object to which attribute is attached
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location, 
+                                              !  from which attribute is to be removed
+    INTEGER, INTENT(IN) :: idx_type           ! Type of index; Possible values are:
+                                              !    H5_INDEX_UNKNOWN_F   - Unknown index type
+                                              !    H5_INDEX_NAME_F      - Index on names
+                                              !    H5_INDEX_CRT_ORDER_F - Index on creation order
+                                              !    H5_INDEX_N_F	      - Number of indices defined
+
+    INTEGER, INTENT(IN) :: order              ! Order in which to iterate over index; Possible values are:
+                                              !    H5_ITER_UNKNOWN_F  - Unknown order
+                                              !    H5_ITER_INC_F      - Increasing order
+                                              !    H5_ITER_DEC_F      - Decreasing order
+                                              !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
+                                              !    H5_ITER_N_F	    - Number of iteration orders
+!
+    INTEGER(HSIZE_T), INTENT(IN) :: n         ! Offset within index 
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
+                                           ! 0 on success and -1 on failure
+    INTEGER(SIZE_T) :: obj_namelen
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id     ! Link access property list
+
+    INTEGER(HID_T) :: lapl_id_default
+    
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5adelete_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ADELETE_BY_IDX_C'::h5adelete_by_idx_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: obj_name
+         INTEGER, INTENT(IN) :: idx_type
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n 
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: obj_namelen
+       END FUNCTION h5adelete_by_idx_c
+    END INTERFACE
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+    
+    obj_namelen = LEN(obj_name)
+    hdferr = h5adelete_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default)
+    
+  END SUBROUTINE h5adelete_by_idx_f
+
+!----------------------------------------------------------------------
+! Name:		h5adelete_by_name_f 
+!
+! Purpose:  	Removes an attribute from a specified location
+!
+! Inputs:  	
+!		loc_id     - Identifer for object to which attribute is attached
+!               obj_name   - Name of attribute to open
+!		attr_name  - Attribute access property list
+!               lapl_id    - Link access property list
+! Outputs:
+!		hdferr:     - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!				NONE			
+!
+! Programmer:	M.S. Breitenfeld
+!		January, 2008
+!
+! Modifications: N/A 
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5adelete_by_name_f(loc_id, obj_name, attr_name, hdferr, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5adelete_by_name_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifer for object to which attribute is attached
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location, 
+                                              !  from which attribute is to be removed
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Name of attribute to delete
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code:
+                                            ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id     ! Link access property list  
+    INTEGER(SIZE_T) :: attr_namelen
+    INTEGER(SIZE_T) :: obj_namelen
+
+    INTEGER(HID_T) :: lapl_id_default
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5adelete_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ADELETE_BY_NAME_C'::h5adelete_by_name_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: obj_name
+         CHARACTER(LEN=*), INTENT(IN) :: attr_name
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: attr_namelen
+         INTEGER(SIZE_T) :: obj_namelen
+       END FUNCTION h5adelete_by_name_c
+    END INTERFACE
+    
+    obj_namelen = LEN(obj_name)
+    attr_namelen = LEN(attr_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5adelete_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default)
+
+  END SUBROUTINE h5adelete_by_name_f
+
+!----------------------------------------------------------------------
+! Name:		h5aopen_by_idx_f 
+!
+! Purpose:  	Opens an existing attribute that is attached to an object specified by location and name
+!
+! Inputs:  
+!		loc_id      - Location of object to which attribute is attached
+!               obj_name    - Name of object to which attribute is attached, relative to location
+!               idx_type    - Type of index
+!               order       - Index traversal order
+!               n           - Attribute’s position in index
+! Outputs:
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!               aapl_id     - Attribute access property list
+!               lapl_id     - Link access property list
+!
+! Programmer:	M.S. Breitenfeld
+!		January, 2008	
+!
+! Modifications: N/A 
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5aopen_by_idx_f(loc_id, obj_name, idx_type, order, n, attr_id, hdferr, aapl_id, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5aopen_by_idx_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Object identifier
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object to which attribute is attached
+    INTEGER, INTENT(IN) :: idx_type           ! Type of index; Possible values are:
+                                              !    H5_INDEX_UNKNOWN_F   - Unknown index type
+                                              !    H5_INDEX_NAME_F      - Index on names
+                                              !    H5_INDEX_CRT_ORDER_F - Index on creation order
+                                              !    H5_INDEX_N_F	      - Number of indices defined
+    INTEGER, INTENT(IN) :: order              ! Order in which to iterate over index; Possible values are:
+                                              !    H5_ITER_UNKNOWN_F  - Unknown order
+                                              !    H5_ITER_INC_F      - Increasing order
+                                              !    H5_ITER_DEC_F      - Decreasing order
+                                              !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
+                 
+    INTEGER(HSIZE_T), INTENT(IN) :: n      ! Attribute’s position in index
+
+    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code:
+                                            ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id  ! Attribute access property list
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
+
+    INTEGER(SIZE_T) :: obj_namelen
+    INTEGER(HID_T) :: aapl_id_default 
+    INTEGER(HID_T) :: lapl_id_default
+
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5aopen_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, &
+            aapl_id_default, lapl_id_default, attr_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_BY_IDX_C'::h5aopen_by_idx_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: obj_name
+         INTEGER, INTENT(IN) :: idx_type
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         INTEGER(HID_T) :: aapl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: obj_namelen
+         INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier
+       END FUNCTION h5aopen_by_idx_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+
+    aapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5aopen_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, &
+         aapl_id_default, lapl_id_default, attr_id)
+
+  END SUBROUTINE h5aopen_by_idx_f
+
+!----------------------------------------------------------------------
+! Name:		h5aget_info_f
+!
+! Purpose:  	Retrieves attribute information, by attribute identifier
+!		
+! Inputs:  
+!		attr_id		- attribute identifier
+!
+! Outputs:  NOTE: In C it is defined as a structure: H5A_info_t
+!
+!    corder_valid   - indicates whether the creation order data is valid for this attribute
+!    corder         - is a positive integer containing the creation order of the attribute        
+!    cset           - indicates the character set used for the attribute’s name          
+!    data_size      - indicates the size, in the number of characters, of the attribute
+!		
+!    hdferr         - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!				NONE			
+!
+! Programmer:	M. S. Breitenfeld
+!		January, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  hdferr) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5aget_info_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
+
+    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+    INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
+    INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
+    INTEGER(HSIZE_T), INTENT(OUT) :: data_size   ! Indicates the size, in the number of characters, of the attribute
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+                                         ! 0 on success and -1 on failure
+
+    INTEGER :: corder_valid
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5aget_info_c(attr_id, corder_valid, corder, cset, data_size)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AGET_INFO_C'::h5aget_info_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+
+         INTEGER, INTENT(OUT) :: corder_valid
+         INTEGER, INTENT(OUT) :: corder
+         INTEGER, INTENT(OUT) :: cset
+         INTEGER(HSIZE_T), INTENT(OUT) :: data_size
+       END FUNCTION h5aget_info_c
+    END INTERFACE
+
+    hdferr = h5aget_info_c(attr_id, corder_valid, corder, cset, data_size)
+    
+    f_corder_valid =.FALSE.
+    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
+    
+
+
+  END SUBROUTINE h5aget_info_f
+
+!----------------------------------------------------------------------
+! Name:		h5aget_info_by_idx_f
+!
+! Purpose:  	Retrieves attribute information, by attribute index position
+!		
+! Inputs:
+!	loc_id - Location of object to which attribute is attached
+!     obj_name - Name of object to which attribute is attached, relative to location
+!     idx_type - Type of index
+!        order - Index traversal order
+!            n - Attribute’s position in index
+!
+! Outputs:  NOTE: In C it is defined as a structure: H5A_info_t
+!    corder_valid   - indicates whether the creation order data is valid for this attribute
+!    corder         - is a positive integer containing the creation order of the attribute        
+!    cset           - indicates the character set used for the attribute’s name          
+!    data_size      - indicates the size, in the number of characters, of the attribute	
+!    hdferr         - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!      lapl_id - Link access property list		
+!
+! Programmer:	M. S. Breitenfeld
+!		January, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5aget_info_by_idx_f(loc_id, obj_name, idx_type, order, n, &
+       f_corder_valid, corder, cset, data_size, hdferr, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5aget_info_by_idx_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name ! Name of object to which attribute is attached
+    INTEGER, INTENT(IN) :: idx_type           ! Type of index; Possible values are:
+                                              !    H5_INDEX_UNKNOWN_F   - Unknown index type
+                                              !    H5_INDEX_NAME_F      - Index on names
+                                              !    H5_INDEX_CRT_ORDER_F - Index on creation order
+                                              !    H5_INDEX_N_F	      - Number of indices defined
+    INTEGER, INTENT(IN) :: order              ! Order in which to iterate over index; Possible values are:
+                                              !    H5_ITER_UNKNOWN_F  - Unknown order
+                                              !    H5_ITER_INC_F      - Increasing order
+                                              !    H5_ITER_DEC_F      - Decreasing order
+                                              !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
+                 
+    INTEGER(HSIZE_T), INTENT(IN) :: n      ! Attribute’s position in index
+
+
+    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+    INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
+    INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
+    INTEGER(HSIZE_T), INTENT(OUT) :: data_size   ! Indicates the size, in the number of characters, of the attribute
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+                                         ! 0 on success and -1 on failure
+    INTEGER :: corder_valid
+    INTEGER(SIZE_T)  :: obj_namelen
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
+    INTEGER(HID_T) :: lapl_id_default
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5aget_info_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default, &
+            corder_valid, corder, cset, data_size)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AGET_INFO_BY_IDX_C'::h5aget_info_by_idx_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: obj_name
+         INTEGER, INTENT(IN) :: idx_type
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER, INTENT(OUT) :: corder_valid 
+         INTEGER, INTENT(OUT) :: corder
+         INTEGER, INTENT(OUT) :: cset
+         INTEGER(HSIZE_T), INTENT(OUT) :: data_size
+
+         INTEGER(SIZE_T)  :: obj_namelen
+       END FUNCTION h5aget_info_by_idx_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(present(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5aget_info_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default, &
+            corder_valid, corder, cset, data_size)
+
+    f_corder_valid =.FALSE.
+    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
+    
+  END SUBROUTINE h5aget_info_by_idx_f
+
+!----------------------------------------------------------------------
+! Name:		h5aget_info_by_name_f
+!
+! Purpose:  	Retrieves attribute information, by attribute name
+!		
+! Inputs:
+!	loc_id - Location of object to which attribute is attached
+!     obj_name - Name of object to which attribute is attached, relative to location
+!    attr_name - Attribute name
+!
+! Outputs:  NOTE: In C it is defined as a structure: H5A_info_t
+!    corder_valid   - indicates whether the creation order data is valid for this attribute
+!    corder         - is a positive integer containing the creation order of the attribute        
+!    cset           - indicates the character set used for the attribute’s name          
+!    data_size      - indicates the size, in the number of characters, of the attribute	
+!    hdferr         - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!      lapl_id - Link access property list		
+!
+! Programmer:	M. S. Breitenfeld
+!		January, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5aget_info_by_name_f(loc_id, obj_name, attr_name, &
+       f_corder_valid, corder, cset, data_size, hdferr, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5aget_info_by_name_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name ! Name of object to which attribute is attached
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
+
+
+    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+    INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
+    INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
+    INTEGER(HSIZE_T), INTENT(OUT) :: data_size   ! Indicates the size, in the number of characters, of the attribute
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
+                                           ! 0 on success and -1 on failure
+    INTEGER :: corder_valid
+    INTEGER(SIZE_T)  :: obj_namelen
+    INTEGER(SIZE_T)  :: attr_namelen
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
+    INTEGER(HID_T) :: lapl_id_default
+    
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5aget_info_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, &
+            corder_valid, corder, cset, data_size)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AGET_INFO_BY_NAME_C'::h5aget_info_by_name_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: obj_name
+         INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
+         CHARACTER(LEN=*), INTENT(IN) :: attr_name
+         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER, INTENT(OUT) :: corder_valid 
+         INTEGER, INTENT(OUT) :: corder
+         INTEGER, INTENT(OUT) :: cset
+         INTEGER(HSIZE_T), INTENT(OUT) :: data_size
+
+       END FUNCTION h5aget_info_by_name_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+    attr_namelen = LEN(attr_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id 
+
+    hdferr = h5aget_info_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, &
+            corder_valid, corder, cset, data_size)
+
+    f_corder_valid =.FALSE.
+    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
+    
+  END SUBROUTINE h5aget_info_by_name_f
+
+!----------------------------------------------------------------------
+! Name:	        H5Acreate_by_name_f	
+!
+! Purpose:  	Creates an attribute attached to a specified object
+!		
+! Inputs:
+!   loc_id   	- Location or object identifier; may be dataset or group
+!   obj_name 	- Name, relative to loc_id, of object that attribute is to be attached to
+!   attr_name   - Attribute name
+!   type_id 	- Attribute datatype identifier
+!   space_id 	- Attribute dataspace identifier
+!
+! Outputs:
+!       attr    - an attribute identifier
+!     hdferr    - error code		
+!		       Success:  0
+!		       Failure: -1 
+! Optional parameters:
+!   acpl_id 	- Attribute creation property list identifier (Currently not used.)
+!   aapl_id 	- Attribute access property list identifier (Currently not used.)
+!   lapl_id 	- Link access property list		
+!
+! Programmer:	M. S. Breitenfeld
+!		February, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5acreate_by_name_f(loc_id, obj_name, attr_name, type_id, space_id, attr, hdferr, &
+       acpl_id, aapl_id, lapl_id)
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5acreate_by_name_f
+!DEC$endif
+
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name ! Name of object to which attribute is attached
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
+
+    INTEGER(HID_T), INTENT(IN) :: type_id  ! Attribute datatype identifier
+    INTEGER(HID_T), INTENT(IN) :: space_id ! Attribute dataspace identifier
+
+    INTEGER(HID_T), INTENT(OUT) :: attr ! an attribute identifier
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
+                                           ! 0 on success and -1 on failure
+
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: acpl_id ! Attribute creation property list identifier (Currently not used.)
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id ! Attribute access property list identifier (Currently not used.)
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list
+
+    INTEGER(SIZE_T)  :: obj_namelen
+    INTEGER(SIZE_T)  :: attr_namelen
+
+    INTEGER(HID_T) :: acpl_id_default
+    INTEGER(HID_T) :: aapl_id_default
+    INTEGER(HID_T) :: lapl_id_default
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5acreate_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
+            type_id, space_id, acpl_id_default, aapl_id_default, lapl_id_default, attr)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ACREATE_BY_NAME_C'::h5acreate_by_name_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: obj_name
+         INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
+         CHARACTER(LEN=*), INTENT(IN) :: attr_name
+         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
+         INTEGER(HID_T), INTENT(IN) :: type_id 
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HID_T) :: acpl_id_default
+         INTEGER(HID_T) :: aapl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(HID_T), INTENT(OUT) :: attr
+
+       END FUNCTION h5acreate_by_name_c
+    END INTERFACE
+
+    obj_namelen = LEN(obj_name)
+    attr_namelen = LEN(attr_name)
+
+    acpl_id_default = H5P_DEFAULT_F
+    aapl_id_default = H5P_DEFAULT_F
+    lapl_id_default = H5P_DEFAULT_F
+
+    IF(PRESENT(acpl_id)) acpl_id_default = acpl_id
+    IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+    
+    hdferr = h5acreate_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
+            type_id, space_id, acpl_id_default, aapl_id_default, lapl_id_default, attr)
+  END SUBROUTINE h5acreate_by_name_f
+
+!----------------------------------------------------------------------
+! Name:	        H5Aexists_f	
+!
+! Purpose:  	Determines whether an attribute with a given name exists on an object
+!		
+! Inputs:
+!                 obj_id - Object identifier
+!              attr_name - Attribute name
+!
+! Outputs:
+!       attr_exists  - attribute exists status
+!            hdferr  - error code		
+!		         Success:  0
+!		         Failure: -1 
+! Optional parameters:
+!				NONE			
+!
+! Programmer:	M. S. Breitenfeld
+!		February, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5aexists_f(obj_id, attr_name, attr_exists, hdferr)
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5aexists_f
+!DEC$endif
+
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id     ! Object identifier
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
+    LOGICAL, INTENT(OUT) :: attr_exists ! .TRUE. if exists, .FALSE. otherwise
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
+                                           ! 0 on success and -1 on failure
+    INTEGER :: attr_exists_c
+    INTEGER(SIZE_T)  :: attr_namelen
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5aexists_c(obj_id, attr_name, attr_namelen, attr_exists_c)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AEXISTS_C'::h5aexists_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         CHARACTER(LEN=*), INTENT(IN) :: attr_name
+         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
+         INTEGER(HID_T), INTENT(OUT) :: attr_exists_c
+       END FUNCTION h5aexists_c
+    END INTERFACE
+
+    attr_namelen = LEN(attr_name)
+
+    hdferr = h5aexists_c(obj_id, attr_name, attr_namelen, attr_exists_c)
+
+    attr_exists = .FALSE.
+    IF(attr_exists_c.GT.0) attr_exists = .TRUE. 
+
+  END SUBROUTINE h5aexists_f
+
+!----------------------------------------------------------------------
+! Name:	        H5Aexists_by_name_f	
+!
+! Purpose:  	Determines whether an attribute with a given name exists on an object
+!		
+! Inputs:
+!     loc_id - Location identifier
+!   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
+!  attr_name - Attribute name
+!
+! Outputs:
+!       attr_exists  - attribute exists status
+!            hdferr  - error code		
+!		         Success:  0
+!		         Failure: -1 
+! Optional parameters:
+!    lapl_id - Link access property list identifier	
+!
+! Programmer:	M. S. Breitenfeld
+!		February, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5aexists_by_name_f(loc_id, obj_name, attr_name, attr_exists, hdferr, lapl_id)
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5aexists_by_name_f
+!DEC$endif
+
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Location identifier
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name ! Object name either relative to loc_id, 
+                                             ! absolute from the file’s root group, or '.'
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
+    LOGICAL, INTENT(OUT) :: attr_exists ! .TRUE. if exists, .FALSE. otherwise
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
+                                           ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
+    INTEGER :: attr_exists_c
+    INTEGER(SIZE_T)  :: obj_namelen
+    INTEGER(SIZE_T)  :: attr_namelen
+
+    INTEGER(HID_T) :: lapl_id_default
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5aexists_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, attr_exists_c)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AEXISTS_BY_NAME_C'::h5aexists_by_name_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id  
+         CHARACTER(LEN=*), INTENT(IN) :: obj_name
+         INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
+         CHARACTER(LEN=*), INTENT(IN) :: attr_name
+         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
+         INTEGER(HID_T), INTENT(IN) :: lapl_id_default
+         INTEGER(HID_T), INTENT(OUT) :: attr_exists_c
+       END FUNCTION h5aexists_by_name_c
+    END INTERFACE
+
+    attr_namelen = LEN(attr_name)
+    obj_namelen = LEN(obj_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5aexists_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, attr_exists_c)
+
+    attr_exists = .FALSE.
+    IF(attr_exists_c.GT.0) attr_exists = .TRUE. 
+
+  END SUBROUTINE h5aexists_by_name_f
+!----------------------------------------------------------------------
+! Name:	        H5Aopen_by_name_f	
+!
+! Purpose:  	Opens an attribute for an object by object name and attribute name.
+!		
+! Inputs:
+!     loc_id - Location from which to find object to which attribute is attached 
+!   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
+!  attr_name - Attribute name
+!
+! Outputs:
+!       attr_id  - attribute identifier
+!        hdferr  - error code		
+!		         Success:  0
+!		         Failure: -1 
+! Optional parameters:
+!    aapl_id - Attribute access property list (Currently unused; should be passed in as H5P_DEFAULT.)
+!    lapl_id - Link access property list identifier	
+!
+! Programmer:	M. S. Breitenfeld
+!		February, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5aopen_by_name_f(loc_id, obj_name, attr_name, attr_id, hdferr, aapl_id, lapl_id)
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport ::  h5aopen_by_name_f
+!DEC$endif
+
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Location identifier
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name ! Object name either relative to loc_id, 
+                                             ! absolute from the file’s root group, or '.'
+    CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
+    INTEGER(HID_T), INTENT(OUT) :: attr_id ! Attribute identifier
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
+                                           ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id ! Attribute access property list 
+                                                    ! (Currently unused; should be passed in as H5P_DEFAULT_F)
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
+    
+    INTEGER(HID_T) :: aapl_id_default
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTEGER(SIZE_T) :: obj_namelen
+    INTEGER(SIZE_T) :: attr_namelen
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5aopen_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
+            aapl_id_default, lapl_id_default, attr_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_BY_NAME_C'::h5aopen_by_name_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id  
+         CHARACTER(LEN=*), INTENT(IN) :: obj_name
+         INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
+         CHARACTER(LEN=*), INTENT(IN) :: attr_name
+         INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
+         INTEGER(HID_T) :: aapl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(HID_T), INTENT(OUT) :: attr_id
+       END FUNCTION h5aopen_by_name_c
+    END INTERFACE
+
+    attr_namelen = LEN(attr_name)
+    obj_namelen = LEN(obj_name)
+
+    aapl_id_default = H5P_DEFAULT_F
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5aopen_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
+         aapl_id_default, lapl_id_default, attr_id)
+
+  END SUBROUTINE h5aopen_by_name_f
+
+!----------------------------------------------------------------------
+! Name:		h5arename_f 
+!
+! Purpose: 	Renames an attribute
+!
+! Inputs:  
+!		loc_id        - Location or object identifier; may be dataset or group
+!               old_attr_name - Prior attribute name
+!               new_attr_name - New attribute name
+!
+! Outputs:
+!		hdferr:	      - error code		
+!				 	Success:  0
+!				 	Failure: -1   			
+!
+! Programmer:	M.S. Breitenfeld
+!		January, 2008	
+!
+! Modifications: N/A
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5arename_f(loc_id, old_attr_name, new_attr_name, hdferr) 
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5arename_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier
+    CHARACTER(LEN=*), INTENT(IN) :: old_attr_name ! Prior attribute name
+    CHARACTER(LEN=*), INTENT(IN) :: new_attr_name ! New attribute name
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+                                         ! 0 on success and -1 on failure
+    INTEGER(SIZE_T) :: old_attr_namelen
+    INTEGER(SIZE_T) :: new_attr_namelen
+    
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5arename_c(loc_id, &
+            old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ARENAME_C'::h5arename_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: old_attr_name, new_attr_name
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: old_attr_name
+         INTEGER(SIZE_T) :: old_attr_namelen
+         CHARACTER(LEN=*), INTENT(IN) :: new_attr_name
+         INTEGER(SIZE_T) :: new_attr_namelen
+         
+       END FUNCTION h5arename_c
+    END INTERFACE
+
+    old_attr_namelen = LEN(old_attr_name)
+    new_attr_namelen = LEN(new_attr_name)
+    
+    hdferr = h5arename_c(loc_id, &
+         old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen)
+    
+  END SUBROUTINE h5arename_f
+
+END MODULE H5A
 
-            hdferr = h5aclose_c(attr_id)
-          END SUBROUTINE h5aclose_f
 
-   END MODULE H5A
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index 929a056..49f8266 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -30,10 +30,13 @@
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
  *              Wednesday, August 4, 1999
- * Modifications:
+ * Modifications: 
+ *               - Added optional parameters introduced in version 1.8
+ *                 February, 2008
  *---------------------------------------------------------------------------*/
 int_f
-nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *crt_prp,  hid_t_f *dset_id)
+nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id, 
+	      hid_t_f *lcpl_id, hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id)
 {
      char *c_name = NULL;
      hid_t c_dset_id;
@@ -48,7 +51,8 @@ nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_
      /*
       * Call H5Dcreate2 function.
       */
-     if((c_dset_id = H5Dcreate2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*space_id, H5P_DEFAULT, (hid_t)*crt_prp, H5P_DEFAULT)) < 0)
+     if((c_dset_id = H5Dcreate2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*space_id, 
+				(hid_t)*lcpl_id, (hid_t)*dcpl_id, (hid_t)*dapl_id)) < 0)
          goto DONE;
      *dset_id = (hid_t_f)c_dset_id;
 
@@ -66,14 +70,15 @@ DONE:
  * Inputs:      loc_id - file or group identifier
  *              name - name of the dataset
  *              namelen - name length
+ *              dapl_id	- Dataset access property list
  * Outputs:     dset_id - dataset identifier
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
  *              Wednesday, August 4, 1999
- * Modifications:
+ * Modifications: Added 1.8 parameter: dapl_id
  *---------------------------------------------------------------------------*/
 int_f
-nh5dopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dset_id)
+nh5dopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dapl_id, hid_t_f *dset_id)
 {
      char *c_name = NULL;
      hid_t c_dset_id;
@@ -88,7 +93,7 @@ nh5dopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dset_id)
      /*
       * Call H5Dopen2 function.
       */
-     if((c_dset_id = H5Dopen2((hid_t)*loc_id, c_name, H5P_DEFAULT)) < 0)
+     if((c_dset_id = H5Dopen2((hid_t)*loc_id, c_name, (hid_t)*dapl_id)) < 0)
          goto DONE;
 
      *dset_id = (hid_t_f)c_dset_id;
@@ -1257,18 +1262,21 @@ nh5dget_create_plist_c ( hid_t_f *dset_id , hid_t_f *plist_id)
 
 
 /*----------------------------------------------------------------------------
- * Name:        h5dextend_c
+ * Name:        h5dset_extent_c
  * Purpose:     Call H5Dset_extent to extend dataset with unlimited dimensions
  * Inputs:      dset_id - identifier of the dataset
  * Outputs:     dims - array with the dimension sizes
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
  *              Thursday, August 19, 1999
- * Modifications:
+ *
+ * Modifications: Changed name from the now obsolete h5dextend
+ *                to h5dset_extent in order to match new fortran interface.
+ *                -MSB- March 14, 2008
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5dextend_c ( hid_t_f *dset_id , hsize_t_f *dims)
+nh5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims)
 {
   hid_t c_space_id;
   hsize_t c_dims[H5S_MAX_RANK];
@@ -1946,4 +1954,39 @@ nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag)
      ret_value = 0;
      return ret_value;
 }
+/*----------------------------------------------------------------------------
+ * Name:        h5dcreate_anon_c
+ * Purpose:     Call H5Dcreate_anon
+ * Inputs:
+ *		loc_id	   - Identifier of the file or group within which to create the dataset.
+ *		type_id	   - Identifier of the datatype to use when creating the dataset.
+ *		space_id   - Identifier of the dataspace to use when creating the dataset.
+ *              dcpl_id    - Dataset creation property list identifier.
+ *              dapl_id    - Dataset access property list identifier.    
+ * Outputs:     
+ *              dset_id - dataset identifier
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February, 2008
+ *---------------------------------------------------------------------------*/
+int_f
+nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id, 
+		   hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id)
+{
+  int ret_value = -1;
+  
+  /*
+   * Call H5Dcreate2 function.
+   */
+  if((*dset_id = (hid_t_f)H5Dcreate_anon((hid_t)*loc_id, (hid_t)*type_id, (hid_t)*space_id, 
+					 (hid_t)*dcpl_id, (hid_t)*dapl_id)) < 0)
+    goto DONE;
+  
+  ret_value = 0;
+
+ DONE:
+  return ret_value;
+}
+
 
diff --git a/fortran/src/H5Dff.f90 b/fortran/src/H5Dff.f90
index 34bcdf4..a94339f 100644
--- a/fortran/src/H5Dff.f90
+++ b/fortran/src/H5Dff.f90
@@ -16,111 +16,115 @@
 !
 ! This file contains Fortran90 interfaces for H5D functions.
 ! 
-      MODULE H5D
-        USE H5GLOBAL
-
-          INTERFACE h5dwrite_f
-
-            MODULE PROCEDURE h5dwrite_reference_obj
-            MODULE PROCEDURE h5dwrite_reference_dsetreg
-            MODULE PROCEDURE h5dwrite_integer_scalar
-            MODULE PROCEDURE h5dwrite_integer_1 
-            MODULE PROCEDURE h5dwrite_integer_2 
-            MODULE PROCEDURE h5dwrite_integer_3 
-            MODULE PROCEDURE h5dwrite_integer_4 
-            MODULE PROCEDURE h5dwrite_integer_5 
-            MODULE PROCEDURE h5dwrite_integer_6 
-            MODULE PROCEDURE h5dwrite_integer_7 
-            MODULE PROCEDURE h5dwrite_char_scalar
-            MODULE PROCEDURE h5dwrite_char_1 
-            MODULE PROCEDURE h5dwrite_char_2 
-            MODULE PROCEDURE h5dwrite_char_3 
-            MODULE PROCEDURE h5dwrite_char_4 
-            MODULE PROCEDURE h5dwrite_char_5 
-            MODULE PROCEDURE h5dwrite_char_6 
-            MODULE PROCEDURE h5dwrite_char_7 
-            MODULE PROCEDURE h5dwrite_real_scalar
-            MODULE PROCEDURE h5dwrite_real_1
-            MODULE PROCEDURE h5dwrite_real_2
-            MODULE PROCEDURE h5dwrite_real_3
-            MODULE PROCEDURE h5dwrite_real_4
-            MODULE PROCEDURE h5dwrite_real_5
-            MODULE PROCEDURE h5dwrite_real_6
-            MODULE PROCEDURE h5dwrite_real_7
-! Comment if on Crays
-            MODULE PROCEDURE h5dwrite_double_scalar
-            MODULE PROCEDURE h5dwrite_double_1
-            MODULE PROCEDURE h5dwrite_double_2
-            MODULE PROCEDURE h5dwrite_double_3
-            MODULE PROCEDURE h5dwrite_double_4
-            MODULE PROCEDURE h5dwrite_double_5
-            MODULE PROCEDURE h5dwrite_double_6
-            MODULE PROCEDURE h5dwrite_double_7
-! End comment if on Crays
-          END INTERFACE 
-          
-          INTERFACE h5dread_f
-
-            MODULE PROCEDURE h5dread_reference_obj
-            MODULE PROCEDURE h5dread_reference_dsetreg
-            MODULE PROCEDURE h5dread_integer_scalar
-            MODULE PROCEDURE h5dread_integer_1 
-            MODULE PROCEDURE h5dread_integer_2 
-            MODULE PROCEDURE h5dread_integer_3 
-            MODULE PROCEDURE h5dread_integer_4 
-            MODULE PROCEDURE h5dread_integer_5 
-            MODULE PROCEDURE h5dread_integer_6 
-            MODULE PROCEDURE h5dread_integer_7 
-            MODULE PROCEDURE h5dread_char_scalar
-            MODULE PROCEDURE h5dread_char_1 
-            MODULE PROCEDURE h5dread_char_2 
-            MODULE PROCEDURE h5dread_char_3 
-            MODULE PROCEDURE h5dread_char_4 
-            MODULE PROCEDURE h5dread_char_5 
-            MODULE PROCEDURE h5dread_char_6 
-            MODULE PROCEDURE h5dread_char_7 
-            MODULE PROCEDURE h5dread_real_scalar
-            MODULE PROCEDURE h5dread_real_1
-            MODULE PROCEDURE h5dread_real_2
-            MODULE PROCEDURE h5dread_real_3
-            MODULE PROCEDURE h5dread_real_4
-            MODULE PROCEDURE h5dread_real_5
-            MODULE PROCEDURE h5dread_real_6
-            MODULE PROCEDURE h5dread_real_7
-! Comment if on Crays
-            MODULE PROCEDURE h5dread_double_scalar
-            MODULE PROCEDURE h5dread_double_1
-            MODULE PROCEDURE h5dread_double_2
-            MODULE PROCEDURE h5dread_double_3
-            MODULE PROCEDURE h5dread_double_4
-            MODULE PROCEDURE h5dread_double_5
-            MODULE PROCEDURE h5dread_double_6
-            MODULE PROCEDURE h5dread_double_7
-! End comment if on Crays
-
-          END INTERFACE 
-
-          INTERFACE h5dwrite_vl_f
-            MODULE PROCEDURE h5dwrite_vl_integer
-            MODULE PROCEDURE h5dwrite_vl_real
-            MODULE PROCEDURE h5dwrite_vl_string
-          END INTERFACE
-
-          INTERFACE h5dread_vl_f
-            MODULE PROCEDURE h5dread_vl_integer
-            MODULE PROCEDURE h5dread_vl_real
-            MODULE PROCEDURE h5dread_vl_string
-          END INTERFACE
-
-          INTERFACE h5dfill_f
-            MODULE PROCEDURE h5dfill_integer
-            MODULE PROCEDURE h5dfill_real
-            MODULE PROCEDURE h5dfill_double
-            MODULE PROCEDURE h5dfill_char
-          END INTERFACE
-
-
-        CONTAINS
+MODULE H5D
+  USE H5GLOBAL
+
+  INTERFACE h5dwrite_f
+
+     MODULE PROCEDURE h5dwrite_reference_obj
+     MODULE PROCEDURE h5dwrite_reference_dsetreg
+     MODULE PROCEDURE h5dwrite_integer_scalar
+     MODULE PROCEDURE h5dwrite_integer_1 
+     MODULE PROCEDURE h5dwrite_integer_2 
+     MODULE PROCEDURE h5dwrite_integer_3 
+     MODULE PROCEDURE h5dwrite_integer_4 
+     MODULE PROCEDURE h5dwrite_integer_5 
+     MODULE PROCEDURE h5dwrite_integer_6 
+     MODULE PROCEDURE h5dwrite_integer_7 
+     MODULE PROCEDURE h5dwrite_char_scalar
+     MODULE PROCEDURE h5dwrite_char_1 
+     MODULE PROCEDURE h5dwrite_char_2 
+     MODULE PROCEDURE h5dwrite_char_3 
+     MODULE PROCEDURE h5dwrite_char_4 
+     MODULE PROCEDURE h5dwrite_char_5 
+     MODULE PROCEDURE h5dwrite_char_6 
+     MODULE PROCEDURE h5dwrite_char_7 
+     MODULE PROCEDURE h5dwrite_real_scalar
+     MODULE PROCEDURE h5dwrite_real_1
+     MODULE PROCEDURE h5dwrite_real_2
+     MODULE PROCEDURE h5dwrite_real_3
+     MODULE PROCEDURE h5dwrite_real_4
+     MODULE PROCEDURE h5dwrite_real_5
+     MODULE PROCEDURE h5dwrite_real_6
+     MODULE PROCEDURE h5dwrite_real_7
+     ! Comment if on Crays
+     MODULE PROCEDURE h5dwrite_double_scalar
+     MODULE PROCEDURE h5dwrite_double_1
+     MODULE PROCEDURE h5dwrite_double_2
+     MODULE PROCEDURE h5dwrite_double_3
+     MODULE PROCEDURE h5dwrite_double_4
+     MODULE PROCEDURE h5dwrite_double_5
+     MODULE PROCEDURE h5dwrite_double_6
+     MODULE PROCEDURE h5dwrite_double_7
+     ! End comment if on Crays
+  END INTERFACE
+
+  INTERFACE h5dread_f
+
+     MODULE PROCEDURE h5dread_reference_obj
+     MODULE PROCEDURE h5dread_reference_dsetreg
+     MODULE PROCEDURE h5dread_integer_scalar
+     MODULE PROCEDURE h5dread_integer_1 
+     MODULE PROCEDURE h5dread_integer_2 
+     MODULE PROCEDURE h5dread_integer_3 
+     MODULE PROCEDURE h5dread_integer_4 
+     MODULE PROCEDURE h5dread_integer_5 
+     MODULE PROCEDURE h5dread_integer_6 
+     MODULE PROCEDURE h5dread_integer_7 
+     MODULE PROCEDURE h5dread_char_scalar
+     MODULE PROCEDURE h5dread_char_1 
+     MODULE PROCEDURE h5dread_char_2 
+     MODULE PROCEDURE h5dread_char_3 
+     MODULE PROCEDURE h5dread_char_4 
+     MODULE PROCEDURE h5dread_char_5 
+     MODULE PROCEDURE h5dread_char_6 
+     MODULE PROCEDURE h5dread_char_7 
+     MODULE PROCEDURE h5dread_real_scalar
+     MODULE PROCEDURE h5dread_real_1
+     MODULE PROCEDURE h5dread_real_2
+     MODULE PROCEDURE h5dread_real_3
+     MODULE PROCEDURE h5dread_real_4
+     MODULE PROCEDURE h5dread_real_5
+     MODULE PROCEDURE h5dread_real_6
+     MODULE PROCEDURE h5dread_real_7
+     ! Comment if on Crays
+     MODULE PROCEDURE h5dread_double_scalar
+     MODULE PROCEDURE h5dread_double_1
+     MODULE PROCEDURE h5dread_double_2
+     MODULE PROCEDURE h5dread_double_3
+     MODULE PROCEDURE h5dread_double_4
+     MODULE PROCEDURE h5dread_double_5
+     MODULE PROCEDURE h5dread_double_6
+     MODULE PROCEDURE h5dread_double_7
+     ! End comment if on Crays
+
+  END INTERFACE
+
+  INTERFACE h5dwrite_vl_f
+     MODULE PROCEDURE h5dwrite_vl_integer
+     MODULE PROCEDURE h5dwrite_vl_real
+     MODULE PROCEDURE h5dwrite_vl_string
+  END INTERFACE
+
+  INTERFACE h5dread_vl_f
+     MODULE PROCEDURE h5dread_vl_integer
+     MODULE PROCEDURE h5dread_vl_real
+     MODULE PROCEDURE h5dread_vl_string
+  END INTERFACE
+
+  INTERFACE h5dfill_f
+     MODULE PROCEDURE h5dfill_integer
+     MODULE PROCEDURE h5dfill_real
+     MODULE PROCEDURE h5dfill_double
+     MODULE PROCEDURE h5dfill_char
+  END INTERFACE
+
+  INTERFACE h5dextend_f
+     MODULE PROCEDURE h5dset_extent_f
+  END INTERFACE
+
+
+CONTAINS
           
 !----------------------------------------------------------------------
 ! Name:		h5dcreate_f 
@@ -138,64 +142,86 @@
 !				 	Success:  0
 !				 	Failure: -1   
 ! Optional parameters:
-!		createion_prp	- dataset creation property list identifier
+!            creation_prp - Dataset creation property list
+!            lcpl_id      - Link creation property list
+!            dapl_id      - Dataset access property list
 !
 ! Programmer:	Elena Pourmal
 !		August 12, 1999	
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
-!			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+! Modifications: 	
+!                 - Explicit Fortran interfaces were added for 
+!	           called C functions (it is needed for Windows
+!		   port).  February 28, 2001 
+!
+!                 - Added version's 1.8 new optional parameters
+!                  February, 2008
 !
 ! Comment:		
 !----------------------------------------------------------------------
   
-          SUBROUTINE h5dcreate_f(loc_id, name, type_id, space_id, dset_id, & 
-                                 hdferr, creation_prp)
+  SUBROUTINE h5dcreate_f(loc_id, name, type_id, space_id, dset_id, & 
+       hdferr, dcpl_id, lcpl_id, dapl_id)
+ 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5dcreate_f
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the dataset 
-            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier 
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
-            INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: creation_prp 
-                                                   ! Dataset creation propertly
-                                                   ! list identifier
-            INTEGER(HID_T) :: creation_prp_default
-            INTEGER :: namelen                     ! Name length
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
+    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the dataset 
+    INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier 
+    INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
+    INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier 
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code
+
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dcpl_id ! Dataset creation property list
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dapl_id ! Dataset access property list
+
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: dcpl_id_default
+    INTEGER(HID_T) :: dapl_id_default
+
+    INTEGER :: namelen                     ! Name length
 
-!            INTEGER, EXTERNAL :: h5dcreate_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5dcreate_c(loc_id, name, namelen, type_id, &
-                                           space_id, creation_prp_default, dset_id)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DCREATE_C'::h5dcreate_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: loc_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER :: namelen
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HID_T) :: creation_prp_default
-              INTEGER(HID_T), INTENT(OUT) :: dset_id
-              END FUNCTION h5dcreate_c
-            END INTERFACE
-
-            creation_prp_default = H5P_DEFAULT_F
-            if (present(creation_prp)) creation_prp_default = creation_prp 
-            namelen = LEN(name)
-            hdferr = h5dcreate_c(loc_id, name, namelen, type_id, space_id, & 
-                                 creation_prp_default, dset_id) 
-          END SUBROUTINE h5dcreate_f
+    INTERFACE
+       INTEGER FUNCTION h5dcreate_c(loc_id, name, namelen, type_id, &
+            space_id, lcpl_id_default, dcpl_id_default, dapl_id_default, dset_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DCREATE_C'::h5dcreate_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T), INTENT(IN) :: space_id
+
+         INTEGER(HID_T) :: lcpl_id_default 
+         INTEGER(HID_T) :: dcpl_id_default
+         INTEGER(HID_T) :: dapl_id_default
+
+         INTEGER(HID_T), INTENT(OUT) :: dset_id
+       END FUNCTION h5dcreate_c
+    END INTERFACE
+    
+    lcpl_id_default = H5P_DEFAULT_F
+    dcpl_id_default = H5P_DEFAULT_F
+    dapl_id_default = H5P_DEFAULT_F
+
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    IF(PRESENT(dcpl_id)) dcpl_id_default = dcpl_id
+    IF(PRESENT(dapl_id)) dapl_id_default = dapl_id
+
+    namelen = LEN(name)
+    hdferr = h5dcreate_c(loc_id, name, namelen, type_id, space_id, & 
+         lcpl_id_default, dcpl_id_default, dapl_id_default, dset_id)
+ 
+  END SUBROUTINE h5dcreate_f
           
 !----------------------------------------------------------------------
 ! Name:		h5dopen_f 
@@ -211,19 +237,22 @@
 !				 	Success:  0
 !				 	Failure: -1   
 ! Optional parameters:
-!				NONE			
+!	       dapl_id	        - Dataset access property list		
 !
 ! Programmer:	Elena Pourmal
 !		August 12, 1999	
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
-!			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+! Modifications:  -Explicit Fortran interfaces were added for 
+!		   called C functions (it is needed for Windows
+!		   port).  February 28, 2001 
+!
+!                 -Added 1.8 (optional) parameter dapl_id
+!                  February, 2008, M.S. Breitenfeld
 !
 ! Comment:		
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5dopen_f(loc_id, name, dset_id, hdferr)
+          SUBROUTINE h5dopen_f(loc_id, name, dset_id, hdferr, dapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5dopen_f
@@ -231,15 +260,18 @@
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
             CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the dataset 
-            INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier 
+            INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier
             INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dapl_id ! Dataset access property list
             INTEGER :: namelen                     ! Name length
 
+            INTEGER(HID_T) :: dapl_id_default
+
 !            INTEGER, EXTERNAL :: h5dopen_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5dopen_c(loc_id, name, namelen, dset_id)
+              INTEGER FUNCTION h5dopen_c(loc_id, name, namelen, dapl_id_default, dset_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DOPEN_C'::h5dopen_c
@@ -248,12 +280,16 @@
               INTEGER(HID_T), INTENT(IN) :: loc_id
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER :: namelen
+              INTEGER(HID_T), INTENT(IN) :: dapl_id_default
               INTEGER(HID_T), INTENT(OUT) :: dset_id
               END FUNCTION h5dopen_c
             END INTERFACE
 
+            dapl_id_default = H5P_DEFAULT_F
+            IF(PRESENT(dapl_id)) dapl_id_default = dapl_id
+
             namelen = LEN(name)
-            hdferr = h5dopen_c(loc_id, name, namelen, dset_id) 
+            hdferr = h5dopen_c(loc_id, name, namelen, dapl_id_default, dset_id) 
 
           END SUBROUTINE h5dopen_f
           
@@ -332,7 +368,7 @@
             INTEGER(HID_T)  :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
             INTEGER(HADDR_T), ALLOCATABLE, DIMENSION(:) :: ref_buf
-            INTEGER :: i,j
+            INTEGER :: j
 
 !            INTEGER, EXTERNAL :: h5dwrite_ref_obj_c
 ! MS FORTRAN needs explicit interface for C functions called here.
@@ -2499,7 +2535,7 @@
             INTEGER(HID_T)  :: mem_space_id_default 
             INTEGER(HID_T) :: file_space_id_default 
             INTEGER(HADDR_T), ALLOCATABLE, DIMENSION(:) :: ref_buf
-            INTEGER :: i,j  
+            INTEGER :: j  
 
 !            INTEGER, EXTERNAL :: h5dread_ref_obj_c
 ! MS FORTRAN needs explicit interface for C functions called here.
@@ -4705,7 +4741,7 @@
           END SUBROUTINE h5dget_type_f  
 
 !----------------------------------------------------------------------
-! Name:		h5dextend_f 
+! Name:		h5dset_extent (instead of obsolete name: h5dextend_f) 
 !
 ! Purpose:	Extends a dataset with unlimited dimension.	
 !
@@ -4727,14 +4763,18 @@
 !			called C functions (it is needed for Windows
 !			port).  February 28, 2001 
 !
+!                       Changed name from the now obsolete h5dextend_f
+!                       to h5dset_extent_f. Provided interface to old name
+!                       for backward compatability. -MSB- March 14, 2008
+!
 ! Comment:		
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5dextend_f(dataset_id, size, hdferr) 
+          SUBROUTINE H5Dset_extent_f(dataset_id, size, hdferr) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dextend_f
+!DEC$attributes dllexport :: H5Dset_extent_f
 !DEC$endif
             IMPLICIT NONE 
             INTEGER(HID_T), INTENT(IN) :: dataset_id      ! Dataset identifier
@@ -4743,22 +4783,22 @@
                                                           ! dimensions' sizes 
             INTEGER, INTENT(OUT) :: hdferr                ! Error code 
 
-!            INTEGER, EXTERNAL ::  h5dextend_c
+!            INTEGER, EXTERNAL ::  H5Dset_extent_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5dextend_c(dataset_id, size)
+              INTEGER FUNCTION H5Dset_extent_c(dataset_id, size)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DEXTEND_C'::h5dextend_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DSET_EXTENT_C'::H5Dset_extent_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: dataset_id
               INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN)  :: size
-              END FUNCTION h5dextend_c
+              END FUNCTION H5Dset_extent_c
             END INTERFACE
 
-            hdferr = h5dextend_c(dataset_id, size)
-          END SUBROUTINE h5dextend_f  
+            hdferr = H5Dset_extent_c(dataset_id, size)
+          END SUBROUTINE H5Dset_extent_f  
 
 
 !----------------------------------------------------------------------
@@ -5215,7 +5255,6 @@
             INTEGER(HID_T)  :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default 
 !            CHARACTER, DIMENSION(dims(1)*dims(2)) :: tmp_buf
-            integer i, j
 
             INTERFACE
               INTEGER FUNCTION h5dwrite_vl_string_c(dset_id, mem_type_id, &
@@ -5646,4 +5685,79 @@
             hdferr = h5dget_space_status_c(dset_id, flag)
           END SUBROUTINE h5dget_space_status_f
 
-      END MODULE H5D
+!----------------------------------------------------------------------
+! Name:		h5dcreate_anon_f 
+!
+! Purpose: 	Creates a dataset in a file without linking it into the file structure 
+!
+! Inputs:  
+!		loc_id		- Identifier of the file or group within which to create the dataset.
+!		type_id		- Identifier of the datatype to use when creating the dataset.
+!		space_id	- Identifier of the dataspace to use when creating the dataset.
+! Outputs:  
+!		dset_id		- dataset identifier
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!               dcpl_id         - Dataset creation property list identifier.
+!               dapl_id  	- Dataset access property list identifier.
+!
+! Programmer:   M.S. Breitenfeld
+!		February 11, 2008
+!
+! Modifications:
+!
+! Comment:		
+!----------------------------------------------------------------------
+  
+  SUBROUTINE h5dcreate_anon_f(loc_id, type_id, space_id, dset_id, hdferr, dcpl_id, dapl_id)
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5dcreate_anon_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier. 
+    INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier. 
+    INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier.
+    INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier. 
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code.
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dcpl_id  ! Dataset creation property list identifier.
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dapl_id  ! Dataset access property list identifier.
+
+    INTEGER(HID_T) :: dcpl_id_default
+    INTEGER(HID_T) :: dapl_id_default
+
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5dcreate_anon_c(loc_id, type_id, space_id, dcpl_id_default, dapl_id_default, dset_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DCREATE_ANON_C'::h5dcreate_anon_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER(HID_T), INTENT(IN) :: loc_id 
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T), INTENT(IN) :: space_id
+         INTEGER(HID_T) :: dcpl_id_default
+         INTEGER(HID_T) :: dapl_id_default
+         INTEGER(HID_T), INTENT(OUT) :: dset_id
+       END FUNCTION h5dcreate_anon_c
+    END INTERFACE
+
+    dcpl_id_default = H5P_DEFAULT_F
+    dapl_id_default = H5P_DEFAULT_F
+
+    IF(PRESENT(dcpl_id)) dcpl_id_default = dcpl_id
+    IF(PRESENT(dapl_id)) dapl_id_default = dapl_id
+    
+    hdferr = h5dcreate_anon_c(loc_id, type_id, space_id, dcpl_id_default, dapl_id_default, dset_id)
+
+  END SUBROUTINE h5dcreate_anon_f
+
+END MODULE H5D
+
+
diff --git a/fortran/src/H5Ff.c b/fortran/src/H5Ff.c
index 575d92b..2190d05 100644
--- a/fortran/src/H5Ff.c
+++ b/fortran/src/H5Ff.c
@@ -508,7 +508,7 @@ nh5fget_name_c(hid_t_f *obj_id, size_t_f *size, _fcd buf, size_t_f *buflen)
          HGOTO_DONE(FAIL);
 
      /*
-      * Call H5Aget_name function
+      * Call H5Fget_name function
       */
      if ((size_c = (size_t_f)H5Fget_name((hid_t)*obj_id, c_buf, (size_t)*buflen)) < 0)
          HGOTO_DONE(FAIL);
diff --git a/fortran/src/H5Fff.f90 b/fortran/src/H5Fff.f90
index 3926656..6cf6c05 100644
--- a/fortran/src/H5Fff.f90
+++ b/fortran/src/H5Fff.f90
@@ -58,14 +58,14 @@
 !DEC$endif
 !
            
-            IMPLICIT NONE
+            IMPLICIT NONE 
             CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the file
             INTEGER, INTENT(IN) :: access_flags    ! File access flags
             INTEGER(HID_T), INTENT(OUT) :: file_id ! File identifier 
             INTEGER, INTENT(OUT) :: hdferr         ! Error code 
             INTEGER(HID_T), OPTIONAL, INTENT(IN) :: creation_prp 
                                                    ! File creation propertly
-                                                   ! list identifier
+                                                   ! list identifier 
             INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
                                                    ! File access property list
                                                    ! identifier
diff --git a/fortran/src/H5Gf.c b/fortran/src/H5Gf.c
index 0316c03..f2a4187 100644
--- a/fortran/src/H5Gf.c
+++ b/fortran/src/H5Gf.c
@@ -16,6 +16,7 @@
 /* This files contains C stubs for H5G Fortran APIs */
 
 #include "H5f90.h"
+#include "H5Eprivate.h"
 
 /*----------------------------------------------------------------------------
  * Name:        h5gcreate_c
@@ -35,9 +36,9 @@
  *---------------------------------------------------------------------------*/
 int_f
 nh5gcreate_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint,
-    hid_t_f *grp_id)
+	     hid_t_f *grp_id, hid_t_f *lcpl_id, hid_t_f *gcpl_id, hid_t_f *gapl_id )
 {
-    hid_t gcpl_id = -1;          /* Group creation property list */
+    hid_t c_gcpl_id = -1;          /* Group creation property list */
     char *c_name = NULL;
     hid_t c_grp_id;
     int_f ret_value = -1;
@@ -51,19 +52,19 @@ nh5gcreate_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint,
     /*
      * Call H5Gcreate function.
      */
-    if(*size_hint == OBJECT_NAMELEN_DEFAULT_F )
-        c_grp_id = H5Gcreate2((hid_t)*loc_id, c_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if(*size_hint == OBJECT_NAMELEN_DEFAULT_F ){
+      c_grp_id = H5Gcreate2((hid_t)*loc_id, c_name,(hid_t)*lcpl_id,(hid_t)*gcpl_id,(hid_t)*gapl_id);}
     else {
-        /* Create the group creation property list */
-        if((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0)
-            goto DONE;
+      /* Create the group creation property list */
+      if((c_gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0)
+	goto DONE;
 
-        /* Set the local heap size hint */
-        if(H5Pset_local_heap_size_hint(gcpl_id, (size_t)*size_hint) < 0)
-            goto DONE;
+      /* Set the local heap size hint */
+      if(H5Pset_local_heap_size_hint(c_gcpl_id, (size_t)*size_hint) < 0)
+	goto DONE;
 
-        /* Create the group */
-        c_grp_id = H5Gcreate2((hid_t)*loc_id, c_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT);
+      /* Create the group */
+      c_grp_id = H5Gcreate2((hid_t)*loc_id, c_name, H5P_DEFAULT, c_gcpl_id, H5P_DEFAULT);
     }
     if(c_grp_id < 0)
         goto DONE;
@@ -73,8 +74,8 @@ nh5gcreate_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint,
     ret_value = 0;
 
 DONE:
-    if(gcpl_id > 0)
-        H5Pclose(gcpl_id);
+    if(c_gcpl_id > 0)
+        H5Pclose(c_gcpl_id);
     if(c_name)
         HDfree(c_name);
     return ret_value;
@@ -86,6 +87,7 @@ DONE:
  * Inputs:      loc_id - file or group identifier
  *              name - name of the group
  *              namelen - name length
+ *              gapl_id - Group access property list identifier 
  * Outputs:     grp_id - group identifier
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
@@ -93,7 +95,7 @@ DONE:
  * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5gopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *grp_id)
+nh5gopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *gapl_id, hid_t_f *grp_id)
 {
      char *c_name = NULL;
      hid_t c_grp_id;
@@ -108,7 +110,7 @@ nh5gopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *grp_id)
      /*
       * Call H5Gopen function.
       */
-    if((c_grp_id = H5Gopen2((hid_t)*loc_id, c_name, H5P_DEFAULT)) < 0)
+    if((c_grp_id = H5Gopen2((hid_t)*loc_id, c_name, (hid_t)*gapl_id)) < 0)
         goto DONE;
 
     /* Everything OK, set values to return */
@@ -659,3 +661,210 @@ DONE:
     return ret_value;
 }
 
+/*----------------------------------------------------------------------------
+ * Name:        h5gcreate_anon_c
+ * Purpose:     Call H5Gcreate_anon
+ * Inputs:      
+ *              loc_id  - Location identifier 
+ *              gcpl_id - Group creation property list identifier
+ *              gapl_id - Group access property list identifier
+ *
+ * Outputs:     grp_id - group identifier
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 15, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5gcreate_anon_c(hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *gapl_id, hid_t_f *grp_id)
+{
+
+  int_f ret_value=0;          /* Return value */
+  
+  if ((*grp_id = (hid_t_f)H5Gcreate_anon((hid_t)*loc_id,(hid_t)*gcpl_id,(hid_t)*gapl_id)) < 0)
+    HGOTO_DONE(FAIL);
+
+done:
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5gget_create_plist_c 
+ * Purpose:     Call H5Gget_create_plist
+ * Inputs:      
+ *              grp_id - group identifier
+ *
+ * Outputs:     gcpl_id - Group creation property list identifier
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 15, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5gget_create_plist_c(hid_t_f *grp_id, hid_t_f *gcpl_id )
+{
+  int_f ret_value=0; /* Return value */
+
+  if ((*gcpl_id = (hid_t_f)H5Gget_create_plist((hid_t)*grp_id)) < 0)
+    HGOTO_DONE(FAIL);
+
+done:
+    return ret_value;
+}
+
+
+/*----------------------------------------------------------------------------
+ * Name:      h5gget_info_c
+ * Purpose:   Call H5Gget_info
+ * Inputs:    group_id - Group identifier
+ * Outputs: 
+ *            storage_type - Type of storage for links in group:
+ *                             H5G_STORAGE_TYPE_COMPACT: Compact storage
+ *                             H5G_STORAGE_TYPE_DENSE: Indexed storage
+ *                             H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
+ *
+ *                  nlinks - Number of links in group
+ *              max_corder - Current maximum creation order value for group
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 15, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder)
+{
+
+    int_f ret_value = 0;          /* Return value */
+    H5G_info_t ginfo;
+
+     /*
+      * Call H5Gget_info function.
+      */
+    if(H5Gget_info((hid_t)*group_id,&ginfo) < 0)
+      HGOTO_DONE(FAIL);
+
+    /* Unpack the structure */
+
+    *storage_type = (int_f)ginfo.storage_type;
+    *nlinks = (int_f)ginfo.nlinks;
+    *max_corder = (int_f)ginfo.max_corder;
+
+done:
+    return ret_value;
+}
+
+
+/*----------------------------------------------------------------------------
+ * Name:      h5gget_info_by_idx_c
+ * Purpose:   Call H5Gget_info_by_idx
+ * Inputs:    
+ *          loc_id - File or group identifier
+ *      group_name - Name of group containing group for which information is to be retrieved
+ *   group_namelen - name length
+ *      index_type - Index type
+ *           order - Order of the count in the index
+ *               n - Position in the index of the group for which information is retrieved
+ *         lapl_id - Link access property list
+ * Outputs: 
+ *            storage_type - Type of storage for links in group:
+ *                             H5G_STORAGE_TYPE_COMPACT: Compact storage
+ *                             H5G_STORAGE_TYPE_DENSE: Indexed storage
+ *                             H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
+ *
+ *                  nlinks - Number of links in group
+ *              max_corder - Current maximum creation order value for group
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 18, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+		      hid_t_f *index_type, hid_t_f *order, hsize_t_f *n, hid_t_f *lapl_id, 
+		      int_f *storage_type, int_f *nlinks, int_f *max_corder)
+
+{
+  char *c_group_name = NULL;          /* Buffer to hold group name C string */
+  int_f ret_value = 0;          /* Return value */
+  H5G_info_t ginfo;
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Gget_info_by_idx function.
+   */
+  if(H5Gget_info_by_idx((hid_t)*loc_id,c_group_name, (H5_index_t)*index_type,(H5_iter_order_t)*order,(hsize_t)*n,
+			&ginfo, (hid_t)*lapl_id) < 0)
+    HGOTO_DONE(FAIL);
+
+  /* Unpack the structure */
+
+  *storage_type = (int_f)ginfo.storage_type;
+  *nlinks = (int_f)ginfo.nlinks;
+  *max_corder = (int_f)ginfo.max_corder;
+
+ done:
+  if(c_group_name)
+    HDfree(c_group_name);
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:      h5gget_info_by_name_c
+ * Purpose:   Call H5Gget_info_by_name
+ * Inputs:    
+ *          loc_id - File or group identifier
+ *      group_name - Name of group containing group for which information is to be retrieved
+ *   group_namelen - name length
+ *         lapl_id - Link access property list
+ * Outputs: 
+ *            storage_type - Type of storage for links in group:
+ *                             H5G_STORAGE_TYPE_COMPACT: Compact storage
+ *                             H5G_STORAGE_TYPE_DENSE: Indexed storage
+ *                             H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
+ *
+ *                  nlinks - Number of links in group
+ *              max_corder - Current maximum creation order value for group
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 18, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id, 
+		       int_f *storage_type, int_f *nlinks, int_f *max_corder)
+
+{
+  char *c_group_name = NULL;          /* Buffer to hold group name C string */
+  int_f ret_value = 0;          /* Return value */
+  H5G_info_t ginfo;
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Gget_info_by_name function.
+   */
+  if(H5Gget_info_by_name((hid_t)*loc_id, c_group_name, &ginfo, (hid_t)*lapl_id) < 0)
+    HGOTO_DONE(FAIL);
+
+  /* Unpack the structure */
+
+  *storage_type = (int_f)ginfo.storage_type;
+  *nlinks = (int_f)ginfo.nlinks;
+  *max_corder = (int_f)ginfo.max_corder;
+
+ done:
+  if(c_group_name)
+    HDfree(c_group_name);
+  return ret_value;
+}
+
diff --git a/fortran/src/H5Gff.f90 b/fortran/src/H5Gff.f90
index 5866539..6e4dd4f 100644
--- a/fortran/src/H5Gff.f90
+++ b/fortran/src/H5Gff.f90
@@ -16,10 +16,18 @@
 !
 ! This file contains Fortran90 interfaces for H5F functions.
 ! 
-      MODULE H5G
-      USE H5GLOBAL
- 
-        CONTAINS
+MODULE H5G
+  USE H5GLOBAL
+
+! PRIVATE :: h5gcreate1_f
+!  PRIVATE :: h5gcreate2_f
+
+!  INTERFACE h5gcreate_f
+!    MODULE PROCEDURE h5gcreate1_f
+!     MODULE PROCEDURE h5gcreate2_f
+!  END INTERFACE
+
+CONTAINS
           
 !----------------------------------------------------------------------
 ! Name:		h5gcreate_f 
@@ -35,9 +43,12 @@
 !				 	Success:  0
 !				 	Failure: -1   
 ! Optional parameters:
-!		size_hint	- a parameter indicating the number of bytes 
+!		      size_hint	- a parameter indicating the number of bytes 
 !				  to reserve for the names that will appear 
 !				  in the group
+!                       lcpl_id - Property list for link creation
+!                       gcpl_id - Property list for group creation
+!                       gapl_id - Property list for group access
 !
 ! Programmer:	Elena Pourmal
 !		August 12, 1999	
@@ -46,56 +57,170 @@
 !			called C functions (it is needed for Windows
 !			port).  March 5, 2001 
 !
+!                       Added additional optional paramaters in 1.8
+!                       MSB - February 27, 2008
+!
 ! Comment:		
 !----------------------------------------------------------------------
-          SUBROUTINE h5gcreate_f(loc_id, name, grp_id, hdferr, size_hint)
+  SUBROUTINE h5gcreate_f(loc_id, name, grp_id, hdferr, size_hint, lcpl_id, gcpl_id, gapl_id)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5gcreate_f
 !DEC$endif
-!
-           
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group 
-            INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
-            INTEGER(SIZE_T), OPTIONAL, INTENT(IN) :: size_hint 
-                                                   ! Parameter indicating
-                                                   ! the number of bytes
-                                                   ! to reserve for the
-                                                   ! names that will appear
-                                                   ! in the group  
-            INTEGER :: namelen ! Length of the name character string
-            INTEGER(SIZE_T) :: size_hint_default 
+!    
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
+    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group 
+    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier 
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+    INTEGER(SIZE_T), OPTIONAL, INTENT(IN) :: size_hint 
+                                           ! Parameter indicating
+                                           ! the number of bytes
+                                           ! to reserve for the
+                                           ! names that will appear
+                                           ! in the group. Set to OBJECT_NAMELEN_DEFAULT_F
+                                           ! if using any of the optional 
+                                           ! parameters lcpl_id, gcpl_id, and/or gapl_id when not
+                                           ! using keywords in specifying the optional parameters
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id  ! Property list for link creation
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gcpl_id  ! Property list for group creation
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id  ! Property list for group access
+
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: gcpl_id_default
+    INTEGER(HID_T) :: gapl_id_default
+
+    INTEGER :: namelen ! Length of the name character string
+    INTEGER(SIZE_T) :: size_hint_default 
 
-!            INTEGER, EXTERNAL :: h5gcreate_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5gcreate_c(loc_id, name, namelen, &
-                               size_hint_default, grp_id)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GCREATE_C'::h5gcreate_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: loc_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER :: namelen
-              INTEGER(SIZE_T) :: size_hint_default
-              INTEGER(HID_T), INTENT(OUT) :: grp_id
-              END FUNCTION h5gcreate_c
-            END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5gcreate_c(loc_id, name, namelen, &
+            size_hint_default, grp_id, lcpl_id_default, gcpl_id_default, gapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GCREATE_C'::h5gcreate_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(SIZE_T) :: size_hint_default
+         INTEGER(HID_T), INTENT(OUT) :: grp_id
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: gcpl_id_default
+         INTEGER(HID_T) :: gapl_id_default
+       END FUNCTION h5gcreate_c
+    END INTERFACE
 
-            size_hint_default = OBJECT_NAMELEN_DEFAULT_F 
-            if (present(size_hint)) size_hint_default = size_hint 
-            namelen = LEN(name)
-            hdferr = h5gcreate_c(loc_id, name, namelen, size_hint_default, &
-                                 grp_id)
+    size_hint_default = OBJECT_NAMELEN_DEFAULT_F 
+    IF (PRESENT(size_hint)) size_hint_default = size_hint
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    gcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(gcpl_id)) gcpl_id_default = gcpl_id
+    gapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
+
+    namelen = LEN(name)
+
+    hdferr = h5gcreate_c(loc_id, name, namelen, size_hint_default, grp_id, &
+         lcpl_id_default, gcpl_id_default, gapl_id_default)
+
+  END SUBROUTINE h5gcreate_f
+
+!!$!----------------------------------------------------------------------
+!!$! Name:		h5gcreate2_f 
+!!$!
+!!$! Purpose:	Creates a new group. 
+!!$!
+!!$! Inputs:  
+!!$!		loc_id		- location identifier
+!!$!		name		- group name at the specified location
+!!$! Outputs:  
+!!$!		grp_id		- group identifier
+!!$!		hdferr:		- error code		
+!!$!				 	Success:  0
+!!$!				 	Failure: -1   
+!!$! Optional parameters:
+!!$!
+!!$!    lcpl_id  - Property list for link creation
+!!$!    gcpl_id  - Property list for group creation
+!!$!    gapl_id  - Property list for group access
+!!$!
+!!$! Programmer:	M.S. BREITENFELD
+!!$!		February 27, 2008
+!!$!
+!!$! Modifications: 
+!!$!
+!!$! Comment: Needed to switch the first 2 arguments to avoid conflect
+!!$!          with h5gcreate1_f	
+!!$!----------------------------------------------------------------------
+!!$
+!!$  SUBROUTINE h5gcreate2_f(name, loc_id, grp_id, hdferr, & 
+!!$        lcpl_id, gcpl_id, gapl_id) 
+!!$!
+!!$!This definition is needed for Windows DLLs
+!!$!DEC$if defined(BUILD_HDF5_DLL)
+!!$!DEC$attributes dllexport :: h5gcreate_f
+!!$!DEC$endif
+!!$!
+!!$    IMPLICIT NONE 
+!!$    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group
+!!$    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+!!$    INTEGER, INTENT(OUT) :: hdferr         ! Error code
+!!$    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier 
+!!$
+!!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id  ! Property list for link creation
+!!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gcpl_id  ! Property list for group creation
+!!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id  ! Property list for group access
+!!$
+!!$    INTEGER(HID_T) :: lcpl_id_default
+!!$    INTEGER(HID_T) :: gcpl_id_default
+!!$    INTEGER(HID_T) :: gapl_id_default
+!!$
+!!$    INTEGER(SIZE_T) :: OBJECT_NAMELEN_DEFAULT ! Dummy argument to pass to c call
+!!$    INTEGER :: namelen ! Length of the name character string
+!!$
+!!$!  MS FORTRAN needs explicit interface for C functions called here.
+!!$!
+!!$    INTERFACE
+!!$       INTEGER FUNCTION h5gcreate_c(loc_id, name, namelen, &
+!!$            OBJECT_NAMELEN_DEFAULT, grp_id, lcpl_id_default, gcpl_id_default, gapl_id_default)
+!!$         USE H5GLOBAL
+!!$         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+!!$         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GCREATE_C'::h5gcreate_c
+!!$         !DEC$ ENDIF
+!!$         !DEC$ATTRIBUTES reference :: name
+!!$         INTEGER(HID_T), INTENT(IN) :: loc_id
+!!$         CHARACTER(LEN=*), INTENT(IN) :: name
+!!$         INTEGER :: namelen
+!!$         INTEGER(SIZE_T) :: OBJECT_NAMELEN_DEFAULT
+!!$         INTEGER(HID_T) :: lcpl_id_default
+!!$         INTEGER(HID_T) :: gcpl_id_default
+!!$         INTEGER(HID_T) :: gapl_id_default
+!!$         INTEGER(HID_T), INTENT(OUT) :: grp_id
+!!$       END FUNCTION h5gcreate_c
+!!$    END INTERFACE
+!!$
+!!$    namelen = LEN(name)
+!!$    OBJECT_NAMELEN_DEFAULT = OBJECT_NAMELEN_DEFAULT_F
+!!$
+!!$    lcpl_id_default = H5P_DEFAULT_F
+!!$    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+!!$    gcpl_id_default = H5P_DEFAULT_F
+!!$    IF(PRESENT(gcpl_id)) gcpl_id_default = gcpl_id
+!!$    gapl_id_default = H5P_DEFAULT_F
+!!$    IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
+!!$
+!!$
+!!$    hdferr = h5gcreate_c(loc_id, name, namelen, OBJECT_NAMELEN_DEFAULT, grp_id, &
+!!$         lcpl_id_default, gcpl_id_default, gapl_id_default)
+!!$
+!!$  END SUBROUTINE h5gcreate2_f
 
-          END SUBROUTINE h5gcreate_f
 
 !----------------------------------------------------------------------
 ! Name:		h5gopen_f 
@@ -111,54 +236,62 @@
 !				 	Success:  0
 !				 	Failure: -1   
 ! Optional parameters:
-!				NONE
+!               gapl_id         - Group access property list identifier
 !
 ! Programmer:	Elena Pourmal
 !		August 12, 1999	
 !
 ! Modifications: 	Explicit Fortran interfaces were added for 
 !			called C functions (it is needed for Windows
-!			port).  March 5, 2001 
+!			port).  March 5, 2001
+!                   
+!                       Added 1.8 (optional) parameter gapl_id
+!                       February, 2008 M.S. Breitenfeld
 !
 ! Comment:		
 !----------------------------------------------------------------------
-          SUBROUTINE h5gopen_f(loc_id, name, grp_id, hdferr)
+  SUBROUTINE h5gopen_f(loc_id, name, grp_id, hdferr, gapl_id)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5gopen_f
 !DEC$endif
 !
-           
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group 
-            INTEGER(HID_T), INTENT(OUT) :: grp_id  ! File identifier 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
-
-            INTEGER :: namelen ! Length of the name character string
-
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
+    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group 
+    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! File identifier 
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id  ! Group access property list identifier 
+    
+    INTEGER(HID_T) :: gapl_id_default
+    INTEGER :: namelen ! Length of the name character string
+    
 !            INTEGER, EXTERNAL :: h5gopen_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5gopen_c(loc_id, name, namelen, grp_id)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GOPEN_C'::h5gopen_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: loc_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER :: namelen
-              INTEGER(HID_T), INTENT(OUT) :: grp_id
-              END FUNCTION h5gopen_c
-            END INTERFACE
-  
-            namelen = LEN(name)
-            hdferr = h5gopen_c(loc_id, name, namelen, grp_id) 
+    INTERFACE
+       INTEGER FUNCTION h5gopen_c(loc_id, name, namelen, gapl_id_default, grp_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GOPEN_C'::h5gopen_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: name
+         INTEGER :: namelen 
+         INTEGER(HID_T), INTENT(IN) :: gapl_id_default
+         INTEGER(HID_T), INTENT(OUT) :: grp_id
+       END FUNCTION h5gopen_c
+    END INTERFACE
 
-          END SUBROUTINE h5gopen_f
+    gapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
+  
+    namelen = LEN(name)
+    hdferr = h5gopen_c(loc_id, name, namelen, gapl_id_default, grp_id) 
+    
+  END SUBROUTINE h5gopen_f
 
 !----------------------------------------------------------------------
 ! Name:		h5gclose_f 
@@ -929,7 +1062,362 @@
             
             namelen = LEN(name)
             hdferr = h5gget_comment_c(loc_id, name, namelen, size, buffer)
-          END SUBROUTINE h5gget_comment_f
+  END SUBROUTINE h5gget_comment_f
+
+!----------------------------------------------------------------------
+! Name:		H5Gcreate_anon_f
+!
+! Purpose:	Creates a new empty group without linking it into the file structure. 
+!
+! Inputs:  
+!		loc_id		- Location identifier
+! Outputs:  
+!		grp_id		- group identifier
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!               gcpl_id   	- Group creation property list identifier
+!               gapl_id         - Group access property list identifier
+!
+! Programmer:	M.S. Breitenfeld
+!		February 15, 2008	
+!
+! Modifications: 
+!
+! Comment:		
+!----------------------------------------------------------------------
+  SUBROUTINE h5Gcreate_anon_f(loc_id, grp_id, hdferr, gcpl_id, gapl_id)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5gcreate_anon_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier 
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gcpl_id  ! Property list for group creation
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id  ! Property list for group access
+
+    INTEGER(HID_T) :: gcpl_id_default
+    INTEGER(HID_T) :: gapl_id_default
+    
+    INTERFACE
+       INTEGER FUNCTION h5gcreate_anon_c(loc_id, gcpl_id_default, gapl_id_default, grp_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GCREATE_ANON_C'::h5gcreate_anon_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id_default  ! Property list for group creation
+         INTEGER(HID_T), INTENT(IN) :: gapl_id_default  ! Property list for group access
+         INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier
+       END FUNCTION h5gcreate_anon_c
+    END INTERFACE
+
+    gcpl_id_default = H5P_DEFAULT_F 
+    gapl_id_default = H5P_DEFAULT_F 
+
+    IF(PRESENT(gcpl_id)) gcpl_id_default = gcpl_id
+    IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
+    
+    hdferr = h5gcreate_anon_c(loc_id, gcpl_id_default, gapl_id_default, grp_id)
+    
+  END SUBROUTINE h5Gcreate_anon_f
+
+!----------------------------------------------------------------------
+! Name:		H5Gget_create_plist_f
+!
+! Purpose:	Gets a group creation property list identifier. 
+!
+! Inputs:  
+!		grp_id		- group identifier
+! Outputs:  
+!               gcpl_id   	- Group creation property list identifier
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!
+! Programmer:	M.S. Breitenfeld
+!		February 15, 2008	
+!
+! Modifications: 
+!
+! Comment:		
+!----------------------------------------------------------------------
+  SUBROUTINE h5gget_create_plist_f(grp_id, gcpl_id, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5gget_create_plist_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: grp_id  ! Group identifier
+    INTEGER(HID_T), INTENT(OUT) :: gcpl_id ! Property list for group creation
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code
+    
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5gget_create_plist_c(grp_id, gcpl_id )
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GGET_CREATE_PLIST_C'::h5gget_create_plist_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN)  :: grp_id
+         INTEGER(HID_T), INTENT(OUT) :: gcpl_id
+       END FUNCTION h5gget_create_plist_c
+    END INTERFACE
+    
+    hdferr = h5gget_create_plist_c(grp_id, gcpl_id )
+    
+  END SUBROUTINE h5gget_create_plist_f
+
+!----------------------------------------------------------------------
+! Name:		h5gget_info_f
+!
+! Purpose:  	Retrieves information about a group
+!		
+! Inputs:  
+!		group_id - Group identifier
+!
+! Outputs:  NOTE: In C it is defined as a structure: H5G_info_t
+!
+!      storage_type - Type of storage for links in group
+!                       H5G_STORAGE_TYPE_COMPACT: Compact storage
+!                       H5G_STORAGE_TYPE_DENSE: Indexed storage
+!                       H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
+!            nlinks - Number of links in group
+!     	 max_corder - Current maximum creation order value for group
+!            hdferr - error code		
+!		          Success:  0
+!		          Failure: -1   
+! Optional parameters:
+!				NONE			
+!
+! Programmer:	M. S. Breitenfeld
+!		February 15, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5gget_info_f(group_id, storage_type, nlinks, max_corder, hdferr) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5gget_info_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: group_id ! Group identifier
+ 
+    INTEGER, INTENT(OUT) :: storage_type ! Type of storage for links in group:
+                                          ! H5G_STORAGE_TYPE_COMPACT_F: Compact storage
+                                          ! H5G_STORAGE_TYPE_DENSE_F: Indexed storage
+                                          ! H5G_STORAGE_TYPE_SYMBOL_TABLE_F: Symbol tables, the original HDF5 structure
+    INTEGER, INTENT(OUT) :: nlinks ! Number of links in group
+    INTEGER, INTENT(OUT) :: max_corder ! Current maximum creation order value for group
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+                                         ! 0 on success and -1 on failure
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5gget_info_c(group_id, storage_type, nlinks, max_corder)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GGET_INFO_C'::h5gget_info_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: group_id
+         INTEGER, INTENT(OUT) :: storage_type
+         INTEGER, INTENT(OUT) :: nlinks
+         INTEGER, INTENT(OUT) :: max_corder
+       END FUNCTION h5gget_info_c
+    END INTERFACE
+
+    hdferr = h5gget_info_c(group_id, storage_type, nlinks, max_corder)
+    
+  END SUBROUTINE h5gget_info_f
+
+!----------------------------------------------------------------------
+! Name:		h5gget_info_by_idx_f
+!
+! Purpose:  	Retrieves information about a group, according to the group’s position within an index.
+!		
+! Inputs:
+!          loc_id - File or group identifier
+!      group_name - Name of group containing group for which information is to be retrieved
+!      index_type - Index type
+!           order - Order of the count in the index
+!               n - Position in the index of the group for which information is retrieved
+!
+! Outputs:  NOTE: In C the following are defined as a structure: H5G_info_t
+!
+!      storage_type - Type of storage for links in group
+!                       H5G_STORAGE_TYPE_COMPACT: Compact storage
+!                       H5G_STORAGE_TYPE_DENSE: Indexed storage
+!                       H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
+!            nlinks - Number of links in group
+!     	 max_corder - Current maximum creation order value for group
+!            hdferr - error code		
+!		          Success:  0
+!		          Failure: -1   
+! Optional parameters:
+!         lapl_id - Link access property list		
+!
+! Programmer:	M. S. Breitenfeld
+!		February 18, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5gget_info_by_idx_f(loc_id, group_name, index_type, order, n, &
+       storage_type, nlinks, max_corder, hdferr, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5gget_info_by_idx_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id     ! File or group identifier
+    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of group containing group for which information is to be retrieved
+    INTEGER(HID_T), INTENT(IN) :: index_type ! Index type
+    INTEGER(HID_T), INTENT(IN) :: order      ! Order of the count in the index
+    INTEGER(HSIZE_T), INTENT(IN) :: n          ! Position in the index of the group for which information is retrieved
+
+    INTEGER, INTENT(OUT) :: storage_type ! Type of storage for links in group:
+                                          ! H5G_STORAGE_TYPE_COMPACT_F: Compact storage
+                                          ! H5G_STORAGE_TYPE_DENSE_F: Indexed storage
+                                          ! H5G_STORAGE_TYPE_SYMBOL_TABLE_F: Symbol tables, the original HDF5 structure
+    INTEGER, INTENT(OUT) :: nlinks ! Number of links in group
+    INTEGER, INTENT(OUT) :: max_corder ! Current maximum creation order value for group
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+                                         ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list
+
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: group_name_len ! length of group name
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5gget_info_by_idx_c(loc_id, group_name, group_name_len, index_type, order, n, lapl_id_default, &
+            storage_type, nlinks, max_corder)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GGET_INFO_BY_IDX_C'::h5gget_info_by_idx_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: group_name
+         INTEGER(HID_T), INTENT(IN) :: index_type
+         INTEGER(HID_T), INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER, INTENT(OUT) :: storage_type
+         INTEGER, INTENT(OUT) :: nlinks 
+         INTEGER, INTENT(OUT) :: max_corder
+
+         INTEGER(SIZE_T) :: group_name_len
+
+       END FUNCTION h5gget_info_by_idx_c
+    END INTERFACE
+
+    group_name_len = LEN(group_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(present(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5gget_info_by_idx_c(loc_id, group_name, group_name_len, &
+         index_type, order, n, lapl_id_default, &
+         storage_type, nlinks, max_corder)
+    
+  END SUBROUTINE h5gget_info_by_idx_f
+  
+!----------------------------------------------------------------------
+! Name:		h5gget_info_by_name_f
+!
+! Purpose:  	Retrieves information about a group. 
+!		
+! Inputs:
+!          loc_id - File or group identifier
+!      group_name - Name of group containing group for which information is to be retrieved
+!
+! Outputs:  NOTE: In C the following are defined as a structure: H5G_info_t
+!
+!      storage_type - Type of storage for links in group
+!                       H5G_STORAGE_TYPE_COMPACT: Compact storage
+!                       H5G_STORAGE_TYPE_DENSE: Indexed storage
+!                       H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
+!            nlinks - Number of links in group
+!     	 max_corder - Current maximum creation order value for group
+!            hdferr - error code		
+!		          Success:  0
+!		          Failure: -1   
+! Optional parameters:
+!         lapl_id - Link access property list		
+!
+! Programmer:	M. S. Breitenfeld
+!		February 18, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5gget_info_by_name_f(loc_id, group_name, &
+       storage_type, nlinks, max_corder, hdferr, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5gget_info_by_name_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id     ! File or group identifier
+    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of group containing group for which information is to be retrieved
+
+    INTEGER, INTENT(OUT) :: storage_type ! Type of storage for links in group:
+                                          ! H5G_STORAGE_TYPE_COMPACT_F: Compact storage
+                                          ! H5G_STORAGE_TYPE_DENSE_F: Indexed storage
+                                          ! H5G_STORAGE_TYPE_SYMBOL_TABLE_F: Symbol tables, the original HDF5 structure
+    INTEGER, INTENT(OUT) :: nlinks ! Number of links in group
+    INTEGER, INTENT(OUT) :: max_corder ! Current maximum creation order value for group
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+                                         ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list
+
+    INTEGER(HID_T) :: lapl_id_default 
+    INTEGER(SIZE_T) :: group_name_len ! length of group name
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5gget_info_by_name_c(loc_id, group_name, group_name_len, lapl_id_default, &
+            storage_type, nlinks, max_corder)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GGET_INFO_BY_NAME_C'::h5gget_info_by_name_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: group_name
+         INTEGER(HID_T), INTENT(IN) :: lapl_id_default
+         INTEGER, INTENT(OUT) :: storage_type
+         INTEGER, INTENT(OUT) :: nlinks 
+         INTEGER, INTENT(OUT) :: max_corder
+
+         INTEGER(SIZE_T) :: group_name_len
+
+       END FUNCTION h5gget_info_by_name_c
+    END INTERFACE
+
+    group_name_len = LEN(group_name)
+    
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
 
+    hdferr = h5gget_info_by_name_c(loc_id, group_name, group_name_len, lapl_id_default, &
+         storage_type, nlinks, max_corder)
+    
+  END SUBROUTINE h5gget_info_by_name_f
 
-      END MODULE H5G
+END MODULE H5G
diff --git a/fortran/src/H5If.c b/fortran/src/H5If.c
index d948259..b4c7660 100644
--- a/fortran/src/H5If.c
+++ b/fortran/src/H5If.c
@@ -54,7 +54,11 @@ nh5iget_type_c (hid_t_f *obj_id, int_f *type)
  * Returns:     length of the name on success, -1 on failure
  * Programmer:  Elena Pourmal
  *              Wednesday, March 12, 2003
- * Modifications:
+ * Modifications: 
+ *               Changed the size of c_buf_size to c_buf_size + 1, which
+ *               fixes the problem of truncating the string by 1 if the 
+ *               exact size of the string (buf_size) is passed in.
+ *               M.S. Breitenfeld, April 21, 2008
  *---------------------------------------------------------------------------*/
 int_f
 nh5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_size)
@@ -68,8 +72,8 @@ nh5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_siz
      /*
       * Allocate buffer to hold name of an attribute
       */
-     c_buf_size = (size_t)*buf_size;
-     c_buf = (char *)HDmalloc(c_buf_size +1);
+     c_buf_size = (size_t)*buf_size +1;
+     c_buf = (char *)HDmalloc(c_buf_size);
      if (c_buf == NULL) return ret_value;
 
      /*
@@ -82,7 +86,7 @@ nh5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_siz
      /*
       * Convert C name to FORTRAN and place it in the given buffer
       */
-      HD5packFstring(c_buf, _fcdtocp(buf), c_buf_size);
+      HD5packFstring(c_buf, _fcdtocp(buf), c_buf_size-1);
       *name_size = (size_t_f)c_size;
       ret_value = 0;
 
diff --git a/fortran/src/H5Lf.c b/fortran/src/H5Lf.c
new file mode 100644
index 0000000..208ad19
--- /dev/null
+++ b/fortran/src/H5Lf.c
@@ -0,0 +1,817 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+ * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* This files contains C stubs for H5L Fortran APIs */
+
+#include "H5f90.h"
+#include "H5Eprivate.h"
+
+/*----------------------------------------------------------------------------
+ * Name:        h5lcopy_c
+ * Purpose:     Call H5Lcopy
+ * Inputs:
+ *     src_loc_id - Location identifier of the source link
+ *       src_name - Name of the link to be copied
+ *    src_namelen - length of the name 
+ *    dest_loc_id - Location identifier specifying the destination of the copy
+ *      dest_name - Name to be assigned to the NEW copy
+ *   dest_namelen - Length of the name 
+ *         loc_id - Identifier of the file or group containing the object
+ *           name - Name of the link to delete
+ *        lcpl_id - Link creation property list identifier
+ *        lapl_id - Link access property list identifier
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id, 
+	     _fcd dest_name, size_t_f *dest_namelen,
+	     hid_t_f *lcpl_id, hid_t_f *lapl_id)
+{
+  char *c_src_name = NULL;
+  char *c_dest_name = NULL;
+  int ret_value = 0;
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_src_name = HD5f2cstring(src_name, (size_t)*src_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+  if((c_dest_name = HD5f2cstring(dest_name, (size_t)*dest_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Lcopy function.
+   */
+  if( H5Lcopy( (hid_t)*src_loc_id, c_src_name, (hid_t) *dest_loc_id, 
+	       c_dest_name, (hid_t)*lcpl_id, (hid_t)*lapl_id ) < 0)
+    HGOTO_DONE(FAIL);
+
+done:
+  if(c_src_name)
+    HDfree(c_src_name);
+  if(c_dest_name)
+    HDfree(c_dest_name);
+  
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5lcreate_external_c
+ * Purpose:     Call H5Lcreate_external_c 
+ * Inputs:
+ *    file_name - Name of the file containing the target object. Neither the file nor the target object is 
+ *                required to exist. May be the file the link is being created in.
+ *     obj_name - Path within the target file to the target object.
+ *  link_loc_id - The file or group identifier for the new link.
+ *    link_name - The name of the new link.
+ *      lcpl_id - Link creation property list identifier.
+ *      lapl_id - Link access property list identifier.
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 29, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5lcreate_external_c(_fcd file_name, size_t_f *file_namelen, _fcd obj_name, size_t_f *obj_namelen,
+		      hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, 
+		      hid_t_f *lcpl_id, hid_t_f *lapl_id)
+
+{
+  char *c_file_name = NULL;
+  char *c_obj_name = NULL;
+  char *c_link_name = NULL;
+  int ret_value = 0;
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_file_name = HD5f2cstring(file_name, (size_t)*file_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+  if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+  if((c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Lcopy function.
+   */
+  if( H5Lcreate_external( c_file_name, c_obj_name, (hid_t) *link_loc_id, c_link_name,
+			  (hid_t) *lcpl_id, (hid_t) *lapl_id) < 0)
+    HGOTO_DONE(FAIL);
+
+done:
+  if(c_file_name)
+    HDfree(c_file_name);
+  if(c_obj_name)
+    HDfree(c_obj_name);
+  if(c_link_name)
+    HDfree(c_link_name);
+  
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5ldelete_c
+ * Purpose:     Call H5Ldelete
+ * Inputs:
+ *
+ *    loc_id  - Identifier of the file or group containing the object
+ *    name    - Name of the link to delete
+ *    lapl_id - Link access property list identifier
+ *    namelen - length of name
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5ldelete_c ( hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id )
+{
+  char *c_name = NULL;
+  int ret_value = 0;
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Ldelete function.
+   */
+  if( H5Ldelete( (hid_t)*loc_id, c_name, (hid_t)*lapl_id  ) < 0)
+    HGOTO_DONE(FAIL);
+
+done:
+    if(c_name)
+        HDfree(c_name);
+
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5lcreate_soft_c
+ * Purpose:     Call H5Lcreate_soft
+ * Inputs:
+ *
+ *       target_path - Path to the target object, which is not required to exist.
+ *       link_loc_id - The file or group identifier for the new link.
+ *       link_name   - The name of the new link.
+ *       lcpl_id     - Link creation property list identifier.
+ *       lapl_id     - Link access property list identifier.
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 20, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len, 
+		  hid_t_f *link_loc_id, 
+		  _fcd link_name, size_t_f *link_name_len, 
+		  hid_t_f *lcpl_id, hid_t_f *lapl_id )
+{
+  char *c_target_path = NULL;
+  char *c_link_name = NULL;
+  int ret_value = 0;
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_target_path = HD5f2cstring(target_path, (size_t)*target_path_len)) == NULL)
+    HGOTO_DONE(FAIL);
+  if((c_link_name = HD5f2cstring(link_name, (size_t)*link_name_len)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Adelete function.
+   */
+  if ( H5Lcreate_soft(c_target_path,(hid_t)*link_loc_id, c_link_name, (hid_t)*lcpl_id, (hid_t)*lapl_id) < 0)
+    HGOTO_DONE(FAIL);
+
+ done:
+    if(c_target_path)
+        HDfree(c_target_path);
+    if(c_link_name)
+        HDfree(c_link_name);
+
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5lcreate_hard_c
+ * Purpose:     Call H5Lcreate_hard
+ * Inputs:
+ *       obj_loc_id  - The file or group identifier for the target object.
+ *       obj_name    - Name of the target object, which must already exist.
+ *       obj_namelen - Name length
+ *       link_loc_id - The file or group identifier for the new link.
+ *       link_name   - The name of the new link.
+ *       link_namelen- Name length
+ *       lcpl_id     - Link creation property list identifier.
+ *       lapl_id     - Link access property list identifier.
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 27, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+		  hid_t_f *link_loc_id, 
+		  _fcd link_name, size_t_f *link_namelen, 
+		  hid_t_f *lcpl_id, hid_t_f *lapl_id )
+{
+  char *c_obj_name = NULL;
+  char *c_link_name = NULL;
+  int ret_value = 0;
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+  if((c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Lcreate_hard function.
+   */
+  if ( H5Lcreate_hard((hid_t)*obj_loc_id, c_obj_name, (hid_t)*link_loc_id, c_link_name, (hid_t)*lcpl_id, (hid_t)*lapl_id) < 0)
+    HGOTO_DONE(FAIL);
+
+ done:
+    if(c_obj_name)
+        HDfree(c_obj_name);
+    if(c_link_name)
+        HDfree(c_link_name);
+
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5ldelete_by_idx_c 
+ * Purpose:     Calls h5ldelete_by_idx 
+ * Inputs:
+ *          loc_id - File or group identifier specifying location of subject group
+ *      group_name - Name of subject group
+ *   group_namelen - Name length
+ *     index_field - Type of index; Possible values are:
+ *                    H5_INDEX_UNKNOWN_F = -1  - Unknown index type
+ *                    H5_INDEX_NAME_F          - Index on names
+ *                    H5_INDEX_CRT_ORDER_F     - Index on creation order
+ *                    H5_INDEX_N_F	       - Number of indices defined                   
+ *           order - Order within field or index; Possible values are:
+ *                    H5_ITER_UNKNOWN_F   - Unknown order
+ *                    H5_ITER_INC_F       - Increasing order
+ *                    H5_ITER_DEC_F       - Decreasing order
+ *                    H5_ITER_NATIVE_F    - No particular order, whatever is fastest
+ *                    H5_ITER_N_F	  - Number of iteration orders
+ *               n - Link for which to retrieve information  
+ *         lapl_id - Link access property list     
+ *              
+ * Outputs:     N/A
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 29, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+		     int_f *index_field, int_f *order, size_t_f *n, hid_t_f *lapl_id)
+{
+    char *c_group_name = NULL;          /* Buffer to hold C string */
+    H5_index_t c_index_field;
+    H5_iter_order_t c_order;
+    int_f ret_value = 0;          /* Return value */
+
+     /*
+      * Convert FORTRAN name to C name
+      */
+    if((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+
+    c_index_field = (H5_index_t)*index_field;
+    c_order = (H5_iter_order_t)*order;
+
+     /*
+      * Call H5Ldelete_by_name function. 
+      */
+    if(H5Ldelete_by_idx((hid_t)*loc_id, c_group_name, c_index_field, c_order, (hsize_t)*n, (hid_t)*lapl_id) < 0)
+      HGOTO_DONE(FAIL);
+
+done:
+    if(c_group_name)
+        HDfree(c_group_name);
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5lexists_c
+ * Purpose:     Calls H5Lexists 
+ * Inputs:
+ *      loc_id - Identifier of the file or group to query.
+ *        name - Link name to check
+ *     lapl_id - Link access property list identifier.
+ * Outputs:
+ *     link_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 29, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, hid_t_f *link_exists)
+{
+  char *c_name = NULL;          /* Buffer to hold C string */
+  int_f ret_value = 0;          /* Return value */
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Lexists function.
+   */
+  if((*link_exists = (hid_t_f)H5Lexists((hid_t)*loc_id, c_name, (hid_t)*lapl_id)) < 0)
+         HGOTO_DONE(FAIL);
+
+done:
+    if(c_name)
+        HDfree(c_name);
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5lget_info_c
+ * Purpose:     Call  H5Lget_info
+ * Inputs:  
+ *		link_loc_id - File or group identifier.
+ *                link_name - Name of the link for which information is being sought
+ *             link_namelen - Name length
+ *                  lapl_id - Link access property list
+ * Outputs:
+ *
+ *              cset - indicates the character set used for link’s name. 
+ *            corder - specifies the link’s creation order position.
+ *      corder_valid - indicates whether the value in corder is valid.
+ *         link_type -  specifies the link class:
+ *     	                H5L_LINK_HARD_F      - Hard link
+ *     	                H5L_LINK_SOFT_F      - Soft link
+ *     	                H5L_LINK_EXTERNAL_F  - External link
+ *     	                H5L_LINK_ERROR_F     - Error
+ *           address - If the link is a hard link, address specifies the file address that the link points to
+ *          val_size - If the link is a symbolic link, val_size will be the length of the link value
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5lget_info_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
+		int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type, 
+		int_f *address, hsize_t_f *val_size,
+		hid_t_f *lapl_id)
+{
+    char *c_link_name = NULL;          /* Buffer to hold C string */
+    int_f ret_value = 0;          /* Return value */
+    H5L_info_t link_buff;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if((c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+    /*
+     * Call H5Linfo function.
+     */
+    if(H5Lget_info((hid_t)*link_loc_id, c_link_name, &link_buff, (hid_t)*lapl_id) < 0)
+      HGOTO_DONE(FAIL);
+
+    /* Unpack the structure */
+
+    *cset = (int_f)link_buff.cset;
+    *corder = (int_f)link_buff.corder;
+    *corder_valid = 0;
+    if(link_buff.corder_valid > 0) *corder_valid = 1;
+    *link_type = (int_f)link_buff.type;
+    *address = (int_f)link_buff.u.address;
+    *val_size = (hsize_t)link_buff.u.val_size;
+
+done:
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5lget_info_by_idx_c
+ * Purpose:     Call  H5Lget_info_by_idx
+ * Inputs: 
+ *	loc_id  - File or group identifier specifying location of subject group
+ *   group_name - Name of subject group
+ *group_namelen - Name length
+ *  index_field - Index or field which determines the order
+ *        order - Order within field or index
+ *            n - Link for which to retrieve information
+ *      lapl_id - Link access property list
+ * Outputs:   
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute 
+ *              corder - Is a positive integer containing the creation order of the attribute
+ *                cset - Indicates the character set used for the attribute’s name
+ *           data_size - indicates the size, in the number of characters, of the attribute
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+		      int_f *index_field, int_f *order, hsize_t_f *n,
+		      int_f *corder_valid, int_f *corder, int_f *cset, hsize_t_f *data_size, hid_t_f *lapl_id)
+{
+    char *c_group_name = NULL;          /* Buffer to hold C string */
+    H5_index_t c_index_field;
+    H5_iter_order_t c_order;
+    int_f ret_value = 0;          /* Return value */
+    H5L_info_t link_buff;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+
+    c_index_field = (H5_index_t)*index_field;
+    c_order = (H5_iter_order_t)*order;
+     /*
+      * Call H5Linfo_by_idx function.
+      */
+    if(H5Lget_info_by_idx((hid_t)*loc_id, c_group_name, c_index_field, c_order, (hsize_t)*n,
+			  &link_buff, (hid_t)*lapl_id) < 0)
+      HGOTO_DONE(FAIL);
+
+    /* Unpack the structure */
+
+    *corder_valid = 0;
+    if(link_buff.corder_valid > 0) *corder_valid = 1;
+
+    *corder = (int_f)link_buff.corder;
+    *cset = (int_f)link_buff.cset;
+    *data_size = (hsize_t)link_buff.u.val_size;
+
+done:
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        H5Lis_registered_c
+ * Purpose:     Call H5Lis_registered
+ * Inputs:
+ *  link_cls_id - User-defined link class identifier
+ * Outputs:     NONE
+ *
+ * Returns:     Returns a positive value if the link class has been registered
+ *              and zero if it is unregistered. Otherwise returns a negative value
+ * Programmer:  M.S. Breitenfeld
+ *              March 3, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5lis_registered_c(int_f *link_cls_id)
+{
+  int_f ret_value = 0;      /* Return value */
+  H5L_type_t c_link_cls_id; /* User-defined link class identifier */
+  htri_t registered; /* registration status */
+			
+		     
+  c_link_cls_id = (H5L_type_t)*link_cls_id;
+  /*
+   * Call H5Lis_registered
+   */
+  registered = H5Lis_registered(c_link_cls_id);
+  
+  ret_value = (int_f)registered;
+  
+  return ret_value;
+}
+
+
+/*----------------------------------------------------------------------------
+ * Name:        h5lmove_c
+ * Purpose:     Call  H5Lmove
+ * Inputs:
+ *    src_loc_id   - Original file or group identifier.
+ *    src_name     - Original link name.
+ *    src_namelen  - name length
+ *    dest_loc_id  - Destination file or group identifier.
+ *    dest_name    - NEW link name.
+ *    dest_namelen - name length
+ * Outputs:
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 3, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5lmove_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
+	   _fcd dest_name, size_t_f *dest_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id)
+
+{
+    char *c_src_name = NULL;  /* Buffer to hold C string */
+    char *c_dest_name = NULL; /* Buffer to hold C string */
+    int_f ret_value = 0;          /* Return value */
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if((c_src_name = HD5f2cstring(src_name, (size_t)*src_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+    if((c_dest_name = HD5f2cstring(dest_name, (size_t)*dest_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+
+     /*
+      * Call H5Lmove function.
+      */
+    if(H5Lmove((hid_t)*src_loc_id, c_src_name, (hid_t)*dest_loc_id,
+	       c_dest_name, (hid_t)*lcpl_id, (hid_t)*lapl_id) < 0)
+      HGOTO_DONE(FAIL);
+done:
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5lget_name_by_idx_c
+ * Purpose:     Call  H5Lget_name_by_idx
+ * Inputs:
+ *   loc_id      - File or group identifier specifying location of subject group
+ *   group_name  - Name of subject group
+ *   index_field - Index or field which determines the order
+ *   order       - Order within field or index
+ *   n           - Link for which to retrieve information
+ *   size        - Maximum number of characters of link value to be returned.
+ *   lapl_id     - Link access property list
+ * Outputs:
+ *   name        - Buffer in which link value is returned
+ *   size        - The size of the link name on success
+ * Returns:      0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 10, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+		      int_f *index_field, int_f *order, hsize_t_f *n,
+		      size_t_f *size, _fcd name, hid_t_f *lapl_id)
+{
+    char *c_group_name = NULL;          /* Buffer to hold C string */
+    char *c_name = NULL;          /* Buffer to hold C string */
+    int_f ret_value = 0;          /* Return value */
+    size_t c_size;
+
+    /*
+     * Convert FORTRAN name to C name
+     */
+    if((c_group_name = HD5f2cstring(group_name, (size_t)*group_namelen)) == NULL)
+      HGOTO_DONE(FAIL);
+
+    c_size = (size_t)*size + 1;
+  /*
+   * Allocate buffer to hold name of an attribute
+   */
+    if ((c_name = HDmalloc(c_size)) == NULL)
+      HGOTO_DONE(FAIL);
+
+    if((*size = (size_t)H5Lget_name_by_idx((hid_t)*loc_id, c_group_name, (H5_index_t)*index_field, 
+						     (H5_iter_order_t)*order, (hsize_t)*n,c_name, c_size, (hid_t)*lapl_id)) < 0)
+      HGOTO_DONE(FAIL);
+
+    /*
+     * Convert C name to FORTRAN and place it in the given buffer
+     */
+    if(c_name != NULL)
+      HD5packFstring(c_name, _fcdtocp(name), c_size-1);
+done:
+    if(c_group_name) HDfree(c_group_name);
+    if(c_name) HDfree(c_name);
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5lget_val_c
+ * Purpose:     Call  H5Lget_val
+ * Inputs:  
+ *		link_loc_id - File or group identifier.
+ *                link_name - Name of the link for which valrmation is being sought
+ *             link_namelen - Name length
+ *                     size - Maximum number of characters of link value to be returned.
+ *                  lapl_id - Link access property list
+ * Outputs:
+ *             linkval_buff - The buffer to hold the returned link value.
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 3, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+/* int_f */
+/* nh5lget_val_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, */
+/* 	       size_t_f *size, _fcd linkval_buff, */
+/* 	       hid_t_f *lapl_id) */
+/* { */
+/*     char *c_link_name = NULL;   /\* Buffer to hold C string *\/ */
+/*     int_f ret_value = 0;        /\* Return value *\/ */
+/*     void *c_linkval_buff = NULL; */
+
+/*     /\* */
+/*      * Convert FORTRAN name to C name */
+/*      *\/ */
+/*     if((c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)) == NULL) */
+/*       HGOTO_DONE(FAIL); */
+/*     /\* */
+/*      * Call H5Lval function. */
+/*      *\/ */
+/*     if(H5Lget_val((hid_t)*link_loc_id, c_link_name, &linkval_buff, (size_t)*size, (hid_t)*lapl_id) < 0) */
+/*       HGOTO_DONE(FAIL); */
+/*   /\* */
+/*    * Convert C name to FORTRAN  */
+/*    *\/ */
+/*     HD5packFstring(c_buf, _fcdtocp(buf), c_bufsize-1); */
+
+
+/* done: */
+/*     return ret_value; */
+/* } */
+
+
+/*----------------------------------------------------------------------------
+ * Name:        H5Lregistered_c
+ * Purpose:     Call H5Lregistered
+ * Inputs:
+ *		
+ * Inputs:
+ *     version         - Version number of this struct 
+ *     class_id        - Link class identifier          
+ *     comment         - Comment for debugging            
+ *     comment_len     - Comment for debugging          
+ *     create_func     - Callback during link creation            
+ *     create_func_len - length
+ *    move_func        - Callback after moving link       
+ *    move_func_len    - length    
+ *     copy_func       - Callback after copying link      
+ *     copy_func_len   - length
+ *     trav_func       - The main traversal function      
+ *     trav_func_len   - length
+ *     del_func        - Callback for link deletion       
+ *     del_func_len    - length
+ *     query_func      - Callback for queries    
+ *     query_func_len  - length
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 3, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+/* int_f */
+
+/* nh5lregistered_c(int_f *version, int_f *class_id, */
+/* 		 _fcd comment, size_t_f *comment_len, */
+/* 		 _fcd create_func, size_t_f *create_func_len, */
+/* 		 _fcd move_func, size_t_f *move_func_len, */
+/* 		 _fcd copy_func, size_t_f *copy_func_len, */
+/* 		 _fcd trav_func, size_t_f *trav_func_len, */
+/* 		 _fcd del_func , size_t_f *del_func_len, */
+/* 		 _fcd query_func, size_t_f *query_func_len) */
+/* { */
+/*   char *c_comment = NULL;         */
+/*   char *c_create_func = NULL; */
+/*   char *c_move_func = NULL;    */
+/*   char *c_copy_func = NULL;   */
+/*   char *c_trav_func = NULL;  */
+/*   char *c_del_func = NULL;  */
+/*   char *c_query_func = NULL; */
+  
+/*   H5L_class_t class_t; */
+
+/*   int ret_value = 0; */
+
+/*   /\* */
+/*    * Convert FORTRAN name to C name */
+/*    *\/ */
+/*   if((c_comment = HD5f2cstring(c_comment, (size_t)*sc_comment_len)) == NULL) */
+/*     HGOTO_DONE(FAIL); */
+/*   if((c_create_func = HD5f2cstring(c_create_func, (size_t)*c_create_func_len)) == NULL) */
+/*     HGOTO_DONE(FAIL); */
+/*   if((c_move_func = HD5f2cstring(c_move_func, (size_t)*sc_move_func_len)) == NULL) */
+/*     HGOTO_DONE(FAIL); */
+/*   if((c_copy_func = HD5f2cstring(c_copy_func, (size_t)*c_copy_func_len)) == NULL) */
+/*     HGOTO_DONE(FAIL); */
+/*   if((c_trav_func = HD5f2cstring(c_trav_func, (size_t)*sc_trav_func_len)) == NULL) */
+/*     HGOTO_DONE(FAIL); */
+/*   if((c_del_func = HD5f2cstring(c_del_func, (size_t)*c_del_func_len)) == NULL) */
+/*     HGOTO_DONE(FAIL); */
+/*   if((c_query_func = HD5f2cstring(c_query_func, (size_t)*c_query_func_len)) == NULL) */
+/*     HGOTO_DONE(FAIL); */
+/*   /\* */
+/*    * Pack into C struct H5L_class_t */
+/*    *\/ */
+/*       int version;                    /\* Version number of this struct  *\/ */
+/*       H5L_type_t class_id;            /\* Link class identifier          *\/ */
+/*       const char *comment;            /\* Comment for debugging          *\/ */
+/*       H5L_create_func_t create_func;  /\* Callback during link creation  *\/ */
+/*       H5L_move_func_t move_func;      /\* Callback after moving link     *\/ */
+/*       H5L_copy_func_t copy_func;      /\* Callback after copying link    *\/ */
+/*       H5L_traverse_func_t trav_func;  /\* The main traversal function    *\/ */
+/*       H5L_delete_func_t del_func;     /\* Callback for link deletion     *\/ */
+/*       H5L_query_func_t query_func;    /\* Callback for queries           *\/ */
+
+/*       class_t.version = (int)*version; */
+/*       class_t.class_id = (H5L_type_t)*class_id; */
+/*       class_t.comment = c_comment; */
+/*       class_t. */
+
+/*   /\* */
+/*    * Call H5Lcopy function. */
+/*    *\/ */
+/*   if( H5Lcopy( (hid_t)*src_loc_id, c_src_name, (hid_t) *dest_loc_id,  */
+/* 	       c_dest_name, (hid_t)*lcpl_id, (hid_t)*lapl_id ) < 0) */
+/*     HGOTO_DONE(FAIL); */
+
+/* done: */
+/*   if(c_src_name) */
+/*     HDfree(c_src_name); */
+/*   if(c_dest_name) */
+/*     HDfree(c_dest_name); */
+  
+/*   return ret_value; */
+/* } */
+
+/*----------------------------------------------------------------------------
+ * Name:        h5lget_val_c
+ * Purpose:     Call H5Lget_val_c
+ * Inputs: 
+ *               link_loc_id - File or group identifier.
+ *                 link_name - Link whose value is to be returned.
+ *             link_name_len - length of link_name
+ *                      size - Maximum number of characters of link value to be returned.
+ *                  lapl_id  - List access property list identifier
+ * Outputs:   
+ *             linkval_buff  - The buffer to hold the returned link value.
+ *
+ * Returns:      0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              April 11, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+int_f
+nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size, 
+	      void *linkval_buff, hid_t_f *lapl_id)
+{
+  int_f ret_value = 0;       /* Return value */
+  char *c_link_name = NULL; /* Buffer to hold C string */
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_link_name = HD5f2cstring(link_name, (size_t)*link_namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Lget_val
+   */
+
+  if(H5Lget_val( (hid_t)*link_loc_id, c_link_name, &linkval_buff, (size_t)*size, (hid_t)*lapl_id )< 0)
+    HGOTO_DONE(FAIL);
+
+done:
+    return ret_value;
+}
+
+
diff --git a/fortran/src/H5Lff.f90 b/fortran/src/H5Lff.f90
new file mode 100644
index 0000000..acb7c73
--- /dev/null
+++ b/fortran/src/H5Lff.f90
@@ -0,0 +1,1323 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!   Copyright by The HDF Group.                                               *
+!   Copyright by the Board of Trustees of the University of Illinois.         *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
+!   of the source code distribution tree; Copyright.html can be found at the  *
+!   root level of an installed copy of the electronic HDF5 document set and   *
+!   is linked from the top-level documents page.  It can also be found at     *
+!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+!   access to either file, you may request a copy from help@hdfgroup.org.     *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!
+!
+! This file contains Fortran90 interfaces for H5L functions.
+!
+MODULE H5L
+
+  USE H5GLOBAL
+
+CONTAINS
+
+!----------------------------------------------------------------------
+! Name:		h5lcopy_f 
+!
+! Purpose: 	Copies a link from one location to another.
+!
+! Inputs:
+!     src_loc_id - Location identifier of the source link
+!       src_name - Name of the link to be copied
+!    dest_loc_id - Location identifier specifying the destination of the copy
+!      dest_name - Name to be assigned to the NEW copy
+!         loc_id - Identifier of the file or group containing the object
+!           name - Name of the link to delete
+! 
+! Outputs: 
+!         hdferr - error code:
+!			Success:  0
+!			Failure: -1   
+! Optional parameters:
+!        lcpl_id - Link creation property list identifier
+!        lapl_id - Link access property list identifier
+!
+! Programmer:	M.S. Breitenfeld
+!		February 27, 2008
+!
+! Modifications:
+!
+! Comment:		
+!----------------------------------------------------------------------
+  SUBROUTINE h5lcopy_f(src_loc_id, src_name, dest_loc_id, dest_name, hdferr, &
+       lcpl_id, lapl_id) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5lcopy
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: src_loc_id  ! Location identifier of the source link
+    CHARACTER(LEN=*), INTENT(IN) :: src_name   ! Name of the link to be copied
+    INTEGER(HID_T), INTENT(IN) :: dest_loc_id ! Location identifier specifying the destination of the copy
+    CHARACTER(LEN=*), INTENT(IN) :: dest_name ! Name to be assigned to the NEW copy
+
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code: 
+                                          ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
+    
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTEGER(SIZE_T) :: src_namelen
+    INTEGER(SIZE_T) :: dest_namelen
+    
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5lcopy_c(src_loc_id, src_name, src_namelen, dest_loc_id, dest_name, dest_namelen, &
+            lcpl_id_default, lapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LCOPY_C'::h5lcopy_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: src_loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: src_name
+         INTEGER(HID_T), INTENT(IN) :: dest_loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: dest_name
+         
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+         
+         INTEGER(SIZE_T) :: src_namelen
+         INTEGER(SIZE_T) :: dest_namelen
+       END FUNCTION h5lcopy_c
+    END INTERFACE
+
+    src_namelen  = LEN(src_name)
+    dest_namelen = LEN(dest_name)
+
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lcopy_c(src_loc_id, src_name, src_namelen, dest_loc_id, dest_name, dest_namelen, &
+         lcpl_id_default, lapl_id_default)
+
+  END SUBROUTINE h5lcopy_f
+
+!----------------------------------------------------------------------
+! Name:		h5ldelete_f 
+!
+! Purpose: 	Removes a link from a group.
+!
+! Inputs:  
+!         loc_id   - Identifier of the file or group containing the object
+!         name     - Name of the link to delete
+! 
+! Outputs: 
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!         lapl_id  - Link access property list identifier
+!
+! Programmer:	M.S. Breitenfeld
+!		January, 2008
+!
+! Modifications:
+!
+! Comment:		
+!----------------------------------------------------------------------
+  SUBROUTINE h5ldelete_f(loc_id, name, hdferr, lapl_id) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5ldelete_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id  ! Identifier of the file or group containing the object
+    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of the link to delete
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code: 
+                                          ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: namelen
+    
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5ldelete_c(loc_id, name, namelen, lapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LDELETE_C'::h5ldelete_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: name
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: namelen
+       END FUNCTION h5ldelete_c
+    END INTERFACE
+
+    namelen = LEN(name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5ldelete_c(loc_id, name, namelen, lapl_id_default)
+
+  END SUBROUTINE h5ldelete_f 
+
+!----------------------------------------------------------------------
+! Name:		H5Lcreate_soft_f 
+!
+! Purpose: 	Creates a soft link to an object.
+!
+! Inputs:
+!       target_path - Path to the target object, which is not required to exist.
+!       link_loc_id - The file or group identifier for the new link.
+!       link_name   - The name of the new link.
+! 
+! Outputs: 
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!       lcpl_id     - Link creation property list identifier.
+!       lapl_id     - Link access property list identifier.
+!
+! Programmer:	M.S. Breitenfeld
+!		February 20, 2008
+!
+! Modifications:
+!
+! Comment:		
+!----------------------------------------------------------------------
+  SUBROUTINE h5lcreate_soft_f(target_path, link_loc_id, link_name, hdferr, lcpl_id, lapl_id) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5lcreate_soft_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: target_path     ! Path to the target object, which is not required to exist.
+    INTEGER(HID_T), INTENT(IN) :: link_loc_id     ! The file or group identifier for the new link.
+    CHARACTER(LEN=*), INTENT(IN) :: link_name       ! The name of the new link.
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code: 
+                                          ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier.
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier.
+
+    INTEGER(HID_T) :: lcpl_id_default 
+    INTEGER(HID_T) :: lapl_id_default     
+    INTEGER(SIZE_T) :: target_path_len
+    INTEGER(SIZE_T) :: link_name_len
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5lcreate_soft_c(target_path, target_path_len, &
+            link_loc_id, &
+            link_name,link_name_len, &
+            lcpl_id_default, lapl_id_default )
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LCREATE_SOFT_C'::h5lcreate_soft_c
+         !DEC$ ENDIF
+         CHARACTER(LEN=*), INTENT(IN) :: target_path
+         INTEGER(SIZE_T) :: target_path_len
+         INTEGER(HID_T), INTENT(IN) ::   link_loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: link_name
+         INTEGER(SIZE_T) :: link_name_len
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+       END FUNCTION h5lcreate_soft_c
+    END INTERFACE
+
+    target_path_len = LEN(target_path)
+    link_name_len = LEN(link_name)
+
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lcreate_soft_c(target_path, target_path_len,&
+         link_loc_id, &
+         link_name, link_name_len, &
+         lcpl_id_default, lapl_id_default )
+
+  END SUBROUTINE h5lcreate_soft_f
+
+!----------------------------------------------------------------------
+! Name:		H5Lcreate_hard_f 
+!
+! Purpose: 	Creates a hard link to an object.
+!
+! Inputs:
+!
+!    obj_loc_id - The file or group identifier for the target object.
+!      obj_name - Name of the target object, which must already exist.
+!   link_loc_id - The file or group identifier for the new link.
+!     link_name - The name of the new link.
+! 
+! Outputs: 
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!       lcpl_id     - Link creation property list identifier.
+!       lapl_id     - Link access property list identifier.
+!
+! Programmer:	M.S. Breitenfeld
+!		February 27, 2008
+!
+! Modifications:
+!
+! Comment:		
+!----------------------------------------------------------------------
+  SUBROUTINE h5lcreate_hard_f(obj_loc_id, obj_name, link_loc_id, link_name, hdferr, lcpl_id, lapl_id) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5lcreate_hard_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_loc_id  ! The file or group identifier for the target object.
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of the target object, which must already exist.
+    INTEGER(HID_T), INTENT(IN) :: link_loc_id ! The file or group identifier for the new link.
+    CHARACTER(LEN=*), INTENT(IN) :: link_name ! The name of the new link.
+
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code: 
+                                          ! 0 on success and -1 on failure
+
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) ::   lcpl_id         ! Link creation property list identifier.
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) ::   lapl_id         ! Link access property list identifier.
+
+    INTEGER(HID_T) :: lcpl_id_default 
+    INTEGER(HID_T) :: lapl_id_default
+   
+    INTEGER(SIZE_T) :: obj_namelen 
+    INTEGER(SIZE_T) :: link_namelen
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5lcreate_hard_c(obj_loc_id, obj_name, obj_namelen, &
+            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default) 
+
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LCREATE_HARD_C'::h5lcreate_hard_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: obj_loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: obj_name
+         INTEGER(HID_T), INTENT(IN) :: link_loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: link_name
+         INTEGER(SIZE_T) :: obj_namelen 
+         INTEGER(SIZE_T) :: link_namelen
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+       END FUNCTION h5lcreate_hard_c
+    END INTERFACE
+    obj_namelen = LEN(obj_name) 
+    link_namelen = LEN(link_name)
+
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lcreate_hard_c(obj_loc_id, obj_name, obj_namelen, &
+            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default)
+
+  END SUBROUTINE h5lcreate_hard_f
+
+!----------------------------------------------------------------------
+! Name:		H5Lcreate_external_f 
+!
+! Purpose: 	Creates a soft link to an object in a different file.
+!
+! Inputs:
+!
+!    file_name - Name of the file containing the target object. Neither the file nor the target object is 
+!                required to exist. May be the file the link is being created in.
+!     obj_name - Path within the target file to the target object.
+!  link_loc_id - The file or group identifier for the new link.
+!    link_name - The name of the new link.
+! 
+! Outputs: 
+!		hdferr:	- error code		
+!  		            Success:  0
+!		            Failure: -1   
+! Optional parameters:
+!       lcpl_id     - Link creation property list identifier.
+!       lapl_id     - Link access property list identifier.
+!
+! Programmer:	M.S. Breitenfeld
+!		February 27, 2008
+!
+! Modifications:
+!
+! Comment:		
+!----------------------------------------------------------------------
+  SUBROUTINE h5lcreate_external_f(file_name, obj_name, link_loc_id, link_name, hdferr, lcpl_id, lapl_id) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5lcreate_external_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: file_name  ! Name of the file containing the target object. Neither 
+                                              ! the file nor the target object is required to exist. 
+                                              ! May be the file the link is being created in.
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of the target object, which must already exist.
+    INTEGER(HID_T), INTENT(IN) :: link_loc_id ! The file or group identifier for the new link.
+    CHARACTER(LEN=*), INTENT(IN) :: link_name ! The name of the new link.
+
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code: 
+                                          ! 0 on success and -1 on failure
+
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier.
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier.
+
+    INTEGER(HID_T) :: lcpl_id_default 
+    INTEGER(HID_T) :: lapl_id_default
+   
+    INTEGER(SIZE_T) :: file_namelen
+    INTEGER(SIZE_T) :: obj_namelen 
+    INTEGER(SIZE_T) :: link_namelen
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5lcreate_external_c(file_name, file_namelen, obj_name, obj_namelen, &
+            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default) 
+
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LCREATE_EXTERNAL_C'::h5lcreate_external_c
+         !DEC$ ENDIF
+         CHARACTER(LEN=*), INTENT(IN) :: file_name
+         CHARACTER(LEN=*), INTENT(IN) :: obj_name
+         INTEGER(HID_T), INTENT(IN) :: link_loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: link_name
+         INTEGER(SIZE_T) :: file_namelen 
+         INTEGER(SIZE_T) :: obj_namelen 
+         INTEGER(SIZE_T) :: link_namelen
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: lapl_id_default
+       END FUNCTION h5lcreate_external_c
+    END INTERFACE
+    file_namelen = LEN(file_name) 
+    obj_namelen = LEN(obj_name) 
+    link_namelen = LEN(link_name)
+
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lcreate_external_c(file_name, file_namelen, obj_name, obj_namelen, &
+            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default)
+
+  END SUBROUTINE h5lcreate_external_f
+
+!----------------------------------------------------------------------
+! Name:		h5ldelete_by_idx_f 
+!
+! Purpose:  	Removes the nth link in a group.
+! Inputs:  	
+!		loc_id     - File or group identifier specifying location of subject group
+!               group_name - Name of subject group
+!               index_field   - Type of index; Possible values are:
+!
+!                  H5_INDEX_UNKNOWN_F = -1  - Unknown index type
+!                  H5_INDEX_NAME_F          - Index on names
+!                  H5_INDEX_CRT_ORDER_F     - Index on creation order
+!                  H5_INDEX_N_F	            - Number of indices defined
+!                             
+!               order - Order within field or index; Possible values are:
+!
+!                  H5_ITER_UNKNOWN_F   - Unknown order
+!                  H5_ITER_INC_F       - Increasing order
+!                  H5_ITER_DEC_F       - Decreasing order
+!                  H5_ITER_NATIVE_F    - No particular order, whatever is fastest
+!                  H5_ITER_N_F	       - Number of iteration orders
+!
+!               n           - Link for which to retrieve information
+! Outputs:
+!		hdferr:     - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!               lapl_id    - Link access property list
+!
+! Programmer:	M.S. Breitenfeld
+!		February 29, 2008
+!
+! Modifications: N/A 
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5ldelete_by_idx_f(loc_id, group_name, index_field, order, n, hdferr, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5ldelete_by_idx_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id       ! Identifer for object to which attribute is attached
+    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of object, relative to location, 
+                                               !  from which attribute is to be removed
+    INTEGER, INTENT(IN) :: index_field         ! Type of index; Possible values are:
+                                               !    H5_INDEX_UNKNOWN_F   - Unknown index type
+                                               !    H5_INDEX_NAME_F      - Index on names
+                                               !    H5_INDEX_CRT_ORDER_F - Index on creation order
+                                               !    H5_INDEX_N_F	      - Number of indices defined
+    INTEGER, INTENT(IN) :: order               ! Order in which to iterate over index; Possible values are:
+                                               !    H5_ITER_UNKNOWN_F  - Unknown order
+                                               !    H5_ITER_INC_F      - Increasing order
+                                               !    H5_ITER_DEC_F      - Decreasing order
+                                               !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
+                                               !    H5_ITER_N_F	    - Number of iteration orders
+    INTEGER(HSIZE_T), INTENT(IN) :: n      ! Offset within index 
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code:
+                                           ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id     ! Link access property list
+
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T) :: group_namelen
+    
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5ldelete_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, lapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LDELETE_BY_IDX_C'::h5ldelete_by_idx_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: group_name
+         INTEGER, INTENT(IN) :: index_field
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n 
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: group_namelen
+       END FUNCTION h5ldelete_by_idx_c
+    END INTERFACE
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+    
+    group_namelen = LEN(group_name)
+    hdferr = h5ldelete_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, lapl_id_default)
+    
+  END SUBROUTINE h5ldelete_by_idx_f
+
+!----------------------------------------------------------------------
+! Name:	        H5Lexists_f	
+!
+! Purpose:  	Check if a link with a particular name exists in a group.
+!		
+! Inputs:
+!      loc_id - Identifier of the file or group to query.
+!        name - Link name to check
+!
+! Outputs:
+!   link_exists  - link exists status (.TRUE.,.FALSE.)
+!        hdferr  - error code		
+!	              Success:  0
+!		      Failure: -1 
+! Optional parameters:
+!	 lapl_id - Link access property list identifier.		
+!
+! Programmer:	M. S. Breitenfeld
+!		February 29, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5lexists_f(loc_id, name, link_exists, hdferr, lapl_id)
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5lexists_f
+!DEC$endif
+
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id  ! Identifier of the file or group to query.
+    CHARACTER(LEN=*), INTENT(IN) :: name  ! Link name to check.
+    LOGICAL, INTENT(OUT) :: link_exists   ! .TRUE. if exists, .FALSE. otherwise
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
+                                          ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id 
+                                          ! Link access property list identifier.
+    INTEGER :: link_exists_c
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(SIZE_T)  :: namelen
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5lexists_c(loc_id, name, namelen, lapl_id_default, link_exists_c)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LEXISTS_C'::h5lexists_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: name
+         INTEGER(SIZE_T), INTENT(IN) :: namelen
+         INTEGER(HID_T), INTENT(OUT) :: link_exists_c
+         INTEGER(HID_T) :: lapl_id_default
+         
+       END FUNCTION h5lexists_c
+    END INTERFACE
+
+    namelen = LEN(name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lexists_c(loc_id, name, namelen, lapl_id_default, link_exists_c)
+
+    link_exists = .FALSE.
+    IF(link_exists_c.GT.0) link_exists = .TRUE. 
+
+  END SUBROUTINE h5lexists_f
+
+!----------------------------------------------------------------------
+! Name:		h5lget_info_f
+!
+! Purpose:  	Returns information about a link.
+!
+! Inputs:  
+!		link_loc_id - File or group identifier.
+!               link_name - Name of the link for which information is being sought  
+!
+! Outputs:  NOTE: In C these are contained in the structure H5L_info_t
+!
+!              cset - indicates the character set used for link’s name. 
+!      corder - specifies the link’s creation order position.
+!corder_valid - indicates whether the value in corder is valid.
+!         link_type -  specifies the link class:
+!     	                H5L_LINK_HARD_F      - Hard link
+!     	                H5L_LINK_SOFT_F      - Soft link
+!     	                H5L_LINK_EXTERNAL_F  - External link
+!     	                H5L_LINK_ERROR_ F    - Error
+!           address - If the link is a hard link, address specifies the file address that the link points to
+!          val_size - If the link is a symbolic link, val_size will be the length of the link value
+!            hdferr - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!      lapl_id - Link access property list		
+!
+! Programmer:	M. S. Breitenfeld
+!		February 29, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5lget_info_f(link_loc_id, link_name, &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       hdferr, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5lget_info_f
+!DEC$endif
+    IMPLICIT NONE
+
+    INTEGER(HID_T), INTENT(IN) :: link_loc_id ! File or group identifier.
+    CHARACTER(LEN=*), INTENT(IN) :: link_name ! Name of the link for which information is being sought
+ 
+! Outputs:  NOTE: In C these are contained in the structure H5L_info_t
+    INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the link’s name. 
+    INTEGER, INTENT(OUT) :: corder ! Specifies the link’s creation order position.
+    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the value in corder is valid.
+    INTEGER, INTENT(OUT) :: link_type ! Specifies the link class:
+     	                              !  H5L_LINK_HARD_F      - Hard link
+     	                              !  H5L_LINK_SOFT_F      - Soft link
+     	                              !  H5L_LINK_EXTERNAL_F  - External link
+     	                              !  H5L_LINK_ERROR _F    - Error
+    INTEGER, INTENT(OUT) :: address  ! If the link is a hard link, address specifies the file address that the link points to
+    INTEGER(HSIZE_T), INTENT(OUT) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+                                         ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
+
+    INTEGER(SIZE_T) :: link_namelen
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER :: corder_valid
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5lget_info_c(link_loc_id, link_name, link_namelen, &
+            cset, corder, corder_valid, link_type, address, val_size, &
+            lapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LGET_INFO_C'::h5lget_info_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: link_loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: link_name
+         INTEGER, INTENT(OUT) :: cset 
+         INTEGER, INTENT(OUT) :: corder
+         INTEGER, INTENT(OUT) :: link_type
+         INTEGER, INTENT(OUT) :: address
+         INTEGER(HSIZE_T), INTENT(OUT) :: val_size
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: link_namelen
+         INTEGER :: corder_valid
+       END FUNCTION h5lget_info_c
+    END INTERFACE
+
+    link_namelen = LEN(link_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lget_info_c(link_loc_id, link_name, link_namelen, &
+         cset, corder, corder_valid, link_type, &
+         address, val_size, &
+         lapl_id_default)
+    
+    f_corder_valid =.FALSE.
+    IF(corder_valid .EQ. 1) f_corder_valid =.TRUE.
+
+  END SUBROUTINE h5lget_info_f
+
+!----------------------------------------------------------------------
+! Name:	   h5lget_info_by_idx_f
+!
+! Purpose:  Retrieves metadata for a link in a group, according to the order within a field or index.
+!		
+! Inputs:
+!	loc_id - File or group identifier specifying location of subject group
+!   group_name - Name of subject group
+!  index_field - Index or field which determines the order
+!        order - Order within field or index
+!            n - Link for which to retrieve information
+!
+! Outputs:  NOTE: In C these are defined as a structure: H5L_info_t
+!    corder_valid   - indicates whether the creation order data is valid for this attribute
+!    corder         - is a positive integer containing the creation order of the attribute        
+!    cset           - indicates the character set used for the attribute’s name          
+!    data_size      - indicates the size, in the number of characters, of the attribute	
+!    hdferr         - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!      lapl_id - Link access property list		
+!
+! Programmer: M.S. Breitenfeld
+!	      February 29, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5lget_info_by_idx_f(loc_id, group_name, index_field, order, n, &
+       f_corder_valid, corder, cset, data_size, hdferr, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5lget_info_by_idx_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier specifying location of subject group  
+    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of subject group
+    INTEGER, INTENT(IN) :: index_field  ! Index or field which determines the order
+                                        !    H5_INDEX_UNKNOWN_F   - Unknown index type
+                                        !    H5_INDEX_NAME_F      - Index on names
+                                        !    H5_INDEX_CRT_ORDER_F - Index on creation order
+                                        !    H5_INDEX_N_F	      - Number of indices defined
+    INTEGER, INTENT(IN) :: order        ! Order in which to iterate over index; Possible values are:
+                                        !    H5_ITER_UNKNOWN_F  - Unknown order
+                                        !    H5_ITER_INC_F      - Increasing order
+                                        !    H5_ITER_DEC_F      - Decreasing order
+                                        !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
+    INTEGER(HSIZE_T), INTENT(IN) :: n   ! Attribute’s position in index
+    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+    INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
+    INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
+    INTEGER(HSIZE_T), INTENT(OUT) :: data_size   ! Indicates the size, in the number of characters, of the attribute
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+                                         ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
+    INTEGER :: corder_valid
+    INTEGER(SIZE_T)  :: group_namelen
+    INTEGER(HID_T) :: lapl_id_default
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5lget_info_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
+            corder_valid, corder, cset, data_size, lapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LGET_INFO_BY_IDX_C'::h5lget_info_by_idx_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id 
+         CHARACTER(LEN=*), INTENT(IN) :: group_name
+         INTEGER(SIZE_T)  :: group_namelen
+         INTEGER, INTENT(IN) :: index_field
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         INTEGER :: corder_valid
+         INTEGER, INTENT(OUT) :: corder
+         INTEGER, INTENT(OUT) :: cset
+         INTEGER(HSIZE_T), INTENT(OUT) :: data_size
+         INTEGER(HID_T) :: lapl_id_default
+       END FUNCTION h5lget_info_by_idx_c
+    END INTERFACE
+
+    group_namelen = LEN(group_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lget_info_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
+         corder_valid, corder, cset, data_size, lapl_id_default)
+
+    f_corder_valid =.FALSE.
+    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
+
+  END SUBROUTINE h5lget_info_by_idx_f
+
+!----------------------------------------------------------------------
+! Name:	   H5Lis_registered_f 
+!
+! Purpose:  Determines whether a class of user-defined links is registered.
+!		
+! Inputs:
+!      link_cls_id - User-defined link class identifier
+!
+! Outputs:
+!       registered - .TRUE. - if the link class has been registered
+!                    .FALSE. - if it is unregistered
+!           hdferr - Error code		
+!		       Success:  0
+!	               Failure: -1   
+! Optional parameters:
+!                      None		
+!
+! Programmer: M.S. Breitenfeld
+!	      February 29, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+  SUBROUTINE H5Lis_registered_f(link_cls_id, registered, hdferr) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: H5Lis_registered_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER, INTENT(IN) :: link_cls_id  ! User-defined link class identifier
+    LOGICAL, INTENT(OUT) :: registered  ! .TRUE. - if the link class has been registered and
+                                        ! .FALSE. - if it is unregistered
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code:
+                                        ! 0 on success and -1 on failure
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION H5Lis_registered_c(link_cls_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LIS_REGISTERED_C'::h5lis_registered_c
+         !DEC$ ENDIF
+         INTEGER, INTENT(IN) :: link_cls_id  ! User-defined link class identifier
+       END FUNCTION H5Lis_registered_c
+    END INTERFACE
+
+    hdferr = H5Lis_registered_c(link_cls_id)
+
+    IF(hdferr.GT.0)THEN
+       registered = .TRUE.
+    ELSE IF(hdferr.EQ.0)THEN
+       registered = .FALSE.
+    ENDIF
+       
+  END SUBROUTINE H5Lis_registered_f
+
+!----------------------------------------------------------------------
+! Name:	   H5Lmove_f
+!
+! Purpose:  Renames a link within an HDF5 file.
+!		
+! Inputs:
+!    src_loc_id  - Original file or group identifier.
+!    src_name    - Original link name.
+!    dest_loc_id - Destination file or group identifier.
+!    dest_name   - NEW link name.
+!
+! Outputs: 
+!         hdferr - Error code		
+!		     Success:  0
+!	             Failure: -1   
+! Optional parameters:
+!    lcpl_id  - Link creation property list identifier to be associated WITH the NEW link.
+!    lapl_id  - Link access property list identifier to be associated WITH the NEW link.
+!
+! Programmer: M.S. Breitenfeld
+!	      March 3, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5lmove_f(src_loc_id, src_name, dest_loc_id, dest_name, hdferr, lcpl_id, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: H5Lmove_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: src_loc_id  ! Original file or group identifier.
+    CHARACTER(LEN=*), INTENT(IN) :: src_name  ! Original link name.
+    INTEGER(HID_T), INTENT(IN) :: dest_loc_id ! Destination file or group identifier.
+    CHARACTER(LEN=*), INTENT(IN) :: dest_name ! NEW link name.
+    INTEGER(HID_T), INTENT(OUT) :: hdferr     ! Error code:
+                                              ! 0 on success and -1 on failure
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier 
+                                                    ! to be associated WITH the NEW link.
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier 
+                                                    ! to be associated WITH the NEW link.
+
+    INTEGER(SIZE_T) :: src_namelen
+    INTEGER(SIZE_T) :: dest_namelen
+
+    INTEGER(HID_T) :: lcpl_id_default 
+    INTEGER(HID_T) :: lapl_id_default 
+    
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION H5Lmove_c(src_loc_id, src_name, src_namelen, dest_loc_id, &
+            dest_name, dest_namelen, lcpl_id_default, lapl_id_default) 
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LMOVE_C'::h5lmove_c
+         !DEC$ ENDIF
+
+         INTEGER(HID_T), INTENT(IN) :: src_loc_id 
+         CHARACTER(LEN=*), INTENT(IN) :: src_name
+         INTEGER(SIZE_T) :: src_namelen
+         INTEGER(HID_T), INTENT(IN) :: dest_loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: dest_name
+         INTEGER(SIZE_T) :: dest_namelen
+         
+         INTEGER(HID_T) :: lcpl_id_default 
+         INTEGER(HID_T) :: lapl_id_default 
+
+       END FUNCTION H5Lmove_c
+    END INTERFACE
+
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    src_namelen = LEN(src_name)
+    dest_namelen = LEN(dest_name)
+
+    hdferr = H5Lmove_c(src_loc_id, src_name, src_namelen, dest_loc_id, &
+         dest_name, dest_namelen, lcpl_id_default, lapl_id_default)
+
+  END SUBROUTINE H5Lmove_f
+
+!----------------------------------------------------------------------
+! Name:		h5lget_name_by_idx_f
+!
+! Purpose:      Retrieves name of the nth link in a group, according to the order within a specified field or index.
+!
+! Inputs:  
+!   loc_id      - File or group identifier specifying location of subject group
+!   group_name  - Name of subject group
+!   index_field - Index or field which determines the order
+!   order       - Order within field or index
+!   n           - Link for which to retrieve information
+!
+! Outputs:  
+!   name        - Buffer in which link value is returned
+!    size       - Maximum number of characters of link value to be returned.
+!   hdferr      - error code		
+!		      Success:  0
+!		      Failure: -1
+!
+! Optional parameters:
+!    lapl_id    - List access property list identifier.
+!
+! Programmer:	M. S. Breitenfeld
+!		March 10, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+  SUBROUTINE h5lget_name_by_idx_f(loc_id, group_name, index_field, order, n, &
+       size, name, hdferr, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5lget_name_by_idx_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id       ! File or group identifier specifying location of subject group  
+    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of subject group
+    INTEGER, INTENT(IN) :: index_field  ! Index or field which determines the order
+                                        !    H5_INDEX_UNKNOWN_F   - Unknown index type
+                                        !    H5_INDEX_NAME_F      - Index on names
+                                        !    H5_INDEX_CRT_ORDER_F - Index on creation order
+                                        !    H5_INDEX_N_F	      - Number of indices defined
+    INTEGER, INTENT(IN) :: order        ! Order in which to iterate over index; Possible values are:
+                                        !    H5_ITER_UNKNOWN_F  - Unknown order
+                                        !    H5_ITER_INC_F      - Increasing order
+                                        !    H5_ITER_DEC_F      - Decreasing order
+                                        !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
+    INTEGER(HSIZE_T), INTENT(IN) :: n   ! Attribute’s position in index
+    INTEGER(SIZE_T), INTENT(INOUT) :: size   ! Indicates the size, in the number of characters, of the attribute
+                                             ! returns correct size
+    CHARACTER(LEN=*), INTENT(OUT) :: name ! Buffer in which link value is returned
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
+                     
+    INTEGER(SIZE_T)  :: group_namelen
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
+    INTEGER(HID_T) :: lapl_id_default
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5lget_name_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
+             size, name, lapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LGET_NAME_BY_IDX_C'::h5lget_name_by_idx_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id 
+         CHARACTER(LEN=*), INTENT(IN) :: group_name
+         INTEGER(SIZE_T)  :: group_namelen
+         INTEGER, INTENT(IN) :: index_field
+         INTEGER, INTENT(IN) :: order
+         INTEGER(HSIZE_T), INTENT(IN) :: n
+         INTEGER(SIZE_T), INTENT(INOUT) :: size
+         CHARACTER(LEN=*), INTENT(OUT) :: name
+         INTEGER(HID_T) :: lapl_id_default
+       END FUNCTION h5lget_name_by_idx_c
+    END INTERFACE
+
+    group_namelen = LEN(group_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5lget_name_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
+             size, name, lapl_id_default)
+
+  END SUBROUTINE h5lget_name_by_idx_f
+
+
+! HAS PROBLEM WITH void pointer in C
+
+!!$!----------------------------------------------------------------------
+!!$! Name:		h5lget_val_by_idx_f
+!!$!
+!!$! Purpose:      Returns the link value of a link, according to the order of
+!!$!               an index.  For symbolic links, this is the path to which the
+!!$!               link points, including the null terminator.  For user-defined
+!!$!               links, it is the link buffer.
+!!$! Inputs:  
+!!$!   loc_id      - File or group identifier specifying location of subject group
+!!$!   group_name  - Name of subject group
+!!$!   index_field - Index or field which determines the order
+!!$!   order       - Order within field or index
+!!$!   n           - Link for which to retrieve information
+!!$!   size       - Maximum number of characters of link value to be returned.
+!!$!
+!!$! Outputs:  NOTE: In C these are defined as a structure: H5L_info_t
+!!$!    corder_valid   - indicates whether the creation order data is valid for this attribute
+!!$!    corder         - is a positive integer containing the creation order of the attribute        
+!!$!    cset           - indicates the character set used for the attribute’s name          
+!!$!    data_size      - indicates the size, in the number of characters, of the attribute	
+!!$!    hdferr         - error code		
+!!$!				 Success:  0
+!!$!				 Failure: -1   
+!!$! Optional parameters:
+!!$!    lapl_id      - List access property list identifier.
+!!$!
+!!$! Programmer:	M. S. Breitenfeld
+!!$!		March 3, 2008	
+!!$!
+!!$! Modifications:  N/A
+!!$!
+!!$!----------------------------------------------------------------------
+!!$  SUBROUTINE h5lget_val_by_idx_f(loc_id, group_name, index_field, order, n, &
+!!$       f_corder_valid, corder, cset, data_size, hdferr, lapl_id) 
+!!$!This definition is needed for Windows DLLs
+!!$!DEC$if defined(BUILD_HDF5_DLL)
+!!$!DEC$attributes dllexport :: h5lget_val_by_idx_f
+!!$!DEC$endif
+!!$    IMPLICIT NONE
+!!$    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier specifying location of subject group  
+!!$    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of subject group
+!!$    INTEGER, INTENT(IN) :: index_field  ! Index or field which determines the order
+!!$                                        !    H5_INDEX_UNKNOWN_F   - Unknown index type
+!!$                                        !    H5_INDEX_NAME_F      - Index on names
+!!$                                        !    H5_INDEX_CRT_ORDER_F - Index on creation order
+!!$                                        !    H5_INDEX_N_F	      - Number of indices defined
+!!$    INTEGER, INTENT(IN) :: order        ! Order in which to iterate over index; Possible values are:
+!!$                                        !    H5_ITER_UNKNOWN_F  - Unknown order
+!!$                                        !    H5_ITER_INC_F      - Increasing order
+!!$                                        !    H5_ITER_DEC_F      - Decreasing order
+!!$                                        !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
+!!$    INTEGER(HSIZE_T), INTENT(IN) :: n   ! Attribute’s position in index
+!!$    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+!!$    INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
+!!$    INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
+!!$    INTEGER(HSIZE_T), INTENT(OUT) :: data_size   ! Indicates the size, in the number of characters, of the attribute
+!!$    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+!!$                                         ! 0 on success and -1 on failure
+!!$    INTEGER :: corder_valid
+!!$    INTEGER(SIZE_T)  :: group_namelen
+!!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
+!!$    INTEGER(HID_T) :: lapl_id_default
+!!$
+!!$!  MS FORTRAN needs explicit interface for C functions called here.
+!!$!
+!!$    INTERFACE
+!!$       INTEGER FUNCTION h5lget_val_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
+!!$            corder_valid, corder, cset, data_size, lapl_id_default)
+!!$         USE H5GLOBAL
+!!$         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+!!$         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LGET_VAL_BY_IDX_C'::h5lget_val_by_idx_c
+!!$         !DEC$ ENDIF
+!!$         INTEGER(HID_T), INTENT(IN) :: loc_id 
+!!$         CHARACTER(LEN=*), INTENT(IN) :: group_name
+!!$         INTEGER(SIZE_T)  :: group_namelen
+!!$         INTEGER, INTENT(IN) :: index_field
+!!$         INTEGER, INTENT(IN) :: order
+!!$         INTEGER(HSIZE_T), INTENT(IN) :: n
+!!$         INTEGER :: corder_valid
+!!$         INTEGER, INTENT(OUT) :: corder
+!!$         INTEGER, INTENT(OUT) :: cset
+!!$         INTEGER(HSIZE_T), INTENT(OUT) :: data_size
+!!$         INTEGER(HID_T) :: lapl_id_default
+!!$       END FUNCTION h5lget_val_by_idx_c
+!!$    END INTERFACE
+!!$
+!!$    group_namelen = LEN(group_name)
+!!$
+!!$    lapl_id_default = H5P_DEFAULT_F
+!!$    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+!!$
+!!$    hdferr = h5lget_info_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, &
+!!$         corder_valid, corder, cset, data_size, lapl_id_default)
+!!$
+!!$    f_corder_valid =.FALSE.
+!!$    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
+!!$    
+!!$  END SUBROUTINE h5lget_val_by_idx_f
+
+
+
+!----------------------------------------------------------------------
+! Name:		h5lget_val_f
+!
+! Purpose:  	Returns the value of a symbolic link.
+!
+! Inputs:  
+!   link_loc_id  - File or group identifier.
+!   link_name    - Link whose value is to be returned.
+!   size         - Maximum number of characters of link value to be returned.
+!
+! Outputs:  
+!   linkval_buff - The buffer to hold the returned link value.
+!         hdferr - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!    lapl_id      - List access property list identifier.
+!
+! Programmer:	M. S. Breitenfeld
+!		March 3, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+
+!!$  SUBROUTINE h5lget_val_f(link_loc_id, link_name, size, linkval_buff,   &
+!!$       hdferr, lapl_id) 
+!!$!This definition is needed for Windows DLLs
+!!$!DEC$if defined(BUILD_HDF5_DLL)
+!!$!DEC$attributes dllexport :: h5lget_val_f
+!!$!DEC$endif
+!!$    IMPLICIT NONE
+!!$    INTEGER(HID_T), INTENT(IN) :: link_loc_id  ! File or group identifier.
+!!$    CHARACTER(LEN=*), INTENT(IN) :: link_name  ! Link whose value is to be returned.
+!!$    INTEGER(SIZE_T), INTENT(IN) :: size        !  Maximum number of characters of link value to be returned.
+!!$    
+!!$    CHARACTER(LEN=size), INTENT(OUT) :: linkval_buff ! The buffer to hold the returned link value.
+!!$    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+!!$    ! 0 on success and -1 on failure
+!!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
+!!$    
+!!$    INTEGER :: link_namelen
+!!$    INTEGER(HID_T) :: lapl_id_default
+!!$    INTEGER :: corder_valid
+!!$
+!!$    INTEGER :: link_namelen 
+!!$    INTEGER(HID_T) :: lapl_id_default 
+!!$
+!!$!  MS FORTRAN needs explicit interface for C functions called here.
+!!$!
+!!$    INTERFACE
+!!$       INTEGER FUNCTION h5lget_val_c(link_loc_id, link_name, link_namelen, size, linkval_buff, &
+!!$            lapl_id_default)
+!!$         USE H5GLOBAL
+!!$         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+!!$         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LGET_VAL_C'::h5lget_val_c
+!!$         !DEC$ ENDIF
+!!$         INTEGER(HID_T), INTENT(IN) :: link_loc_id  ! File or group identifier.
+!!$         CHARACTER(LEN=*), INTENT(IN) :: link_name  ! Link whose value is to be returned.
+!!$         INTEGER :: link_namelen 
+!!$         INTEGER(SIZE_T), INTENT(IN) :: size        !  Maximum number of characters of link value to be returned.
+!!$         
+!!$         CHARACTER(LEN=size), INTENT(OUT) :: linkval_buff ! The buffer to hold the returned link value.
+!!$
+!!$         INTEGER :: link_namelen
+!!$         INTEGER(HID_T) :: lapl_id_default
+!!$
+!!$       END FUNCTION h5lget_val_c
+!!$    END INTERFACE
+!!$
+!!$    link_namelen = LEN(link_name)
+!!$
+!!$    lapl_id_default = H5P_DEFAULT_F
+!!$    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+!!$
+!!$    hdferr = h5lget_val_c(link_loc_id, link_name, link_namelen, size, linkval_buff, &
+!!$         lapl_id_default)
+!!$
+!!$  END SUBROUTINE h5lget_val_f
+
+
+
+!----------------------------------------------------------------------
+! Name:	    H5Lregistered_f 
+!
+! Purpose:  Registers user-defined link class or changes behavior of existing class.
+!		
+! Inputs: NOTE: In C the following represents struct H5L_class_t:
+!     version      - Version number of this struct 
+!     class_id     - Link class identifier          
+!     comment      - Comment for debugging          
+!     create_func  - Callback during link creation  
+!     move_func    - Callback after moving link     
+!     copy_func    - Callback after copying link    
+!     trav_func    - The main traversal function    
+!     del_func     - Callback for link deletion     
+!     query_func   - Callback for queries           
+!
+! Outputs:
+!           hdferr - Error code		
+!		       Success:  0
+!	               Failure: -1   
+! Optional parameters:
+!                      None		
+!
+! Programmer: M.S. Breitenfeld
+!	      February 29, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+!!$  SUBROUTINE H5Lregistered_f(version, class_id, comment, create_func, &
+!!$       move_func, copy_func, trav_func, del_func, query_func, hdferr) 
+!!$!This definition is needed for Windows DLLs
+!!$!DEC$if defined(BUILD_HDF5_DLL)
+!!$!DEC$attributes dllexport :: H5Lregistered_f
+!!$!DEC$endif
+!!$    IMPLICIT NONE
+!!$    INTEGER, INTENT(IN) :: version      ! Version number of this struct 
+!!$    INTEGER, INTENT(IN) :: class_id     ! Link class identifier          
+!!$    CHARACTER(LEN=*), INTENT(IN) :: comment      ! Comment for debugging          
+!!$    CHARACTER(LEN=*), INTENT(IN) :: create_func  ! Callback during link creation  
+!!$    CHARACTER(LEN=*), INTENT(IN) :: move_func    ! Callback after moving link     
+!!$    CHARACTER(LEN=*), INTENT(IN) :: copy_func    ! Callback after copying link    
+!!$    CHARACTER(LEN=*), INTENT(IN) :: trav_func    ! The main traversal function    
+!!$    CHARACTER(LEN=*), INTENT(IN) :: del_func     ! Callback for link deletion     
+!!$    CHARACTER(LEN=*), INTENT(IN) :: query_func   ! Callback for queries
+!!$    INTEGER, INTENT(OUT) :: hdferr      ! Error code:
+!!$                                        ! 0 on success and -1 on failure
+!!$    INTEGER :: comment_len 
+!!$    INTEGER :: create_func_len
+!!$    INTEGER :: move_func_len 
+!!$    INTEGER :: copy_func_len   
+!!$    INTEGER :: trav_func_len  
+!!$    INTEGER :: del_func_len
+!!$    INTEGER :: query_func_len
+!!$    
+!!$!
+!!$!  MS FORTRAN needs explicit interface for C functions called here.
+!!$!
+!!$    INTERFACE
+!!$       INTEGER FUNCTION H5Lregistered_c(version, class_id, comment, &
+!!$            create_func, create_func_len, &
+!!$            move_func, move_func_len, &
+!!$            copy_func, copy_func_len, &
+!!$            trav_func, trav_func_len, &
+!!$            del_func, del_func_len, &
+!!$            query_func,query_func_len)
+!!$         USE H5GLOBAL
+!!$         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+!!$         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LREGISTERED_C'::H5Lregistered_c
+!!$         !DEC$ ENDIF
+!!$         INTEGER, INTENT(IN) :: version      ! Version number of this struct 
+!!$         INTEGER, INTENT(IN) :: class_id     ! Link class identifier          
+!!$         CHARACTER(LEN=*), INTENT(IN) :: comment      ! Comment for debugging          
+!!$         CHARACTER(LEN=*), INTENT(IN) :: create_func  ! Callback during link creation  
+!!$         CHARACTER(LEN=*), INTENT(IN) :: move_func    ! Callback after moving link     
+!!$         CHARACTER(LEN=*), INTENT(IN) :: copy_func    ! Callback after copying link    
+!!$         CHARACTER(LEN=*), INTENT(IN) :: trav_func    ! The main traversal function    
+!!$         CHARACTER(LEN=*), INTENT(IN) :: del_func     ! Callback for link deletion     
+!!$         CHARACTER(LEN=*), INTENT(IN) :: query_func   ! Callback for queries
+!!$         INTEGER, INTENT(OUT) :: hdferr   ! Error code:
+!!$                                          ! 0 on success and -1 on failure
+!!$         INTEGER :: comment_len 
+!!$         INTEGER :: create_func_len
+!!$         INTEGER :: move_func_len 
+!!$         INTEGER :: copy_func_len   
+!!$         INTEGER :: trav_func_len  
+!!$         INTEGER :: del_func_len
+!!$         INTEGER :: query_func_len
+!!$         
+!!$       END FUNCTION H5Lregistered_c
+!!$    END INTERFACE
+!!$
+!!$    comment_len     = LEN(comment)
+!!$    create_func_len = LEN(create_func)
+!!$    move_func_len   = LEN(move_func)
+!!$    copy_func_len   = LEN(copy_func)  
+!!$    trav_func_len   = LEN(trav_func)  
+!!$    del_func_len    = LEN(del_func)
+!!$    query_func_len  = LEN(query_func)
+!!$
+!!$    hdferr = H5Lregistered_c(version, class_id, comment, &
+!!$         create_func, create_func_len, &
+!!$         move_func, move_func_len, &
+!!$         copy_func, copy_func_len, &
+!!$         trav_func, trav_func_len, &
+!!$         del_func, del_func_len, &
+!!$         query_func, query_func_len)
+!!$    
+!!$  END SUBROUTINE H5Lregistered_f
+
+END MODULE H5L
diff --git a/fortran/src/H5Of.c b/fortran/src/H5Of.c
new file mode 100644
index 0000000..9a708da
--- /dev/null
+++ b/fortran/src/H5Of.c
@@ -0,0 +1,99 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+ * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* This files contains C stubs for H5O Fortran APIs */
+
+#include "H5f90.h"
+#include "H5Eprivate.h"
+
+/*----------------------------------------------------------------------------
+ * Name:        h5olink_c
+ * Purpose:     Calls H5Olink
+ * Inputs:   
+ *      object_id        - Object to be linked.
+ *      new_loc_id       - File or group identifier specifying location at which object is to be linked.
+ *      name             - Name of link to be created, relative to new_loc_id.
+ *      namelen          - Length of buffer for link to be created.
+ *      lcpl_id          - Link creation property list identifier.
+ *      lapl_id          - Link access property list identifier.
+ * Outputs:
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              April 21, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5olink_c (hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, size_t_f *namelen,
+            hid_t_f *lcpl_id, hid_t_f *lapl_id)
+{
+  char *c_name = NULL;          /* Buffer to hold C string */
+  int_f ret_value = 0;          /* Return value */
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if( (c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Olink function.
+   */
+  if((hid_t_f)H5Olink((hid_t)*object_id, (hid_t)*new_loc_id, c_name, 
+		       (hid_t)*lcpl_id, (hid_t)*lapl_id) < 0)
+    HGOTO_DONE(FAIL);
+
+ done:
+  if(c_name)
+    HDfree(c_name);
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5oopen_c
+ * Purpose:     Calls H5Oopen
+ * Inputs:      loc_id  - File or group identifier
+ *	        name    - Attribute access property list
+ *              namelen - Size of name
+ *              lapl_id - Link access property list
+ * Outputs:     obj_id  - Dataset identifier
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              April 18, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5oopen_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, hid_t_f *obj_id)
+{
+  char *c_name = NULL;          /* Buffer to hold C string */
+  int_f ret_value = 0;          /* Return value */
+
+  /*
+   * Convert FORTRAN name to C name
+   */
+  if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+    HGOTO_DONE(FAIL);
+
+  /*
+   * Call H5Oopen function.
+   */
+  if((*obj_id = (hid_t_f)H5Oopen((hid_t)*loc_id, c_name, (hid_t)*lapl_id)) < 0)
+    HGOTO_DONE(FAIL);
+
+ done:
+  if(c_name)
+    HDfree(c_name);
+  return ret_value;
+}
+
diff --git a/fortran/src/H5Off.f90 b/fortran/src/H5Off.f90
new file mode 100644
index 0000000..c64b82d
--- /dev/null
+++ b/fortran/src/H5Off.f90
@@ -0,0 +1,163 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!   Copyright by The HDF Group.                                               *
+!   Copyright by the Board of Trustees of the University of Illinois.         *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
+!   of the source code distribution tree; Copyright.html can be found at the  *
+!   root level of an installed copy of the electronic HDF5 document set and   *
+!   is linked from the top-level documents page.  It can also be found at     *
+!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+!   access to either file, you may request a copy from help@hdfgroup.org.     *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!
+!
+! This file contains Fortran90 interfaces for H5O functions.
+!
+MODULE H5O
+       
+  USE H5GLOBAL
+     
+CONTAINS
+
+!----------------------------------------------------------------------
+! Name:		h5olink_f 
+!
+! Purpose:  	Creates a hard link to an object in an HDF5 file.
+!
+! Inputs:  
+!      object_id     - Object to be linked.
+!      new_loc_id    - File or group identifier specifying location at which object is to be linked.
+!      new_link_name - Name of link to be created, relative to new_loc_id.
+! Outputs: 
+!      hdferr:       - error code		
+!	                Success:  0
+!			Failure: -1   
+! Optional parameters:
+!      lcpl_id       - Link creation property list identifier.
+!      lapl_id       - Link access property list identifier.
+!
+! Programmer:	M.S. Breitenfeld
+!		April 21, 2008
+!
+! Modifications: N/A 
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5olink_f(object_id, new_loc_id, new_link_name, hdferr, lcpl_id, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5olink_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: object_id  ! Object to be linked
+    INTEGER(HID_T), INTENT(IN) :: new_loc_id ! File or group identifier specifying 
+                                             ! location at which object is to be linked.
+    CHARACTER(LEN=*), INTENT(IN) :: new_link_name ! Name of link to be created, relative to new_loc_id.
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code 		
+                                          !   Success:  0
+                                          !   Failure: -1  
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier.  
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link creation property list identifier.
+    INTEGER(HID_T) :: lapl_id_default
+    INTEGER(HID_T) :: lcpl_id_default
+
+    INTEGER(SIZE_T) :: new_link_namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5olink_c(object_id, new_loc_id, new_link_name, new_link_namelen, &
+            lcpl_id_default, lapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5OLINK_C'::h5olink_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: object_id
+         INTEGER(HID_T), INTENT(IN) :: new_loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: new_link_name
+         INTEGER(SIZE_T) :: new_link_namelen
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(HID_T) :: lcpl_id_default
+       END FUNCTION h5olink_c
+    END INTERFACE
+
+    new_link_namelen = LEN(new_link_name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+    lcpl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+
+    hdferr = h5olink_c(object_id, new_loc_id, new_link_name, new_link_namelen, &
+         lcpl_id_default, lapl_id_default)
+
+  END SUBROUTINE h5olink_f
+
+!----------------------------------------------------------------------
+! Name:		h5oopen_f 
+!
+! Purpose:  	Opens an object in an HDF5 file by location identifier and path name.O
+!
+! Inputs:  
+!           loc_id - File or group identifier
+!             name - Path to the object, relative to loc_id.
+! Outputs: 
+!           obj_id - Object identifier for the opened object 
+!      hdferr:     - error code		
+!	                Success:  0
+!			Failure: -1   
+! Optional parameters:
+!          lapl_id - Access property list identifier for the link pointing to the object
+!
+! Programmer:	M.S. Breitenfeld
+!		April 18, 2008
+!
+! Modifications: N/A 
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5oopen_f(loc_id, name, obj_id, hdferr, lapl_id) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5oopen_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier
+    CHARACTER(LEN=*), INTENT(IN) :: name  ! Path to the object, relative to loc_id
+    INTEGER(HID_T), INTENT(OUT) :: obj_id ! Object identifier for the opened object
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code 		
+                                          !   Success:  0
+                                          !   Failure: -1  
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Attribute access property list
+    INTEGER(HID_T) :: lapl_id_default
+
+    INTEGER(SIZE_T) :: namelen
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5oopen_c(loc_id, name, namelen, lapl_id_default, obj_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5OOPEN_C'::h5oopen_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: name
+         INTEGER(HID_T) :: lapl_id_default
+         INTEGER(SIZE_T) :: namelen
+         INTEGER(HID_T), INTENT(OUT) :: obj_id
+       END FUNCTION h5oopen_c
+    END INTERFACE
+
+    namelen = LEN(name)
+
+    lapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
+
+    hdferr = h5oopen_c(loc_id, name, namelen, lapl_id_default, obj_id)
+
+  END SUBROUTINE h5oopen_f
+
+
+END MODULE H5O
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index f674530..ea7a4bb 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -1,3 +1,4 @@
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
  * Copyright by the Board of Trustees of the University of Illinois.         *
@@ -17,7 +18,6 @@
 
 #include "H5f90.h"
 
-
 /*----------------------------------------------------------------------------
  * Name:        h5pcreate_c
  * Purpose:     Call H5Pcreate to create a property list
@@ -2710,16 +2710,20 @@ int_f
 nh5pget_class_name_c(hid_t_f *class, _fcd name, int_f *name_len)
 {
      int_f ret_value = -1;
-     hid_t c_class;
-     char* c_name;
-
+     char *c_name = NULL;          /* Buffer to hold C string */
+     size_t c_size;
 
-     c_class = (hid_t)*class;
+     c_size = (size_t)*name_len + 1;
+     /*
+      * Allocate buffer to hold name
+      */
+     if ((c_name = HDmalloc(c_size)) == NULL)
+       goto DONE;
      /*
       * Call H5Pget_class_name function.
       */
-     c_name = H5Pget_class_name(c_class);
-     if( c_name == NULL) goto DONE;
+     c_name = H5Pget_class_name((hid_t)*class);
+     if(c_name == NULL) goto DONE;
 
      HD5packFstring(c_name, _fcdtocp(name), (size_t)*name_len);
      ret_value = (int_f)HDstrlen(c_name);
@@ -3131,7 +3135,7 @@ nh5pset_fapl_multi_sc ( hid_t_f *prp_id , int_f *flag)
  */
 
   status = H5Pset_fapl_multi(c_prp_id, NULL, NULL, NULL, NULL, relax);
-  if ( status < 0  ) return ret_value;
+  if ( status < 0  ) return ret_value; /* error occurred */
   ret_value = 0;
   return ret_value;
 }
@@ -3414,3 +3418,1017 @@ DONE:
      return ret_value;
 }
 
+/*----------------------------------------------------------------------------
+ * Name:        h5pget_attr_phase_change_c
+ * Purpose:     Calls H5Pget_attr_phase_change
+ *
+ * Inputs:      ocpl_id		- Object (dataset or group) creation property list identifier
+ * Outputs      max_compact     - Maximum number of attributes to be stored in compact storage
+ *              min_dense       - Minimum number of attributes to be stored in dense storage
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pget_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense )
+{
+  int ret_value = -1;
+  hid_t c_ocpl_id;
+  unsigned c_max_compact;
+  unsigned c_min_dense;
+  herr_t ret;
+  /*
+   * Call H5Pget_attr_phase_change function.
+   */
+  c_ocpl_id = (hid_t)*ocpl_id;
+  ret = H5Pget_attr_phase_change(c_ocpl_id, &c_max_compact,&c_min_dense);
+  if (ret < 0) return ret_value;
+
+  *max_compact = (int_f)c_max_compact;
+  *min_dense = (int_f)c_min_dense;
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_attr_creation_order_c 
+ * Purpose:     Calls H5Ppset_attr_creation_order
+ *
+ * Inputs:      ocpl_id		- Object (dataset or group) creation property list identifier
+ * Outputs      crt_order_flags - Flags specifying whether to track and index attribute creation order
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags )
+{
+  int ret_value = -1;
+  unsigned c_crt_order_flags;
+  herr_t ret;
+  /*
+   * Call h5pset_attr_creation_order function.
+   */
+  c_crt_order_flags = (unsigned)*crt_order_flags;
+  ret = H5Pset_attr_creation_order((hid_t)*ocpl_id, c_crt_order_flags);
+  if (ret < 0) return ret_value;
+
+  *crt_order_flags = (int_f)c_crt_order_flags;
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_shared_mesg_nindexes_c
+ * Purpose:     Calls h5pset_shared_mesg_nindexes
+ *
+ * Inputs:
+ *       plist_id - file creation property list
+ *       nindexes - Number of shared object header message indexes 
+ *                   available in files created WITH this property list 
+ * 
+ * Outputs:     
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes )
+{
+  int ret_value = -1;
+  hid_t c_plist_id;
+  unsigned c_nindexes;
+  herr_t ret;
+  /*
+   * Call h5pset_shared_mesg_nindexes function.
+   */
+  c_plist_id = (hid_t)*plist_id;
+  c_nindexes = (unsigned)*nindexes;
+  ret = H5Pset_shared_mesg_nindexes(c_plist_id, c_nindexes );
+  if (ret < 0) return ret_value;
+
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_shared_mesg_index_c
+ * Purpose:     Calls H5Pset_shared_mesg_index
+ *
+ * Inputs:
+ *            fcpl_id - File creation property list identifier.
+ *          index_num - Index being configured.
+ *    mesg_type_flags - Types of messages that should be stored in this index.
+ *      min_mesg_size - Minimum message size.
+ * 
+ * Outputs:     
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              January, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_shared_mesg_index_c(hid_t_f *fcpl_id, int_f *index_num, int_f *mesg_type_flags, int_f *min_mesg_size)
+{
+  int ret_value = -1;
+  herr_t ret;
+  /*
+   * Call h5pset_shared_mesg_index function.
+   */
+  ret = H5Pset_shared_mesg_index((hid_t)*fcpl_id,(unsigned)*index_num, (unsigned)*mesg_type_flags, (unsigned)*min_mesg_size);
+  if (ret < 0) return ret_value;
+
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pget_attr_creation_order_c
+ * Purpose:     Calls H5Pget_attr_creation_order
+ *
+ * Inputs:
+ *           ocpl_id - Object (group or dataset) creation property list identifier
+ * Outputs:
+ *           crt_order_flags - Flags specifying whether to track and index attribute creation order
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags)
+{
+  int ret_value = -1;
+  herr_t ret;
+
+  unsigned c_crt_order_flags;
+  /*
+   * Call h5pget_attr_creation_order function.
+   */
+
+  ret = H5Pget_attr_creation_order((hid_t)*ocpl_id, &c_crt_order_flags);
+  if (ret < 0) return ret_value;
+
+  *crt_order_flags = (int_f)c_crt_order_flags;
+
+  ret_value = 0;
+  return ret_value;
+}
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_libver_bounds_c
+ * Purpose:     Calls H5Pset_libver_bounds
+ *
+ * Inputs:
+ *             fapl_id - File access property list identifier
+ *                 low - The earliest version of the library that will be used for writing objects.
+ *                high - The latest version of the library that will be used for writing objects.
+ * Outputs:
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 18, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_libver_bounds_c(hid_t_f *fapl_id, int_f *low, int_f *high )
+{
+  int ret_value = -1;
+  herr_t ret;
+
+  /*
+   * Call H5Pset_libver_bounds function.
+   */
+  ret = H5Pset_libver_bounds( (hid_t)*fapl_id, (H5F_libver_t)*low, (H5F_libver_t)*high );
+  if (ret < 0) return ret_value;
+
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_link_creation_order_c
+ * Purpose:     Calls H5Pset_link_creation_order
+ *
+ * Inputs:      gcpl_id		- Group creation property list identifier
+ *              crt_order_flags - Creation order flag(s)
+ * Outputs:
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 18, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags )
+{
+  int ret_value = -1;
+  herr_t ret;
+  /*
+   * Call H5Pset_link_creation_order function.
+   */
+  ret = H5Pset_link_creation_order((hid_t)*gcpl_id, (unsigned)*crt_order_flags);
+  if (ret < 0) return ret_value;
+
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pget_link_phase_change_c
+ * Purpose:     Calls H5Pget_link_phase_change
+ *
+ * Inputs:      gcpl_id  	- Group creation property list identifier
+ * Outputs      max_compact     - Maximum number of attributes to be stored in compact storage
+ *              min_dense       - Minimum number of attributes to be stored in dense storage
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 20, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pget_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense )
+{
+  int ret_value = -1;
+  unsigned c_max_compact;
+  unsigned c_min_dense;
+  herr_t ret;
+
+  /*
+   * Call H5Pget_link_phase_change function.
+   */
+  ret = H5Pget_link_phase_change((hid_t)*gcpl_id, &c_max_compact,&c_min_dense);
+  if (ret < 0) return ret_value;
+
+  *max_compact = (int_f)c_max_compact;
+  *min_dense = (int_f)c_min_dense;
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pget_obj_track_times_c
+ * Purpose:     Call H5Pget_obj_track_times
+ *
+ * Inputs:      plist_id - property list id
+ * Outputs:
+ *              flag     - TRUE/FALSE flag
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 22, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5pget_obj_track_times_c(hid_t_f *plist_id, int_f *flag)
+{
+  int ret_value = -1;
+  hbool_t c_track_times=0;
+  herr_t ret;
+
+  /*
+   * Call H5Pget_obj_track_times function.
+   */
+  ret = H5Pget_obj_track_times((hid_t)*plist_id, &c_track_times);
+
+  if (ret < 0) return ret_value; /* error occurred */
+
+  *flag = 0;
+  if(c_track_times > 0) *flag = 1;
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_obj_track_times_c
+ * Purpose:     Call H5Pset_obj_track_times
+ *
+ * Inputs:      plist_id - property list id
+ *              flag     - TRUE/FALSE flag
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 22, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag)
+{
+  int ret_value = -1;
+  hbool_t c_track_times;
+  herr_t ret;
+
+
+  c_track_times = (hbool_t)*flag;
+
+  /*
+   * Call H5Pset_obj_track_times function.
+   */
+  ret = H5Pset_obj_track_times((hid_t)*plist_id, c_track_times);
+
+  if (ret < 0) return ret_value; /* error occurred */
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_create_inter_group_c
+ * Purpose:     Calls H5Pset_create_intermediate_group
+ *
+ * Inputs:   
+ *		lcpl_id - Link creation property list identifier
+ *   crt_intermed_group - crt_intermed_group specifying whether 
+ *                        to create intermediate groups upon the 
+ *                        creation of an object
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 22, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5pset_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group)
+{
+  int ret_value = -1;
+  herr_t ret;
+
+  /*
+   * Call H5Pset_create_intermediate_group function.
+   */
+  ret = H5Pset_create_intermediate_group((hid_t)*lcpl_id, (unsigned)*crt_intermed_group);
+
+  if (ret < 0) return ret_value; /* error occurred */
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pget_link_creation_order_c
+ * Purpose:     Calls H5Pget_link_creation_order
+ *
+ * Inputs:
+ *           gcpl_id - Group creation property list identifier
+ * Outputs:
+ *           crt_order_flags - Creation order flag(s)
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 3, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pget_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags)
+{
+  int ret_value = -1;
+  herr_t ret;
+
+  unsigned c_crt_order_flags;
+  /*
+   * Call h5pget_link_creation_order function.
+   */
+
+  ret = H5Pget_link_creation_order((hid_t)*gcpl_id, &c_crt_order_flags);
+  if (ret < 0) return ret_value;
+
+  *crt_order_flags = (int_f)c_crt_order_flags;
+
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:     h5pset_char_encoding_c
+ * Purpose:  Calls H5Pset_char_encoding
+ *
+ * Inputs:
+ *           plist_id - Property list identifier
+ *           encoding - String encoding character set:
+ *     	                     H5T_CSET_ASCII_F -> US ASCII
+ *     	                     H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
+ * Outputs:  NONE
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 3, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_char_encoding_c(hid_t_f *plist_id, int_f *encoding)
+{
+  int ret_value = -1;
+  herr_t ret;
+
+  /*
+   * Call H5Pset_char_encoding function.
+   */
+  ret = H5Pset_char_encoding((hid_t)*plist_id, (H5T_cset_t)*encoding);
+  if (ret < 0) return ret_value;
+
+  ret_value = 0;
+  return ret_value;
+}
+
+
+/*----------------------------------------------------------------------------
+ * Name:     h5pget_char_encoding_c
+ * Purpose:  Calls H5Pget_char_encoding
+ *
+ * Inputs:
+ *           plist_id - Property list identifier
+ * Outputs:
+ *           encoding - Encoding character set:
+ *     	                  H5T_CSET_ASCII_F -> US ASCII
+ *     	                  H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 3, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding)
+{
+  int ret_value = -1;
+  H5T_cset_t c_encoding;
+  herr_t ret;
+  /*
+   * Call H5Pget_char_encoding function.
+   */
+  ret = H5Pget_char_encoding((hid_t)*plist_id, &c_encoding);
+  if (ret < 0) return ret_value;
+  
+  *encoding = (int_f)c_encoding;
+  
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:     h5pset_copy_object_c
+ * Purpose:  Calls H5Pset_copy_object
+ *
+ * Inputs:
+ *    ocp_plist_id - Object copy property list identifier
+ *    copy_options - Copy option(s) to be set
+ *
+ * Outputs:
+ *            NONE
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 3, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
+{
+  int ret_value = -1;
+  herr_t ret;
+  /*
+   * Call H5Pset_copy_object function.
+   */
+  ret = H5Pset_copy_object((hid_t)*ocp_plist_id, (unsigned)*copy_options);
+  if (ret < 0) return ret_value;
+  
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:     h5pget_copy_object_c
+ * Purpose:  Calls H5Pget_copy_object
+ *
+ * Inputs:
+ *    ocp_plist_id - Object copy property list identifier
+ *
+ * Outputs:
+ *    copy_options - Copy option(s) to be get
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 3, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
+{
+  int ret_value = -1;
+  unsigned c_copy_options;
+  herr_t ret;
+  /*
+   * Call H5Pget_copy_object function.
+   */
+  ret = H5Pget_copy_object((hid_t)*ocp_plist_id, &c_copy_options);
+  if (ret < 0) return ret_value;
+
+  *copy_options = (int_f)c_copy_options;
+  
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pget_data_transform_c
+ * Purpose:     Calls H5Pget_data_transform
+ * Inputs:      
+ *              prp_id - property list identifier to query
+ *      expression_len - buffer size transorm expression
+ *
+ * Output:      
+ *          expression - buffer to hold transform expression
+ *
+ * Returns:     
+ *          Success:  0
+ *	    Failure: -1
+ *
+ * Programmer:  M.S. Breitenfeld
+ *              March 19, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len, size_t_f *size)
+{
+     int_f ret_value = -1;
+     char *c_expression = NULL;          /* Buffer to hold C string */
+     size_t c_expression_len;
+     ssize_t ret;
+
+
+     c_expression_len = (size_t)*expression_len + 1;
+
+     /* should expression_len be size_t_f? */
+     /*
+      * Allocate memory to store the expression.
+      */
+     if( c_expression_len) c_expression = (char*) HDmalloc(c_expression_len);
+     if (c_expression == NULL) return ret_value;
+
+     /*
+      * Call h5pget_data_transform function.
+      */
+     ret = H5Pget_data_transform((hid_t)*plist_id, c_expression, c_expression_len);
+     if(ret < 0) return ret_value;
+     /* or strlen ? */
+     HD5packFstring(c_expression, _fcdtocp(expression), c_expression_len-1);
+     
+     *size = (size_t_f)ret;
+
+     ret_value = 0;
+     return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_data_transform_c
+ * Purpose:     Calls H5Pset_data_transform
+ * Inputs:      
+ *              prp_id - property list identifier to query      
+ *          expression - buffer to hold transform expression
+ *      expression_len - buffer size transorm expression
+ *
+ * Output:
+ *
+ * Returns:     
+ *          Success:  0
+ *	    Failure: -1
+ *
+ * Programmer:  M.S. Breitenfeld
+ *              March 19, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len)
+{
+     int_f ret_value = -1; /* Return value */
+     char* c_expression = NULL; /* Buffer to hold C string */
+     herr_t ret;
+     /*
+      * Convert FORTRAN name to C name
+      */
+     if(NULL == (c_expression = HD5f2cstring(expression, (size_t)*expression_len)))
+        return ret_value;
+     /*
+      * Call h5pset_data_transform function.
+      */
+     ret = H5Pset_data_transform((hid_t)*plist_id, c_expression);
+     if(ret<0) return ret_value;
+
+     ret_value = 0;
+     if(c_expression)
+       HDfree(c_expression);
+
+     return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pget_local_heap_size_hint_c
+ * Purpose:     Calls H5Pget_local_heap_size_hint
+ * Inputs: 
+ *         gcpl_id - Group creation property list identifier
+ *
+ * Output:
+ *       size_hint - Hint for size of local heap
+ * Returns:     
+ *          Success:  0
+ *	    Failure: -1
+ *
+ * Programmer:  M.S. Breitenfeld
+ *              March 21, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint)
+{
+     int_f ret_value = -1; /* Return value */
+     size_t c_size_hint;
+     herr_t ret;
+     /*
+      * Call H5Pget_local_heap_size_hint function.
+      */
+     ret = H5Pget_local_heap_size_hint((hid_t)*gcpl_id, &c_size_hint);
+     if(ret<0) return ret_value;
+
+     *size_hint = (size_t_f)c_size_hint;
+     ret_value = 0;
+     return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pget_est_link_info_c
+ * Purpose:     Calls H5Pget_est_link_info
+ * Inputs: 
+ *              gcpl_id - Group creation property list identifier
+ *
+ * Output: 
+ *      est_num_entries - Estimated number of links to be inserted into group
+ *         est_name_len - Estimated average length of link names
+ * Returns:     
+ *          Success:  0
+ *	    Failure: -1
+ *
+ * Programmer:  M.S. Breitenfeld
+ *              March 21, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len)
+{
+     int_f ret_value = -1; /* Return value */
+     unsigned c_est_num_entries;
+     unsigned c_est_name_len;
+     herr_t ret;
+     /*
+      * Call h5pget_est_link_info function.
+      */
+     ret = H5Pget_est_link_info((hid_t)*gcpl_id, &c_est_num_entries, &c_est_name_len);
+     if(ret<0) return ret_value;
+
+     *est_num_entries = (int_f)c_est_num_entries;
+     *est_name_len = (int_f)c_est_name_len;
+
+     ret_value = 0;
+     return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_local_heap_size_hint_c
+ * Purpose:     Calls H5Pset_local_heap_size_hint
+ * Inputs: 
+ *         gcpl_id - Group creation property list identifier
+ *       size_hint - Hint for size of local heap
+ *
+ * Output:
+ *
+ * Returns:     
+ *          Success:  0
+ *	    Failure: -1
+ *
+ * Programmer:  M.S. Breitenfeld
+ *              March 21, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint)
+{
+     int_f ret_value = -1; /* Return value */
+     herr_t ret;
+     /*
+      * Call H5Pget_local_heap_size_hint function.
+      */
+     ret = H5Pset_local_heap_size_hint((hid_t)*gcpl_id, (size_t)*size_hint);
+     if(ret<0) return ret_value;
+
+     ret_value = 0;
+     return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_est_link_info_c
+ * Purpose:     Calls H5Pset_est_link_info
+ * Inputs: 
+ *              gcpl_id - Group creation property list identifier 
+ *      est_num_entries - Estimated number of links to be inserted into group
+ *         est_name_len - Estimated average length of link names
+ *
+ * Output:
+ * Returns:     
+ *          Success:  0
+ *	    Failure: -1
+ *
+ * Programmer:  M.S. Breitenfeld
+ *              March 21, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len)
+{
+     int_f ret_value = -1; /* Return value */
+     herr_t ret;
+     /*
+      * Call h5pset_est_link_info function.
+      */
+     ret = H5Pset_est_link_info((hid_t)*gcpl_id, (unsigned)*est_num_entries, (unsigned)*est_name_len);
+     if(ret<0) return ret_value;
+
+     ret_value = 0;
+     return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_link_phase_change_c
+ * Purpose:     Calls H5Pset_link_phase_change
+ *
+ * Inputs:      gcpl_id     - Group creation property list identifier   
+ *              max_compact - Maximum number of attributes to be stored in compact storage
+ *              min_dense   - Minimum number of attributes to be stored in dense storage
+ * Outputs
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 21, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense )
+{
+  int ret_value = -1;
+  herr_t ret;
+
+  /*
+   * Call H5Pset_link_phase_change function.
+   */
+  ret = H5Pset_link_phase_change((hid_t)*gcpl_id, (unsigned)*max_compact,(unsigned)*min_dense);
+  if (ret < 0) return ret_value;
+
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_fapl_direct_c
+ * Purpose:     Calls H5Pset_fapl_direct
+ *
+ * Inputs:   
+ *    fapl_id 	 - File access property list identifier
+ *    alignment  - Required memory alignment boundary
+ *    block_size - File system block size
+ *    cbuf_size  - Copy buffer size
+ * Outputs
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 21, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size )
+{
+  int ret_value = -1;
+  herr_t ret;
+
+  /*
+   * Call H5Pset_link_phase_change function.
+   */
+#ifdef H5_HAVE_DIRECT
+  ret = H5Pset_fapl_direct((hid_t)*fapl_id, (size_t)*alignment, (size_t)*block_size, (size_t)*cbuf_size );
+    if (ret < 0) return ret_value;
+
+  ret_value = 0;
+
+#endif
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pget_fapl_direct_c
+ * Purpose:     Calls H5Pget_fapl_direct
+ *
+ * Inputs:   
+ *    fapl_id 	 - File access property list identifier
+ * Outputs:
+ *    alignment  - Required memory alignment boundary
+ *    block_size - File system block size
+ *    cbuf_size  - Copy buffer size
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 21, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pget_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size )
+{
+  int ret_value = -1;
+  herr_t ret;
+  size_t c_alignment;
+  size_t c_block_size;
+  size_t c_cbuf_size;
+
+  /*
+   * Call H5Pget_link_phase_change function.
+   */
+#ifdef H5_HAVE_DIRECT
+  ret = H5Pget_fapl_direct((hid_t)*fapl_id, &c_alignment, &c_block_size, &c_cbuf_size );
+  if (ret < 0) return ret_value;
+  
+  *alignment  = (size_t_f)c_alignment;
+  *block_size = (size_t_f)c_block_size;
+  *cbuf_size  = (size_t_f)c_cbuf_size;
+
+  ret_value = 0;
+#endif
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_attr_phase_change_c
+ * Purpose:     Calls H5Pset_attr_phase_change
+ *
+ * Inputs:      ocpl_id		- Object (dataset or group) creation property list identifier  
+ *              max_compact     - Maximum number of attributes to be stored in compact storage
+ *              min_dense       - Minimum number of attributes to be stored in dense storage
+ * Outputs:
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 21, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense )
+{
+  int ret_value = -1;
+  herr_t ret;
+  /*
+   * Call H5Pset_attr_phase_change function.
+   */
+  ret = H5Pset_attr_phase_change((hid_t)*ocpl_id, (unsigned)*max_compact,(unsigned)*min_dense);
+  if (ret < 0) return ret_value;
+
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_nbit_c 
+ * Purpose:     Calls H5Pset_nbit
+ *
+ * Inputs:      plist_id - Dataset creation property list identifier
+ * Outputs:
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 21, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_nbit_c(hid_t_f *plist_id )
+{
+  int ret_value = -1;
+  herr_t ret;
+  /*
+   * Call H5Pset_nbit_change function.
+   */
+  ret = H5Pset_nbit((hid_t)*plist_id);
+  if (ret < 0) return ret_value;
+
+  ret_value = 0;
+  return ret_value;
+}
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_scaleoffset_c 
+ * Purpose:     Calls H5Pset_scaleoffset
+ *
+ * Inputs:    
+ *      plist_id - Dataset creation property list identifier
+ *    scale_type - Flag indicating compression method.
+ *  scale_factor - Parameter related to scale.
+ * Outputs:
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 21, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor )
+{
+  int ret_value = -1;
+  H5Z_SO_scale_type_t c_scale_type;
+  herr_t ret;
+  /*
+   * Call H5Pset_scaleoffset_change function.
+   */
+  c_scale_type = (H5Z_SO_scale_type_t)*scale_type;
+
+  ret = H5Pset_scaleoffset((hid_t)*plist_id, c_scale_type, (int)*scale_factor);
+  if (ret < 0) return ret_value;
+
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pset_nlinks
+ * Purpose:     Calls H5Pset_nlinks 
+ *
+ * Inputs:   
+ *            lapl_id - File access property list identifier
+ *             nlinks - Maximum number of links to traverse
+ * Outputs:
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 24, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks)
+{
+  int ret_value = -1;
+  herr_t ret;
+  /*
+   * Call H5Pset_nlinks function.
+   */
+  ret = H5Pset_nlinks((hid_t)*lapl_id, (size_t)*nlinks);
+  if (ret < 0) return ret_value;
+
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pget_nlinks
+ * Purpose:     Calls H5Pget_nlinks 
+ *
+ * Inputs:   
+ *            lapl_id - File access property list identifier
+ *
+ * Outputs:
+ *             nlinks - Maximum number of links to traverse
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 24, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks)
+{
+  int ret_value = -1;
+  herr_t ret;
+  size_t c_nlinks;
+  /*
+   * Call H5Pget_nlinks function.
+   */
+  ret = H5Pget_nlinks((hid_t)*lapl_id, &c_nlinks);
+  if (ret < 0) return ret_value;
+
+  *nlinks = (size_t_f)c_nlinks;
+  ret_value = 0;
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5pget_create_inter_group_c
+ * Purpose:     Calls H5Pget_create_intermediate_group
+ *
+ * Inputs:   
+ *		lcpl_id - Link creation property list identifier
+ *   crt_intermed_group - Specifying whether to create intermediate groups upon 
+ *                        the creation of an object
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              April 4, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5pget_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group)
+{
+  int ret_value = -1;
+  herr_t ret;
+
+  /*
+   * Call H5Pget_create_intermediate_group function.
+   */
+  ret = H5Pget_create_intermediate_group((hid_t)*lcpl_id, (unsigned)*crt_intermed_group);
+
+  if (ret < 0) return ret_value; /* error occurred */
+  ret_value = 0;
+  return ret_value;
+}
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index 1c1fb90..ed935e9 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -1943,7 +1943,7 @@
 
             hdferr = h5pget_fapl_core_c(prp_id, increment, backing_store_flag)
             backing_store =.FALSE.
-            if (backing_store_flag .eq. 1) backing_store =.TRUE.
+            IF (backing_store_flag .EQ. 1) backing_store =.TRUE.
           END SUBROUTINE h5pget_fapl_core_f
 
 !----------------------------------------------------------------------
@@ -4665,19 +4665,18 @@
 !----------------------------------------------------------------------
 ! Name:		h5pget_class_name_f 
 !
-! Purpose: 	Queries the ithe name of a class.
+! Purpose: 	Queries the name of a class.
 !
 ! Inputs:  
 !		prp_id		- property list identifier to query
 ! Outputs:  
 !		name 		- name of a class
-!		hdferr:		- error code		
-!                                       
-!				 	Success:  Actual lenght of the class name
-!                                                 If provided buffer "name" is 
-!                                                 smaller, than name will be 
-!                                                 truncated to fit into
-!                                                 provided user buffer
+!               size            - Actual length of the class name
+!                                 If provided buffer "name" is smaller,
+!                                 than name will be truncated to fit into
+!                                 provided user buffer
+!		hdferr:		- error code
+!				 	Success: 0
 !				 	Failure: -1   
 ! Optional parameters:
 !				NONE
@@ -4685,12 +4684,12 @@
 ! Programmer:	Elena Pourmal
 !	        October 9, 2002	
 !
-! Modifications: 	
+! Modifications: Returned the size of name as an argument	
 !
 ! Comment:		
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_class_name_f(prp_id, name, hdferr) 
+          SUBROUTINE h5pget_class_name_f(prp_id, name, size, hdferr) 
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4699,7 +4698,9 @@
 !
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
-            CHARACTER(LEN=*), INTENT(INOUT) :: name  ! Buffer to retireve class name
+            CHARACTER(LEN=*), INTENT(OUT) :: name  ! Buffer to retireve class name
+            
+            INTEGER, INTENT(OUT) :: size ! Actual length of the class name
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
             INTEGER :: name_len
 
@@ -4715,8 +4716,13 @@
               INTEGER, INTENT(IN)         :: name_len
               END FUNCTION h5pget_class_name_c
             END INTERFACE
+
             name_len = LEN(name)
-            hdferr = h5pget_class_name_c(prp_id, name , name_len)
+            size = h5pget_class_name_c(prp_id, name, name_len)
+
+            hdferr = 0
+            IF(size.LT.0) hdferr = -1
+
           END SUBROUTINE h5pget_class_name_f
 
 !----------------------------------------------------------------------
@@ -6387,4 +6393,1764 @@
             hdferr = h5premove_filter_c(prp_id, filter)
           END SUBROUTINE h5premove_filter_f
 
-     END MODULE H5P
+!----------------------------------------------------------------------
+! Name:		H5Pget_attr_phase_change_f 
+!
+! Purpose: 	Retrieves attribute storage phase change thresholds 
+!
+! Inputs:  
+!		ocpl_id		- Object (dataset or group) creation property list identifier
+! Outputs:  
+!               max_compact     - Maximum number of attributes to be stored in compact storage
+!                                 (Default: 8)
+!               min_dense       - Minimum number of attributes to be stored in dense storage
+!                                 (Default: 6)
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		January, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pget_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_attr_phase_change_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: ocpl_id ! Object (dataset or group) creation property list identifier
+    INTEGER, INTENT(OUT) :: max_compact  ! Maximum number of attributes to be stored in compact storage
+                                         !(Default: 8)
+    INTEGER, INTENT(OUT) :: min_dense  ! Minimum number of attributes to be stored in dense storage
+                                       ! (Default: 6)
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pget_attr_phase_change_c(ocpl_id, max_compact, min_dense)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_ATTR_PHASE_CHANGE_C'::h5pget_attr_phase_change_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: ocpl_id
+         INTEGER, INTENT(OUT) :: max_compact
+         INTEGER, INTENT(OUT) :: min_dense
+ 
+       END FUNCTION h5pget_attr_phase_change_c
+    END INTERFACE
+    
+    hdferr = h5pget_attr_phase_change_c(ocpl_id, max_compact, min_dense)
+  END SUBROUTINE h5pget_attr_phase_change_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pset_attr_creation_order_f 
+!
+! Purpose: 	Sets tracking and indexing of attribute creation order
+!
+! Inputs:  
+!		ocpl_id		- Object creation property list identifier
+!               crt_order_flags - Flags specifying whether to track and index attribute creation order
+! Outputs:
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		January, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pset_attr_creation_order_f(ocpl_id, crt_order_flags , hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_attr_creation_order_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: ocpl_id ! Object (dataset or group) creation property list identifier
+    INTEGER, INTENT(IN) :: crt_order_flags  ! Flags specifying whether to track and index attribute creation order
+
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION H5Pset_attr_creation_order_c(ocpl_id, crt_order_flags)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_ATTR_CREATION_ORDER_C'::h5pset_attr_creation_order_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: ocpl_id
+         INTEGER, INTENT(IN) :: crt_order_flags
+ 
+       END FUNCTION H5Pset_attr_creation_order_c
+    END INTERFACE
+    
+    hdferr = H5Pset_attr_creation_order_c(ocpl_id, crt_order_flags)
+  END SUBROUTINE h5pset_attr_creation_order_f
+  
+
+!----------------------------------------------------------------------
+! Name:		H5Pset_shared_mesg_nindexes_f 
+!
+! Purpose: 	Sets number of shared object header message indexes 
+!
+! Inputs:  
+!               plist_id - file creation property list
+!               nindexes - Number of shared object header message indexes to be available in files created with this property list
+! Outputs:
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		January, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pset_shared_mesg_nindexes_f( plist_id, nindexes, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_shared_mesg_nindexes_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id ! file creation property list
+    INTEGER, INTENT(IN) :: nindexes ! Number of shared object header message indexes 
+                                     !  available in files created WITH this property list
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_shared_mesg_nindexes_c(plist_id, nindexes)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_SHARED_MESG_NINDEXES_C'::h5pset_shared_mesg_nindexes_c
+         !DEC$ ENDIF
+         
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(IN) :: nindexes
+         
+       END FUNCTION H5pset_shared_mesg_nindexes_c
+    END INTERFACE
+    
+    hdferr = h5pset_shared_mesg_nindexes_c(plist_id, nindexes) 
+
+  END SUBROUTINE h5pset_shared_mesg_nindexes_f
+  
+!----------------------------------------------------------------------
+! Name:		H5Pset_shared_mesg_index_f
+!
+! Purpose: 	Configures the specified shared object header message index
+!
+! Inputs:  
+!            fcpl_id - File creation property list identifier.
+!          index_num - Index being configured.
+!    mesg_type_flags - Types of messages that should be stored in this index.
+!      min_mesg_size - Minimum message size.
+!
+! Outputs:
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		January, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pset_shared_mesg_index_f(fcpl_id, index_num, mesg_type_flags, min_mesg_size, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_shared_mesg_index_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: fcpl_id ! file creation property list
+    INTEGER, INTENT(IN) :: index_num ! Index being configured.
+    INTEGER, INTENT(IN) :: mesg_type_flags ! Types of messages that should be stored in this index.
+    INTEGER, INTENT(IN) :: min_mesg_size ! Minimum message size.
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_shared_mesg_index_c(fcpl_id, index_num, mesg_type_flags, min_mesg_size)
+
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_SHARED_MESG_INDEX_C'::h5pset_shared_mesg_index_c
+         !DEC$ ENDIF
+         
+         INTEGER(HID_T), INTENT(IN) :: fcpl_id 
+         INTEGER, INTENT(IN) :: index_num
+         INTEGER, INTENT(IN) :: mesg_type_flags
+         INTEGER, INTENT(IN) :: min_mesg_size
+         
+       END FUNCTION H5pset_shared_mesg_index_c
+    END INTERFACE
+    
+    hdferr = h5pset_shared_mesg_index_c(fcpl_id, index_num, mesg_type_flags, min_mesg_size) 
+
+  END SUBROUTINE h5pset_shared_mesg_index_f
+  
+!----------------------------------------------------------------------
+! Name:	      H5Pget_attr_creation_order_f
+!
+! Purpose:    Retrieves tracking and indexing settings for attribute creation order
+!
+! Inputs:
+!             ocpl_id - Object (group or dataset) creation property list identifier
+!
+! Outputs:
+!             crt_order_flags - Flags specifying whether to track and index attribute creation order
+!	      hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		February, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE  h5pget_attr_creation_order_f(ocpl_id, crt_order_flags, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_attr_creation_order_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: ocpl_id ! Object (group or dataset) creation property list identifier 
+    INTEGER, INTENT(OUT) :: crt_order_flags ! Flags specifying whether to track and index attribute creation order 
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pget_attr_creation_order_c(ocpl_id, crt_order_flags)
+
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_ATTR_CREATION_ORDER_C'::h5pget_attr_creation_order_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: ocpl_id
+         INTEGER, INTENT(OUT) :: crt_order_flags
+         
+       END FUNCTION H5pget_attr_creation_order_c
+    END INTERFACE
+
+    hdferr = h5pget_attr_creation_order_c(ocpl_id, crt_order_flags)
+
+  END SUBROUTINE h5pget_attr_creation_order_f
+
+!----------------------------------------------------------------------
+! Name:	      H5Pset_libver_bounds_f
+!
+! Purpose:    Sets bounds on library versions, and indirectly format versions, to be used when creating objects.
+!
+! Inputs:
+!             fapl_id - File access property list identifier
+!                 low - The earliest version of the library that will be used for writing objects.
+!                high - The latest version of the library that will be used for writing objects.
+!
+! Outputs:
+!	      hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		February 18, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pset_libver_bounds_f(fapl_id, low, high, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_libver_bounds_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: fapl_id ! File access property list identifier
+    INTEGER(HID_T), INTENT(IN) :: low ! The earliest version of the library that will be used for writing objects.
+                                        ! Currently, low must be one of two pre-defined values:
+                                        !            HDF_LIBVER_EARLIEST_F
+                                        !            HDF_LIBVER_LATEST_F
+    INTEGER(HID_T), INTENT(IN) :: high ! The latest version of the library that will be used for writing objects.
+                                         ! Currently, low must set to the pre-defined value:
+                                         !            HDF_LIBVER_LATEST_F
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_libver_bounds_c(fapl_id, low, high)
+
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_LIBVER_BOUNDS_C'::h5pset_libver_bounds_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: fapl_id
+         INTEGER(HID_T), INTENT(IN) :: low
+         INTEGER(HID_T), INTENT(IN) :: high
+         
+       END FUNCTION H5pset_libver_bounds_c
+    END INTERFACE
+
+    hdferr = h5pset_libver_bounds_c(fapl_id, low, high)
+
+  END SUBROUTINE h5pset_libver_bounds_f
+
+!----------------------------------------------------------------------
+! Name:	      H5Pset_link_creation_order_f 
+!
+! Purpose:    Sets creation order tracking and indexing for links in a group.
+!
+! Inputs:
+!         gcpl_id  	  - Group creation property list identifier
+!         crt_order_flags - Creation order flag(s)
+!
+! Outputs:
+!	      hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		February 18, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pset_link_creation_order_f(gcpl_id, crt_order_flags, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_libver_bounds_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! File access property list identifier
+    INTEGER(HID_T), INTENT(IN) :: crt_order_flags ! Creation order flag(s)
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_link_creation_order_c(gcpl_id, crt_order_flags)
+
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_LINK_CREATION_ORDER_C'::h5pset_link_creation_order_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER(HID_T), INTENT(IN) :: crt_order_flags
+         
+       END FUNCTION H5pset_link_creation_order_c
+    END INTERFACE
+
+    hdferr = h5pset_link_creation_order_c(gcpl_id, crt_order_flags)
+
+  END SUBROUTINE h5pset_link_creation_order_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pget_link_phase_change_f
+!
+! Purpose: 	Queries the settings for conversion between compact and dense groups.
+!
+! Inputs:  
+!		gcpl_id  	- Group creation property list identifier
+! Outputs:  
+!               max_compact     - Maximum number of attributes to be stored in compact storage
+!               min_dense       - Minimum number of attributes to be stored in dense storage
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		February 20, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pget_link_phase_change_f(gcpl_id, max_compact, min_dense, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_link_phase_change_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! Group creation property list identifier
+    INTEGER, INTENT(OUT) :: max_compact  ! Maximum number of attributes to be stored in compact storage
+    INTEGER, INTENT(OUT) :: min_dense  ! Minimum number of attributes to be stored in dense storage
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pget_link_phase_change_c(gcpl_id, max_compact, min_dense)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_LINK_PHASE_CHANGE_C'::h5pget_link_phase_change_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER, INTENT(OUT) :: max_compact
+         INTEGER, INTENT(OUT) :: min_dense
+ 
+       END FUNCTION h5pget_link_phase_change_c
+    END INTERFACE
+
+    hdferr = h5pget_link_phase_change_c(gcpl_id, max_compact, min_dense)
+  END SUBROUTINE h5pget_link_phase_change_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pget_obj_track_times_f 
+!
+! Purpose: 	Returns whether times are tracked for an object.
+!
+! Inputs:  
+!		plist_id	- property list id
+!               flag            - object timestamp setting
+!                                 .TRUE.,.FALSE.
+! Outputs:
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		February 22, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pget_obj_track_times_f(plist_id, flag, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_obj_track_times_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset creation property 
+                                         ! list identifier 
+    LOGICAL, INTENT(OUT) :: flag   ! Object timestamp setting
+    INTEGER, INTENT(OUT) :: hdferr ! Error code
+    INTEGER :: status
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pget_obj_track_times_c(plist_id, status) 
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_OBJ_TRACK_TIMES_C'::h5pget_obj_track_times_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: plist_id ! File creation property list identifier 
+         INTEGER, INTENT(OUT) :: status
+       END FUNCTION h5pget_obj_track_times_c
+    END INTERFACE
+    flag = .TRUE.
+    hdferr = h5pget_obj_track_times_c(plist_id, status) 
+    IF(status.EQ.0) flag = .FALSE.
+
+  END SUBROUTINE h5pget_obj_track_times_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pset_obj_track_times_f 
+!
+! Purpose: 	Set whether the birth, access, modification & change times for
+!               an object are stored.
+! 
+!               Birth time is the time the object was created.  Access time is
+!               the last time that metadata or raw data was read from this
+!               object.  Modification time is the last time the data for
+!               this object was changed (either writing raw data to a dataset
+!               or inserting/modifying/deleting a link in a group).  Change
+!               time is the last time the metadata for this object was written
+!               (adding/modifying/deleting an attribute on an object, extending
+!               the size of a dataset, etc).
+! 
+!               If these times are not tracked, they will be reported as
+!               12:00 AM UDT, Jan. 1, 1970 (i.e. 0 seconds past the UNIX
+!               epoch) when queried.
+!
+! Inputs:  
+!		plist_id	- property list id
+!               flag            - object timestamp setting
+!                                 .TRUE.,.FALSE.
+! Outputs:
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		February 22, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pset_obj_track_times_f(plist_id, flag, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_obj_track_times_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset creation property 
+                                           ! list identifier 
+    LOGICAL, INTENT(IN) :: flag    ! Object timestamp setting
+    INTEGER, INTENT(OUT) :: hdferr ! Error code
+    INTEGER :: status
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_obj_track_times_c(plist_id, status) 
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_OBJ_TRACK_TIMES_C'::h5pset_obj_track_times_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: plist_id ! File creation property list identifier 
+         INTEGER, INTENT(IN) :: status
+       END FUNCTION h5pset_obj_track_times_c
+    END INTERFACE
+
+    status = 0
+    IF(flag) status = 1
+
+    hdferr = h5pset_obj_track_times_c(plist_id, status)
+
+  END SUBROUTINE h5pset_obj_track_times_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pset_create_inter_group_f
+!
+! Purpose: 	Specifies in property list whether to create missing intermediate groups.
+!
+! Inputs:  
+!		lcpl_id            - Link creation property list identifier
+!               crt_intermed_group - crt_intermed_group specifying whether 
+!                                    to create intermediate groups upon the creation 
+!                                    of an object
+! Outputs:
+!		hdferr:		   - error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		February 22, 2008
+!
+! Modifications: 	
+!
+! Comment: The long subroutine name (>31) on older f90 compilers causes problems
+!          so had to shorten the name		
+!--------------------------------------------------------------------------------------
+
+  SUBROUTINE h5pset_create_inter_group_f(lcpl_id, crt_intermed_group, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_create_inter_group_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: lcpl_id ! Link creation property list identifier
+    INTEGER, INTENT(IN) :: crt_intermed_group  ! specifying whether to create intermediate groups 
+                                               ! upon the creation of an object
+    INTEGER, INTENT(OUT) :: hdferr ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_create_inter_group_c(lcpl_id, crt_intermed_group) 
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_CREATE_INTER_GROUP_C'::h5pset_create_inter_group_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: lcpl_id
+         INTEGER(HID_T), INTENT(IN) :: crt_intermed_group
+       END FUNCTION h5pset_create_inter_group_c
+    END INTERFACE
+
+    hdferr = h5pset_create_inter_group_c(lcpl_id, crt_intermed_group)
+
+  END SUBROUTINE h5pset_create_inter_group_f
+
+!----------------------------------------------------------------------
+! Name:	      H5Pget_link_creation_order_f
+!
+! Purpose:    Queries whether link creation order is tracked and/or indexed in a group.
+!
+! Inputs:
+!             gcpl_id - Group creation property list identifier
+!
+! Outputs:
+!             crt_order_flags - Creation order flag(s)
+!	      hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 3, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE  h5pget_link_creation_order_f(gcpl_id, crt_order_flags, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_link_creation_order_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id   ! Group creation property list identifier
+    INTEGER, INTENT(OUT) :: crt_order_flags ! Creation order flag(s)
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pget_link_creation_order_c(gcpl_id, crt_order_flags)
+
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_LINK_CREATION_ORDER_C'::h5pget_link_creation_order_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER, INTENT(OUT) :: crt_order_flags
+         
+       END FUNCTION H5pget_link_creation_order_c
+    END INTERFACE
+
+    hdferr = h5pget_link_creation_order_c(gcpl_id, crt_order_flags)
+
+  END SUBROUTINE h5pget_link_creation_order_f
+
+!----------------------------------------------------------------------
+! Name:	      H5Pset_char_encoding 
+!
+! Purpose:    Sets the character encoding used to encode a string.
+!
+! Inputs:
+!             plist_id - Property list identifier
+!             encoding - Valid values for encoding are:
+!     	                    H5T_CSET_ASCII_F -> US ASCII
+!     	                    H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
+!
+! Outputs:
+!	      hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 3, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE  h5pset_char_encoding_f(plist_id, encoding, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_attr_creation_order_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id ! Property list identifier
+    
+    INTEGER, INTENT(IN) :: encoding ! String encoding character set:
+!     	                                    H5T_CSET_ASCII_F -> US ASCII
+!     	                                    H5T_CSET_UTF8_F  -> UTF-8 Unicode encoding
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_char_encoding_c(plist_id, encoding)
+
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_CHAR_ENCODING_C'::h5pset_char_encoding_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(IN) :: encoding
+         
+       END FUNCTION H5pset_char_encoding_c
+    END INTERFACE
+
+    hdferr = h5pset_char_encoding_c(plist_id, encoding)
+
+  END SUBROUTINE h5pset_char_encoding_f
+
+!----------------------------------------------------------------------
+! Name:	      H5Pget_char_encoding 
+!
+! Purpose:    Retrieves the character encoding used to create a string
+!
+! Inputs:
+!             plist_id - Property list identifier
+!
+! Outputs:
+!             encoding - Valid values for encoding are:
+!     	                    H5T_CSET_ASCII_F -> US ASCII
+!     	                    H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
+!	        hdferr - error code		
+!		            Success:  0
+!		            Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 3, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE  h5pget_char_encoding_f(plist_id, encoding, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_char_encoding_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id ! Property list identifier
+    
+    INTEGER, INTENT(OUT) :: encoding ! Valid values for encoding are:
+!     	                                            H5T_CSET_ASCII_F -> US ASCII
+!     	                                            H5T_CSET_UTF8_F  -> UTF-8 Unicode encoding
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pget_char_encoding_c(plist_id, encoding)
+
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_CHAR_ENCODING_C'::h5pget_char_encoding_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(OUT) :: encoding
+         
+       END FUNCTION H5pget_char_encoding_c
+    END INTERFACE
+
+    hdferr = h5pget_char_encoding_c(plist_id, encoding)
+
+  END SUBROUTINE h5pget_char_encoding_f
+
+!----------------------------------------------------------------------
+! Name:		h5pset_copy_object_f 
+!
+! Purpose: 	Sets properties to be used when an object is copied.
+!
+! Inputs: 
+!               ocp_plist_id - Object copy property list identifier
+!               copy_options - Copy option(s) to be set
+! Outputs:  
+!		hdferr	     - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 3, 2008
+!
+! Modifications:
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pset_copy_object_f(ocp_plist_id, copy_options, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_copy_object_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: ocp_plist_id ! Object copy property list identifier
+    INTEGER, INTENT(IN) :: copy_options ! Copy option(s) to be set, valid options are:
+                                        !   H5O_COPY_SHALLOW_HIERARCHY_F
+                                        !   H5O_COPY_EXPAND_SOFT_LINK_F 
+                                        !   H5O_COPY_EXPAND_EXT_LINK_F
+                                        !   H5O_COPY_EXPAND_REFERENCE_F
+                                        !   H5O_COPY_WITHOUT_ATTR_FLAG_F
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_copy_object_c(ocp_plist_id, copy_options)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_COPY_OBJECT_C'::h5pset_copy_object_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: ocp_plist_id
+         INTEGER, INTENT(IN) :: copy_options
+       END FUNCTION h5pset_copy_object_c
+    END INTERFACE
+    hdferr = h5pset_copy_object_c(ocp_plist_id, copy_options) 
+  END SUBROUTINE h5pset_copy_object_f
+
+!----------------------------------------------------------------------
+! Name:		h5pget_copy_object_f 
+!
+! Purpose: 	Retrieves the properties to be used when an object is copied.
+!
+! Inputs: 
+!               ocp_plist_id - Object copy property list identifier
+! Outputs:  
+!               copy_options - Copy option(s) to be get
+!		hdferr	     - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 3, 2008
+!
+! Modifications:
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pget_copy_object_f(ocp_plist_id, copy_options, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_copy_object_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: ocp_plist_id ! Object copy property list identifier
+    INTEGER, INTENT(OUT) :: copy_options ! valid copy options returned are:
+                                         !   H5O_COPY_SHALLOW_HIERARCHY_F
+                                         !   H5O_COPY_EXPAND_SOFT_LINK_F 
+                                         !   H5O_COPY_EXPAND_EXT_LINK_F
+                                         !   H5O_COPY_EXPAND_REFERENCE_F
+                                         !   H5O_COPY_WITHOUT_ATTR_FLAG_F
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pget_copy_object_c(ocp_plist_id, copy_options)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_COPY_OBJECT_C'::h5pget_copy_object_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: ocp_plist_id
+         INTEGER, INTENT(OUT) :: copy_options
+       END FUNCTION h5pget_copy_object_c
+    END INTERFACE
+    hdferr = h5pget_copy_object_c(ocp_plist_id, copy_options) 
+  END SUBROUTINE h5pget_copy_object_f
+
+!----------------------------------------------------------------------
+! Name:		h5pget_data_transform_f 
+!
+! Purpose: 	Retrieves a data transform expression.
+!
+! Inputs: 
+!               plist_id - Identifier of the property list or class
+! Outputs:  
+!               expression - buffer to hold transform expression
+!		hdferr	   - error code
+!                                       Success:  Actual lenght of the expression
+!                                                 If provided buffer "expression" is 
+!                                                 smaller, than expression will be 
+!                                                 truncated to fit into
+!                                                 provided user buffer
+!				 	Failure: -1
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 19, 2008
+!
+! Modifications:
+!
+! Comment: Should hdferr return just 0 or 1 and add another arguement for the size?
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_data_transform_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id ! Identifier of the property list or class
+    CHARACTER(LEN=*), INTENT(OUT) :: expression  ! Buffer to hold transform expression
+
+    INTEGER(SIZE_T), INTENT(OUT), OPTIONAL :: size ! registered size of the transform expression
+
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code
+    INTEGER :: expression_len
+    INTEGER(SIZE_T) :: size_default
+    
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pget_data_transform_c(plist_id, expression, expression_len, size_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_DATA_TRANSFORM_C'::h5pget_data_transform_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: plist_id 
+         CHARACTER(LEN=*), INTENT(OUT) :: expression 
+         INTEGER(SIZE_T) :: size_default
+         INTEGER :: expression_len
+       END FUNCTION h5pget_data_transform_c
+    END INTERFACE
+
+    size_default = 0
+    expression_len = LEN(expression)
+
+    hdferr = h5pget_data_transform_c(plist_id, expression, expression_len, size_default)
+
+    IF(present(size)) size = size_default
+
+  END SUBROUTINE h5pget_data_transform_f
+
+!----------------------------------------------------------------------
+! Name:		h5pset_data_transform_f 
+!
+! Purpose: 	Sets a data transform expression.
+!
+! Inputs: 
+!               plist_id - Identifier of the property list or class 
+!               expression - buffer to hold transform expression
+! Outputs: 
+!		hdferr	   - error code
+!                                       Success:  0
+!				 	Failure: -1
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 19, 2008
+!
+! Modifications:
+!
+! Comment: 
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pset_data_transform_f(plist_id, expression, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_data_transform_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id ! Identifier of the property list or class
+    CHARACTER(LEN=*), INTENT(IN) :: expression  ! Buffer to hold transform expression
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code
+    INTEGER :: expression_len
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_data_transform_c(plist_id, expression, expression_len)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_DATA_TRANSFORM_C'::h5pset_data_transform_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: plist_id 
+         CHARACTER(LEN=*), INTENT(IN) :: expression
+         INTEGER :: expression_len
+       END FUNCTION h5pset_data_transform_c
+    END INTERFACE
+
+    expression_len = LEN(expression)
+    hdferr = h5pset_data_transform_c(plist_id, expression, expression_len)
+
+  END SUBROUTINE h5pset_data_transform_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pget_local_heap_size_hint_f 
+!
+! Purpose: 	Queries the local heap size hint for original-style groups.
+!
+! Inputs: 
+!               gcpl_id - Group creation property list identifier
+! Outputs:
+!               size_hint - Hint for size of local heap
+!		hdferr	  - error code
+!                                    Success:  0
+!				     Failure: -1
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 21, 2008
+!
+! Modifications:
+!
+! Comment: 
+!----------------------------------------------------------------------
+
+  SUBROUTINE H5Pget_local_heap_size_hint_f(gcpl_id, size_hint, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_local_heap_size_hint_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! Group creation property list identifier
+    INTEGER(SIZE_T), INTENT(OUT) :: size_hint ! Hint for size of local heap
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION H5Pget_local_heap_size_hint_c(gcpl_id, size_hint)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_LOCAL_HEAP_SIZE_HINT_C'::h5pget_local_heap_size_hint_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER(SIZE_T), INTENT(OUT) :: size_hint
+       END FUNCTION H5Pget_local_heap_size_hint_c
+    END INTERFACE
+
+    hdferr = H5Pget_local_heap_size_hint_c(gcpl_id, size_hint)
+
+  END SUBROUTINE H5Pget_local_heap_size_hint_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pget_est_link_info_f 
+!
+! Purpose: 	Queries data required to estimate required local heap or object header size.
+!
+! Inputs: 
+!               gcpl_id - Group creation property list identifier
+! Outputs:  
+!       est_num_entries - Estimated number of links to be inserted into group
+!          est_name_len - Estimated average length of link names
+!		hdferr	- error code
+!                                Success:  0
+!				 Failure: -1
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 21, 2008
+!
+! Modifications:
+!
+! Comment: 
+!----------------------------------------------------------------------
+
+  SUBROUTINE H5Pget_est_link_info_f(gcpl_id, est_num_entries, est_name_len, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_est_link_info_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! Group creation property list identifier  
+    INTEGER, INTENT(OUT) :: est_num_entries ! Estimated number of links to be inserted into group
+    INTEGER, INTENT(OUT) :: est_name_len    ! Estimated average length of link names
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION H5Pget_est_link_info_c(gcpl_id, est_num_entries, est_name_len)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_EST_LINK_INFO_C'::h5pget_est_link_info_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id  
+         INTEGER, INTENT(OUT) :: est_num_entries
+         INTEGER, INTENT(OUT) :: est_name_len
+       END FUNCTION H5Pget_est_link_info_c
+    END INTERFACE
+
+    hdferr = H5Pget_est_link_info_c(gcpl_id, est_num_entries, est_name_len)
+
+  END SUBROUTINE H5Pget_est_link_info_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pset_local_heap_size_hint_f 
+!
+! Purpose: 	Sets the local heap size hint for original-style groups.
+!
+! Inputs: 
+!               gcpl_id - Group creation property list identifier
+!               size_hint - Hint for size of local heap
+! Outputs:
+!		hdferr	  - error code
+!                                    Success:  0
+!				     Failure: -1
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 21, 2008
+!
+! Modifications:
+!
+! Comment: 
+!----------------------------------------------------------------------
+
+  SUBROUTINE H5Pset_local_heap_size_hint_f(gcpl_id, size_hint, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_local_heap_size_hint_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! Group creation property list identifier
+    INTEGER(SIZE_T), INTENT(IN) :: size_hint ! Hint for size of local heap
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION H5Pset_local_heap_size_hint_c(gcpl_id, size_hint)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_LOCAL_HEAP_SIZE_HINT_C'::h5pset_local_heap_size_hint_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER(SIZE_T), INTENT(IN) :: size_hint
+       END FUNCTION H5Pset_local_heap_size_hint_c
+    END INTERFACE
+
+    hdferr = H5Pset_local_heap_size_hint_c(gcpl_id, size_hint)
+
+  END SUBROUTINE H5Pset_local_heap_size_hint_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pset_est_link_info_f 
+!
+! Purpose: 	Sets estimated number of links and length of link names in a group.
+!
+! Inputs: 
+!               gcpl_id - Group creation property list identifier  
+!       est_num_entries - Estimated number of links to be inserted into group
+!          est_name_len - Estimated average length of link names
+! Outputs:
+!		hdferr	- error code
+!                                Success:  0
+!				 Failure: -1
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 21, 2008
+!
+! Modifications:
+!
+! Comment: 
+!----------------------------------------------------------------------
+
+  SUBROUTINE H5Pset_est_link_info_f(gcpl_id, est_num_entries, est_name_len, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_est_link_info_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! Group creation property list identifier  
+    INTEGER, INTENT(IN) :: est_num_entries ! Estimated number of links to be inserted into group
+    INTEGER, INTENT(IN) :: est_name_len    ! Estimated average length of link names
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION H5Pset_est_link_info_c(gcpl_id, est_num_entries, est_name_len)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_EST_LINK_INFO_C'::h5pset_est_link_info_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id  
+         INTEGER, INTENT(IN) :: est_num_entries
+         INTEGER, INTENT(IN) :: est_name_len
+       END FUNCTION H5Pset_est_link_info_c
+    END INTERFACE
+
+    hdferr = H5Pset_est_link_info_c(gcpl_id, est_num_entries, est_name_len)
+
+  END SUBROUTINE H5Pset_est_link_info_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pset_link_phase_change_f
+!
+! Purpose: 	Sets the parameters for conversion between compact and dense groups.
+!
+! Inputs:  
+!		gcpl_id  	- Group creation property list identifier  
+!               max_compact     - Maximum number of attributes to be stored in compact storage
+!               min_dense       - Minimum number of attributes to be stored in dense storage
+! Outputs:
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 21, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pset_link_phase_change_f(gcpl_id, max_compact, min_dense, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_link_phase_change_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! Group creation property list identifier
+    INTEGER, INTENT(IN) :: max_compact  ! Maximum number of attributes to be stored in compact storage
+    INTEGER, INTENT(IN) :: min_dense  ! Minimum number of attributes to be stored in dense storage
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_link_phase_change_c(gcpl_id, max_compact, min_dense)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_LINK_PHASE_CHANGE_C'::h5pset_link_phase_change_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
+         INTEGER, INTENT(IN) :: max_compact
+         INTEGER, INTENT(IN) :: min_dense
+ 
+       END FUNCTION h5pset_link_phase_change_c
+    END INTERFACE
+
+    hdferr = h5pset_link_phase_change_c(gcpl_id, max_compact, min_dense)
+  END SUBROUTINE h5pset_link_phase_change_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pset_fapl_direct_f
+!
+! Purpose: 	Sets up use of the direct I/O driver.
+!
+! Inputs:  
+!    fapl_id 	- File access property list identifier
+!    alignment 	- Required memory alignment boundary
+!    block_size - File system block size
+!    cbuf_size 	- Copy buffer size
+! Outputs:
+!     hdferr:   - error code		
+!		    Success:  0
+!		    Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 21, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE H5Pset_fapl_direct_f(fapl_id, alignment, block_size, cbuf_size, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_fapl_direct_f
+!DEC$endif
+!
+    IMPLICIT NONE  
+    INTEGER(HID_T), INTENT(IN) :: fapl_id ! File access property list identifier
+    INTEGER(SIZE_T), INTENT(IN) :: alignment 	  ! Required memory alignment boundary!
+    INTEGER(SIZE_T), INTENT(IN) :: block_size     ! File system block size
+    INTEGER(SIZE_T), INTENT(IN) :: cbuf_size 	  ! Copy buffer size
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION H5Pset_fapl_direct_c(fapl_id, alignment, block_size, cbuf_size)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_DIRECT_C'::h5pset_fapl_direct_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: fapl_id 
+         INTEGER(SIZE_T), INTENT(IN) :: alignment
+         INTEGER(SIZE_T), INTENT(IN) :: block_size
+         INTEGER(SIZE_T), INTENT(IN) :: cbuf_size
+       END FUNCTION H5Pset_fapl_direct_c
+    END INTERFACE
+
+    hdferr = H5Pset_fapl_direct_c(fapl_id, alignment, block_size, cbuf_size)
+  END SUBROUTINE H5Pset_fapl_direct_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pget_fapl_direct_f
+!
+! Purpose: 	Gets up use of the direct I/O driver.
+!
+! Inputs:  
+!    fapl_id 	- File access property list identifier
+! Outputs:
+!    alignment 	- Required memory alignment boundary
+!    block_size - File system block size
+!    cbuf_size 	- Copy buffer size
+!     hdferr:   - error code		
+!		    Success:  0
+!		    Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 21, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE H5Pget_fapl_direct_f(fapl_id, alignment, block_size, cbuf_size, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_fapl_direct_f
+!DEC$endif
+!
+    IMPLICIT NONE  
+    INTEGER(HID_T), INTENT(IN) :: fapl_id ! File access property list identifier
+    INTEGER(SIZE_T), INTENT(OUT) :: alignment 	  ! Required memory alignment boundary!
+    INTEGER(SIZE_T), INTENT(OUT) :: block_size     ! File system block size
+    INTEGER(SIZE_T), INTENT(OUT) :: cbuf_size 	  ! Copy buffer size
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION H5Pget_fapl_direct_c(fapl_id, alignment, block_size, cbuf_size)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_FAPL_DIRECT_C'::h5pget_fapl_direct_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: fapl_id 
+         INTEGER(SIZE_T), INTENT(OUT) :: alignment
+         INTEGER(SIZE_T), INTENT(OUT) :: block_size
+         INTEGER(SIZE_T), INTENT(OUT) :: cbuf_size
+       END FUNCTION H5Pget_fapl_direct_c
+    END INTERFACE
+
+    hdferr = H5Pget_fapl_direct_c(fapl_id, alignment, block_size, cbuf_size)
+  END SUBROUTINE H5Pget_fapl_direct_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pset_attr_phase_change_f 
+!
+! Purpose: 	Sets attribute storage phase change thresholds.
+!
+! Inputs:  
+!		ocpl_id		- Object (dataset or group) creation property list identifier
+! Outputs:  
+!               max_compact     - Maximum number of attributes to be stored in compact storage
+!                                 (Default: 8)
+!               min_dense       - Minimum number of attributes to be stored in dense storage
+!                                 (Default: 6)
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		January, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_attr_phase_change_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: ocpl_id ! Object (dataset or group) creation property list identifier
+    INTEGER, INTENT(IN) :: max_compact  ! Maximum number of attributes to be stored in compact storage
+                                         !(Default: 8)
+    INTEGER, INTENT(IN) :: min_dense  ! Minimum number of attributes to be stored in dense storage
+                                       ! (Default: 6)
+    INTEGER, INTENT(OUT) :: hdferr   ! Error code
+!
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_attr_phase_change_c(ocpl_id, max_compact, min_dense)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_ATTR_PHASE_CHANGE_C'::h5pset_attr_phase_change_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: ocpl_id
+         INTEGER, INTENT(IN) :: max_compact
+         INTEGER, INTENT(IN) :: min_dense
+ 
+       END FUNCTION h5pset_attr_phase_change_c
+    END INTERFACE
+    
+    hdferr = h5pset_attr_phase_change_c(ocpl_id, max_compact, min_dense)
+
+
+  END SUBROUTINE h5pset_attr_phase_change_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pset_nbit_f 
+!
+! Purpose: 	Sets up the use of the N-Bit filter.
+!
+! Inputs: 
+!               plist_id - Dataset creation property list identifier.
+! Outputs:
+!		hdferr	  - error code
+!                                    Success:  0
+!				     Failure: -1
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 21, 2008
+!
+! Modifications:
+!
+! Comment: 
+!----------------------------------------------------------------------
+
+  SUBROUTINE H5Pset_nbit_f(plist_id, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_nbit_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset creation property list identifier
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION H5Pset_nbit_c(plist_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_NBIT_C'::h5pset_nbit_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+       END FUNCTION H5Pset_nbit_c
+    END INTERFACE
+
+    hdferr = H5Pset_nbit_c(plist_id)
+
+  END SUBROUTINE H5Pset_nbit_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pset_scaleoffset_f 
+!
+! Purpose: 	Sets up the use of the Scale-Offset filter.
+!
+! Inputs: 
+!               plist_id - Dataset creation property list identifier.
+!             scale_type - Flag indicating compression method.
+!           scale_factor - Parameter related to scale.
+! Outputs:
+!		hdferr	 - error code
+!                                   Success:  0
+!				    Failure: -1
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 21, 2008
+!
+! Modifications:
+!
+! Comment: 
+!----------------------------------------------------------------------
+
+  SUBROUTINE H5Pset_scaleoffset_f(plist_id, scale_type, scale_factor, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_scaleoffset_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset creation property list identifier
+    INTEGER, INTENT(IN) :: scale_type                  ! Flag indicating compression method.
+    INTEGER, INTENT(IN) :: scale_factor                ! parameter related to scale.
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION H5Pset_scaleoffset_c(plist_id, scale_type, scale_factor)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_SCALEOFFSET_C'::h5pset_scaleoffset_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         INTEGER, INTENT(IN) :: scale_type
+         INTEGER, INTENT(IN) :: scale_factor
+       END FUNCTION H5Pset_scaleoffset_c
+    END INTERFACE
+
+    hdferr = H5Pset_scaleoffset_c(plist_id, scale_type, scale_factor)
+
+  END SUBROUTINE H5Pset_scaleoffset_f
+
+!----------------------------------------------------------------------
+! Name:		h5pset_nlinks_f 
+!
+! Purpose: 	Sets maximum number of soft or user-defined link traversals.
+!
+! Inputs: 
+!            lapl_id - File access property list identifier
+!             nlinks - Maximum number of links to traverse
+!
+! Outputs:
+!		hdferr	 - error code
+!                                   Success:  0
+!				    Failure: -1
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 24, 2008
+!
+! Modifications:
+!
+! Comment: 
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pset_nlinks_f(lapl_id, nlinks, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pset_nlinks_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: lapl_id ! File access property list identifier
+    INTEGER(SIZE_T), INTENT(IN) :: nlinks ! Maximum number of links to traverse
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pset_nlinks_c(lapl_id, nlinks)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_NLINKS_C'::h5pset_nlinks_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: lapl_id
+         INTEGER(SIZE_T), INTENT(IN) :: nlinks
+       END FUNCTION h5pset_nlinks_c
+    END INTERFACE
+    
+    hdferr = h5pset_nlinks_c(lapl_id, nlinks)
+    
+  END SUBROUTINE h5pset_nlinks_f
+
+!----------------------------------------------------------------------
+! Name:		h5pget_nlinks_f 
+!
+! Purpose:  Gets maximum number of soft or user-defined link traversals.
+!
+! Inputs: 
+!            lapl_id - File access property list identifier
+!             nlinks - Maximum number of links to traverse
+!
+! Outputs:
+!		hdferr	 - error code
+!                                   Success:  0
+!				    Failure: -1
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 24, 2008
+!
+! Modifications:
+!
+! Comment: 
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5pget_nlinks_f(lapl_id, nlinks, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_nlinks_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: lapl_id ! File access property list identifier
+    INTEGER(SIZE_T), INTENT(OUT) :: nlinks ! Maximum number of links to traverse
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5pget_nlinks_c(lapl_id, nlinks)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_NLINKS_C'::h5pget_nlinks_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: lapl_id
+         INTEGER(SIZE_T), INTENT(OUT) :: nlinks
+       END FUNCTION h5pget_nlinks_c
+    END INTERFACE
+    
+    hdferr = h5pget_nlinks_c(lapl_id, nlinks)
+    
+  END SUBROUTINE h5pget_nlinks_f
+
+!----------------------------------------------------------------------
+! Name:		H5Pget_create_inter_group_f
+!
+! Purpose: 	Determines whether property is set to enable creating missing intermediate groups.
+!
+! Inputs:  
+!		lcpl_id            - Link creation property list identifier
+!               crt_intermed_group - Specifying whether to create intermediate groups upon 
+!                                    the creation of an object
+! Outputs:
+!		hdferr:		   - error code		
+!				 	Success:  0
+!				 	Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		April 4, 2008
+!
+! Modifications: 	
+!
+! Comment: The long subroutine name (>31) on older f90 compilers causes problems
+!          so had to shorten the name		
+!--------------------------------------------------------------------------------------
+
+  SUBROUTINE h5pget_create_inter_group_f(lcpl_id, crt_intermed_group, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5pget_create_inter_group_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: lcpl_id      ! Link creation property list identifier
+    INTEGER, INTENT(IN) :: crt_intermed_group  ! Flag specifying whether to create intermediate groups 
+                                               ! upon creation of an object
+    INTEGER, INTENT(OUT) :: hdferr ! Error code
+
+    INTERFACE
+       INTEGER FUNCTION h5pget_create_inter_group_c(lcpl_id, crt_intermed_group) 
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_CREATE_INTER_GROUP_C'::h5pget_create_inter_group_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: lcpl_id
+         INTEGER(HID_T), INTENT(IN) :: crt_intermed_group
+       END FUNCTION h5pget_create_inter_group_c
+    END INTERFACE
+
+    hdferr = h5pget_create_inter_group_c(lcpl_id, crt_intermed_group)
+
+  END SUBROUTINE h5pget_create_inter_group_f
+
+
+END MODULE H5P
+
diff --git a/fortran/src/H5Rf.c b/fortran/src/H5Rf.c
index 4430e1a..299f6bd 100644
--- a/fortran/src/H5Rf.c
+++ b/fortran/src/H5Rf.c
@@ -239,3 +239,102 @@ nh5rget_object_type_obj_c (hid_t_f *dset_id, haddr_t_f *ref, int_f *obj_type)
      return ret_value;
 }
 
+/*----------------------------------------------------------------------------
+ * Name:        h5rget_name_object_c
+ * Purpose:     Call H5Rget_name for an object
+ * Inputs: 
+ *       loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
+ *          ref - An object or dataset region reference.
+ *
+ * Outputs:     name - A name associated with the referenced object or dataset region.
+ *              size - The size of the name buffer.
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 31, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5rget_name_object_c (hid_t_f *loc_id, haddr_t_f *ref, _fcd name, size_t_f *name_len, size_t_f *size_default)
+{
+     hobj_ref_t ref_c;
+     int_f ret_value = -1;
+     ssize_t c_size;
+     size_t c_bufsize;
+     char *c_buf= NULL;  /* Buffer to hold C string */
+
+     ref_c = *ref;
+
+     c_bufsize = (size_t)*name_len+1;
+     /*
+      * Allocate buffer to hold name of an attribute
+      */
+     if ((c_buf = HDmalloc(c_bufsize)) == NULL)
+       return ret_value;
+
+     /*
+      * Call H5Rget_name function.
+      */
+     if((c_size=H5Rget_name((hid_t)*loc_id, H5R_OBJECT, &ref_c, c_buf, c_bufsize)) < 0)
+         return ret_value;
+     /*
+      * Convert C name to FORTRAN and place it in the given buffer
+      */
+     HD5packFstring(c_buf, _fcdtocp(name), c_bufsize-1);
+
+     *size_default = (size_t_f)c_size;
+     ret_value = 0;
+     if(c_buf) HDfree(c_buf);
+     
+     return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5rget_name_region_c
+ * Purpose:     Call H5Rget_name for a dataset region
+ * Inputs: 
+ *       loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
+ *          ref - An object or dataset region reference.
+ *
+ * Outputs:     name - A name associated with the referenced object or dataset region.
+ *              size - The size of the name buffer.
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 31, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5rget_name_region_c (hid_t_f *loc_id, int_f *ref, _fcd name, size_t_f *name_len, size_t_f *size_default)
+{
+     hdset_reg_ref_t ref_c;
+     int_f ret_value = -1;
+     ssize_t c_size;
+     size_t c_bufsize;
+     char *c_buf= NULL;  /* Buffer to hold C string */
+
+     HDmemcpy (&ref_c, ref, H5R_DSET_REG_REF_BUF_SIZE);
+
+     c_bufsize = (size_t)*name_len+1;
+     /*
+      * Allocate buffer to hold name of an attribute
+      */
+     if ((c_buf = HDmalloc(c_bufsize)) == NULL)
+       return ret_value;
+
+     /*
+      * Call H5Rget_name function.
+      */
+     if((c_size=H5Rget_name((hid_t)*loc_id, H5R_DATASET_REGION, &ref_c, c_buf, c_bufsize)) < 0)
+         return ret_value;
+     /*
+      * Convert C name to FORTRAN and place it in the given buffer
+      */
+     HD5packFstring(c_buf, _fcdtocp(name), c_bufsize-1); 
+
+     *size_default = (size_t_f)c_size;
+     ret_value = 0;
+     if(c_buf) HDfree(c_buf);
+     
+     return ret_value;
+}
diff --git a/fortran/src/H5Rff.f90 b/fortran/src/H5Rff.f90
index 6400f43..a4f4a65 100644
--- a/fortran/src/H5Rff.f90
+++ b/fortran/src/H5Rff.f90
@@ -58,6 +58,12 @@
 
           END INTERFACE 
           
+          INTERFACE h5rget_name_f
+
+            MODULE PROCEDURE h5rget_name_object_f
+            MODULE PROCEDURE h5rget_name_region_f 
+
+          END INTERFACE 
 
         CONTAINS
           
@@ -243,7 +249,6 @@
             INTEGER(HID_T), INTENT(OUT) :: obj_id   ! Object identifier 
             INTEGER, INTENT(OUT) :: hdferr         ! Error code 
 
-            INTEGER :: ref_type     ! Reference type 
             INTEGER(HADDR_T) :: ref_f          ! Local buffer to pass reference
 
 !            INTEGER, EXTERNAL :: h5h5rdereference_object_c
@@ -309,7 +314,6 @@
             INTEGER(HID_T), INTENT(OUT) :: obj_id   ! Dataspace identifier 
             INTEGER, INTENT(OUT) :: hdferr          ! Error code 
 
-            INTEGER :: ref_type      ! Reference type 
             INTEGER :: ref_f(REF_REG_BUF_LEN)          ! Local buffer to pass reference
 
 !            INTEGER, EXTERNAL :: h5rdereference_region_c
@@ -328,7 +332,6 @@
               END FUNCTION h5rdereference_region_c
             END INTERFACE
 
-            ref_type = H5R_DATASET_REGION_F
             ref_f = ref%ref
             hdferr = h5rdereference_region_c(dset_id, ref_f, obj_id )
 
@@ -475,4 +478,146 @@
 
           END SUBROUTINE h5rget_object_type_obj_f
 
-      END MODULE H5R
+!----------------------------------------------------------------------
+! Name:		h5rget_name_object_f
+!
+! Purpose: 	Retrieves a name of a referenced object.
+!
+! Inputs:
+!                   loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
+!                      ref - An object or dataset region reference.
+!
+! Outputs:  
+!                     name - A name associated with the referenced object or dataset region.
+!
+!		hdferr:    - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!                     size - The size of the name buffer.
+!
+! Programmer:	M.S. Breitenfeld
+!		March 28, 2008
+!
+! Modifications: 
+!
+! Comment:		
+!----------------------------------------------------------------------
+  
+
+  SUBROUTINE h5rget_name_object_f(loc_id,  ref, name, hdferr, size) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5rget_name_object_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for the dataset containing the reference 
+                                           ! or for the group that dataset is in.
+    TYPE(hobj_ref_t_f), INTENT(IN) :: ref  ! Object reference
+    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size   ! The size of the name buffer,
+                                           ! returning 0 (zero) if no name is associated with the identifier
+    CHARACTER(LEN=*), INTENT(OUT) :: name  ! A name associated with the referenced object or dataset region.
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+    INTEGER(HADDR_T) :: ref_f              ! Local buffer to pass reference
+
+    INTEGER(SIZE_T) :: size_default
+    INTEGER(SIZE_T) :: name_len
+    
+    INTERFACE
+       INTEGER FUNCTION h5rget_name_object_c(loc_id, ref_f, name, name_len, size_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5RGET_NAME_OBJECT_C':: h5rget_name_object_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         INTEGER(SIZE_T)  :: size_default
+         CHARACTER(LEN=*), INTENT(OUT) :: name
+         INTEGER(HADDR_T) :: ref_f
+
+         INTEGER(SIZE_T) :: name_len
+       END FUNCTION h5rget_name_object_c
+    END INTERFACE
+    
+    name_len=LEN(name)
+
+    ref_f = ref%ref
+    hdferr = h5rget_name_object_c(loc_id, ref_f, name, name_len, size_default)
+    
+    IF(PRESENT(size)) size = size_default
+    
+  END SUBROUTINE h5rget_name_object_f
+
+!----------------------------------------------------------------------
+! Name:		h5rget_name_region_f
+!
+! Purpose: 	Retrieves a name of a dataset region.
+!
+! Inputs:
+!                   loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
+!                      ref - An object or dataset region reference.
+!
+! Outputs:  
+!                     name - A name associated with the referenced object or dataset region.
+!
+!		hdferr:    - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!                     size - The size of the name buffer.
+!
+! Programmer:	M.S. Breitenfeld
+!		March 28, 2008
+!
+! Modifications: 
+!
+! Comment:		
+!----------------------------------------------------------------------
+  
+
+  SUBROUTINE h5rget_name_region_f(loc_id, ref, name, hdferr, size) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5rget_name_region_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for the dataset containing the reference 
+                                           ! or for the group that dataset is in.
+    TYPE(hdset_reg_ref_t_f), INTENT(IN) :: ref  ! Object reference
+    INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size   ! The size of the name buffer,
+                                           ! returning 0 (zero) if no name is associated with the identifier
+    CHARACTER(LEN=*), INTENT(OUT) :: name  ! A name associated with the referenced object or dataset region.
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code
+ 
+    INTEGER :: ref_f(REF_REG_BUF_LEN)      ! Local buffer to pass reference
+    INTEGER(SIZE_T) :: size_default
+    INTEGER(SIZE_T) :: name_len
+    
+    INTERFACE
+       INTEGER FUNCTION h5rget_name_region_c(loc_id, ref_f, name, name_len, size_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5RGET_NAME_REGION_C':: h5rget_name_region_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         INTEGER(SIZE_T)  :: size_default
+         CHARACTER(LEN=*), INTENT(OUT) :: name
+         INTEGER :: ref_f(REF_REG_BUF_LEN)
+
+         INTEGER(SIZE_T) :: name_len
+       END FUNCTION h5rget_name_region_c
+    END INTERFACE
+    
+    name_len=LEN(name)
+
+    ref_f = ref%ref
+    hdferr = h5rget_name_region_c(loc_id, ref_f, name, name_len, size_default)
+    
+    IF(PRESENT(size)) size = size_default
+    
+  END SUBROUTINE h5rget_name_region_f
+
+END MODULE H5R
diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c
index 0a4bd40..c33e7e6 100644
--- a/fortran/src/H5Sf.c
+++ b/fortran/src/H5Sf.c
@@ -1027,3 +1027,127 @@ nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements,  hsi
   return ret_value;
 }
 
+/*----------------------------------------------------------------------------
+ * Name:        h5sdecode_c
+ * Purpose:     Call H5Sdecode
+ * Inputs:       
+ *		buf     - Buffer for the data space object to be decoded.
+ * Outputs:
+ *              obj_id  - Object_id (non-negative)
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 26, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5sdecode_c ( _fcd buf, int_f *obj_id )
+{
+  int ret_value = -1;
+  unsigned char *c_buf = NULL;  /* Buffer to hold C string */
+  hid_t c_obj_id;
+
+  /*
+   * Call H5Sdecode function.
+   */
+
+  c_buf = (unsigned char*)buf; 
+
+  c_obj_id = H5Sdecode(c_buf);
+  if(c_obj_id < 0)
+    return ret_value;
+
+  *obj_id = (int_f)c_obj_id;
+  ret_value = 0;
+
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5sencode_c
+ * Purpose:     Call H5Sencode
+ * Inputs:       
+ *            obj_id - Identifier of the object to be encoded.
+ *		 buf - Buffer for the object to be encoded into.
+ *            nalloc - The size of the allocated buffer.
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              March 26, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5sencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
+{
+  int ret_value = -1;
+  unsigned char *c_buf = NULL;          /* Buffer to hold C string */
+  size_t c_size;
+
+  /* return just the size of the allocated buffer;
+   * equivalent to C routine for which 'name' is set equal to NULL
+   */
+
+  if (*nalloc == 0) {
+
+    if(H5Sencode((hid_t)*obj_id, c_buf, &c_size) < 0)
+      return ret_value;
+
+    *nalloc = (size_t_f)c_size;
+
+    ret_value = 0;
+    return ret_value;
+  }
+
+  c_size = (size_t)*nalloc;
+  /*
+   * Allocate buffer
+   */
+  if ((c_buf = HDmalloc(c_size)) == NULL)
+    return ret_value;
+  /*
+   * Call H5Sencode function.
+   */
+  if(H5Sencode((hid_t)*obj_id, c_buf, &c_size) < 0){
+    return ret_value;
+  }
+
+  /* copy the C buffer to the FORTRAN buffer. 
+   * Can not use HD5packFstring because we don't want to
+   * eliminate the NUL terminator or pad remaining space 
+   * with blanks.
+   */
+
+  HDmemcpy(_fcdtocp(buf),(char *)c_buf,c_size);
+
+  ret_value = 0;
+  if(c_buf) HDfree(c_buf);
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5sextent_equal_c
+ * Purpose:     Call H5Sextent_equal
+ * Inputs:        
+ *		space1_id - First dataspace identifier.
+ *              space2_id - Second dataspace identifier.
+ * Outputs:
+ *              equal - TRUE if equal, FALSE if unequal.
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              April 4, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5sextent_equal_c ( hid_t_f * space1_id, hid_t_f *space2_id, hid_t_f *c_equal)
+{
+  int ret_value = -1;
+
+  if( (*c_equal = (hid_t_f)H5Sextent_equal((hid_t)*space1_id, (hid_t)*space2_id)) < 0)
+    return ret_value;
+
+  ret_value = 0;
+  return ret_value;
+}
+
diff --git a/fortran/src/H5Sff.f90 b/fortran/src/H5Sff.f90
index a4780c1..9e1367d 100644
--- a/fortran/src/H5Sff.f90
+++ b/fortran/src/H5Sff.f90
@@ -1942,4 +1942,170 @@
  
           END SUBROUTINE h5sget_select_type_f
 
-      END MODULE H5S
+!----------------------------------------------------------------------
+! Name:		H5Sdecode_f
+!
+! Purpose:	Decode a binary object description of data space and return a new object handle.
+!
+! Inputs:  
+!		buf -  Buffer for the data space object to be decoded.
+!            obj_id - Object ID
+! Outputs:
+!           hdferr: - error code		
+!			Success:  0
+!			Failure: -1
+!
+! Optional parameters:		- NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 26, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5sdecode_f(buf, obj_id, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5sdecode_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: buf ! Buffer for the data space object to be decoded.
+    INTEGER, INTENT(OUT) :: obj_id  ! Object ID
+    INTEGER, INTENT(OUT) :: hdferr     ! Error code
+
+    INTERFACE
+       INTEGER FUNCTION h5sdecode_c(buf, obj_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SDECODE_C'::h5sdecode_c
+         !DEC$ ENDIF
+         CHARACTER(LEN=*), INTENT(IN) :: buf
+         INTEGER, INTENT(OUT) :: obj_id  ! Object ID
+       END FUNCTION h5sdecode_c
+    END INTERFACE
+
+    hdferr = h5sdecode_c(buf, obj_id)
+    
+  END SUBROUTINE h5sdecode_f
+
+!----------------------------------------------------------------------
+! Name:		H5Sencode_f
+!
+! Purpose:	Encode a data space object description into a binary buffer.
+!
+! Inputs:
+!            obj_id - Identifier of the object to be encoded.
+!		buf - Buffer for the object to be encoded into.
+!            nalloc - The size of the allocated buffer.
+! Outputs:
+!            nalloc - The size of the buffer needed.
+!           hdferr: - error code		
+!	                Success:  0
+!		        Failure: -1
+!
+! Optional parameters:		- NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		March 26, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5sencode_f(obj_id, buf, nalloc, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5sencode_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id ! Identifier of the object to be encoded.
+    CHARACTER(LEN=*), INTENT(OUT) :: buf ! Buffer for the object to be encoded into.
+    INTEGER(SIZE_T), INTENT(INOUT) :: nalloc ! The size of the allocated buffer.
+    INTEGER, INTENT(OUT) :: hdferr     ! Error code
+
+
+    INTERFACE
+       INTEGER FUNCTION h5sencode_c(buf, obj_id, nalloc)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SENCODE_C'::h5sencode_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         CHARACTER(LEN=*), INTENT(OUT) :: buf
+         INTEGER(SIZE_T), INTENT(INOUT) :: nalloc
+       END FUNCTION h5sencode_c
+    END INTERFACE
+    
+    hdferr = h5sencode_c(buf, obj_id, nalloc)
+
+  END SUBROUTINE h5sencode_f
+  
+
+!----------------------------------------------------------------------
+! Name:		h5sextent_equal_f 
+!
+! Purpose: 	Determines whether two dataspace extents are equal.
+!
+! Inputs:  
+!		space1_id - First dataspace identifier.
+!               space2_id - Second dataspace identifier.
+! Outputs:  
+!                   Equal - .TRUE. if equal, .FALSE. if unequal.
+!		  hdferr: - error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!				NONE
+!
+! Programmer: M.S. Breitenfeld
+!             April 2, 2008
+!
+! Modifications:
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5sextent_equal_f(space1_id, space2_id, equal, hdferr)
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5sextent_equal_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: space1_id ! First dataspace identifier.
+    INTEGER(HID_T), INTENT(IN) :: space2_id ! Second dataspace identifier.
+    LOGICAL, INTENT(OUT) :: Equal ! .TRUE. if equal, .FALSE. if unequal.
+    INTEGER, INTENT(OUT) :: hdferr                ! Error code
+
+    INTEGER(HID_T) :: c_equal
+
+    INTERFACE
+       INTEGER FUNCTION h5sextent_equal_c(space1_id, space2_id, c_equal)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SEXTENT_EQUAL_C'::h5sextent_equal_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: space1_id
+         INTEGER(HID_T), INTENT(IN) :: space2_id
+         INTEGER(HID_T) :: c_equal
+       END FUNCTION h5sextent_equal_c
+    END INTERFACE
+    
+    hdferr = h5sextent_equal_c(space1_id, space2_id, c_equal)
+
+    
+    equal = .FALSE.
+    IF(c_equal.GT.0) equal = .TRUE. 
+
+    
+  END SUBROUTINE h5sextent_equal_f
+
+END MODULE H5S
diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c
index 7c3befc..0ad0bc9 100644
--- a/fortran/src/H5Tf.c
+++ b/fortran/src/H5Tf.c
@@ -24,6 +24,7 @@
  * Inputs:      loc_id - file or group identifier
  *              name - name of the datatype within file or  group
  *              namelen - name length
+ *              tapl_id - datatype access property list identifier
  * Outputs:     type_id - dataset identifier
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
@@ -31,7 +32,7 @@
  * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5topen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id)
+nh5topen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *tapl_id)
 {
     char *c_name = NULL;
     hid_t c_type_id;
@@ -46,7 +47,7 @@ nh5topen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id)
     /*
      * Call H5Topen2 function.
      */
-    if((c_type_id = H5Topen2((hid_t)*loc_id, c_name, H5P_DEFAULT)) < 0)
+    if((c_type_id = H5Topen2((hid_t)*loc_id, c_name, (hid_t)*tapl_id)) < 0)
         goto done;
     *type_id = (hid_t_f)c_type_id;
 
@@ -67,13 +68,19 @@ done:
  *              name - name of the datatype within file or  group
  *              namelen - name length
  *              type_id - dataset identifier
+ *              lcpl_id - Link creation property list
+ *              tcpl_id - Datatype creation property list
+ *              tapl_id - Datatype access property list
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
  *              Saturday, August 14, 1999
  * Modifications:
+ *              - Added passing optional parameters for version 1.8
+ *                M.S. Breitenfeld
  *---------------------------------------------------------------------------*/
 int_f
-nh5tcommit_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id)
+nh5tcommit_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, 
+	     hid_t_f *lcpl_id, hid_t_f *tcpl_id, hid_t_f *tapl_id)
 {
     char *c_name = NULL;
     int ret_value = -1;
@@ -83,7 +90,7 @@ nh5tcommit_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id)
         goto done;
 
     /* Call H5Tcommit2 function */
-    if(H5Tcommit2((hid_t)*loc_id, c_name, (hid_t)*type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0)
+    if(H5Tcommit2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*lcpl_id, (hid_t)*tcpl_id, (hid_t)*tapl_id) < 0)
         goto done;
 
     ret_value = 0;
@@ -1634,3 +1641,202 @@ nh5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, int_f *class )
   *class = (int_f)c_class;
   return ret_value;
 }
+
+/*----------------------------------------------------------------------------
+ * Name:        h5tcommit_anon_c
+ * Purpose:     Call H5Tcommit_anon
+ * Inputs:      loc_id - file or group identifier
+ *              dtype_id - dataset identifier
+ *              tcpl_id - Datatype creation property list
+ *              tapl_id - Datatype access property list
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              February 25, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id, 
+		  hid_t_f *tcpl_id, hid_t_f *tapl_id)
+{
+  int ret_value = -1;
+  
+  /* Call H5Tcommit_anon function */
+  if(H5Tcommit_anon((hid_t)*loc_id, (hid_t)*dtype_id, (hid_t)*tcpl_id, (hid_t)*tapl_id) < 0)
+    goto done;
+  
+  ret_value = 0;
+  
+ done:
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5tcommitted_c
+ * Purpose:     Call H5Tcommitted
+ *              dtype_id - dataset identifier
+ * Returns:     a positive value, for TRUE, if the datatype has been committed, 
+ *              or 0 (zero), for FALSE, if the datatype has not been committed. 
+ *		Otherwise returns a negative value.
+ * Programmer:  M.S. Breitenfeld
+ *              February 25, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+int_f
+nh5tcommitted_c(hid_t_f *dtype_id)
+{
+  int_f ret_value;
+  
+  /* Call H5Tcommitted function */
+  
+  ret_value=(int_f)H5Tcommitted((hid_t)*dtype_id);
+
+  return ret_value;
+
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5tdecode_c
+ * Purpose:     Call H5Tdecode
+ * Inputs:       
+ *		buf     - Buffer for the data space object to be decoded.
+ * Outputs:
+ *              obj_id  - Object_id (non-negative)
+ *
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              April 9, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5tdecode_c ( _fcd buf, int_f *obj_id )
+{
+  int ret_value = -1;
+  unsigned char *c_buf = NULL;  /* Buffer to hold C string */
+  hid_t c_obj_id;
+
+  /*
+   * Call H5Tdecode function.
+   */
+
+  c_buf = (unsigned char*)buf; 
+
+  c_obj_id = H5Tdecode(c_buf);
+  if(c_obj_id < 0)
+    return ret_value;
+
+  *obj_id = (int_f)c_obj_id;
+  ret_value = 0;
+
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5tencode_c
+ * Purpose:     Call H5Tencode
+ * Inputs:       
+ *            obj_id - Identifier of the object to be encoded.
+ *		 buf - Buffer for the object to be encoded into.
+ *            nalloc - The size of the allocated buffer.
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              April 9, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
+{
+  int ret_value = -1;
+  unsigned char *c_buf = NULL;          /* Buffer to hold C string */
+  size_t c_size;
+
+  /* return just the size of the allocated buffer;
+   * equivalent to C routine for which 'name' is set equal to NULL
+   */
+
+  if (*nalloc == 0) {
+
+    if(H5Tencode((hid_t)*obj_id, c_buf, &c_size) < 0)
+      return ret_value;
+
+    *nalloc = (size_t_f)c_size;
+
+    ret_value = 0;
+    return ret_value;
+  }
+
+  c_size = (size_t)*nalloc;
+  /*
+   * Allocate buffer
+   */
+  if ((c_buf = HDmalloc(c_size)) == NULL)
+    return ret_value;
+  /*
+   * Call H5Tencode function.
+   */
+  if(H5Tencode((hid_t)*obj_id, c_buf, &c_size) < 0){
+    return ret_value;
+  }
+
+  /* copy the C buffer to the FORTRAN buffer. 
+   * Can not use HD5packFstring because we don't want to
+   * eliminate the NUL terminator or pad remaining space 
+   * with blanks.
+   */
+
+  HDmemcpy(_fcdtocp(buf),(char *)c_buf,c_size);
+
+  ret_value = 0;
+  if(c_buf) HDfree(c_buf);
+  return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5tget_create_plist_c
+ * Purpose:     Call H5Tget_create_plist 
+ * Inputs:      dtype_id          - Datatype identifier
+ * Outputs:     dtpl_id           - Datatype property list identifier
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              April 9, 2008
+ * Modifications: N/A
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id)
+{
+    int_f ret_value=-1;          /* Return value */
+
+    if ((*dtpl_id = (hid_t_f)H5Tget_create_plist((hid_t)*dtype_id)) < 0)
+        return ret_value;
+    
+    ret_value = 0;
+    return ret_value;
+}
+
+/*----------------------------------------------------------------------------
+ * Name:        h5tcompiler_conv_c
+ * Purpose:     Call H5Tcompiler_conv
+ * Inputs:    
+ *              src_id - Identifier for the source datatype.
+ *              dst_id - Identifier for the destination datatype. 
+ * Outputs:     c_flag - flag; TRUE for compiler conversion, FALSE for library conversion
+ * Returns:     0 on success, -1 on failure
+ * Programmer:  M.S. Breitenfeld
+ *              April 9, 2008
+ * Modifications:
+ *---------------------------------------------------------------------------*/
+
+int_f
+nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag)
+{
+  int ret_value = -1;
+  htri_t status;
+
+  status = H5Tcompiler_conv( (hid_t)*src_id , (hid_t)*dst_id);
+  if ( status < 0  ) return ret_value;
+  *c_flag = (int_f)status;
+  ret_value = 0;
+  return ret_value;
+}
diff --git a/fortran/src/H5Tff.f90 b/fortran/src/H5Tff.f90
index ee5bb77..dee6990 100644
--- a/fortran/src/H5Tff.f90
+++ b/fortran/src/H5Tff.f90
@@ -16,11 +16,11 @@
 !
 ! This file contains FORTRAN90 interfaces for H5T functions
 !
-      MODULE H5T
+MODULE H5T
 
-        USE H5GLOBAL
+  USE H5GLOBAL
       
-      CONTAINS
+CONTAINS
 
 !----------------------------------------------------------------------
 ! Name:		h5topen_f 
@@ -36,53 +36,62 @@
 !				 	Success:  0
 !				 	Failure: -1   
 ! Optional parameters:
-!				NONE
+!              tapl_id          - datatype access property list identifier.
 !
 ! Programmer:	Elena Pourmal
 !		August 12, 1999	
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
-!			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+! Modifications: Explicit Fortran interfaces were added for 
+!		 called C functions (it is needed for Windows
+!		 port).  March 7, 2001 
+!
+!                Added optional parameter 'tapl_id' for compatability
+!                with H5Topen2. April 9, 2009.              
 !
 ! Comment:		
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5topen_f(loc_id, name, type_id, hdferr) 
+  SUBROUTINE h5topen_f(loc_id, name, type_id, hdferr, tapl_id)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5topen_f
 !DEC$endif
 !
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name  
-                                  ! Datatype name within file or group
-            INTEGER(HID_T), INTENT(OUT) :: type_id  ! Datatype identifier 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-            INTEGER :: namelen          ! Name length 
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier 
+    CHARACTER(LEN=*), INTENT(IN) :: name ! Datatype name within file or group
+    INTEGER(HID_T), INTENT(OUT) :: type_id  ! Datatype identifier
+    INTEGER, INTENT(OUT) :: hdferr ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id ! datatype access property list identifier
 
-!            INTEGER, EXTERNAL :: h5topen_c
+    INTEGER :: namelen                  ! Name length
+    INTEGER(HID_T) :: tapl_id_default
+!
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5topen_c(loc_id, name, namelen, type_id)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TOPEN_C'::h5topen_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference ::name 
-              INTEGER(HID_T), INTENT(IN) :: loc_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER :: namelen
-              INTEGER(HID_T), INTENT(OUT) :: type_id
-              END FUNCTION h5topen_c
-            END INTERFACE
-
-            namelen = LEN(name)
-            hdferr = h5topen_c(loc_id, name, namelen, type_id)
-          END SUBROUTINE h5topen_f
+    INTERFACE
+       INTEGER FUNCTION h5topen_c(loc_id, name, namelen, type_id, tapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TOPEN_C'::h5topen_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference ::name 
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(HID_T), INTENT(OUT) :: type_id
+         INTEGER(HID_T) :: tapl_id_default
+       END FUNCTION h5topen_c
+    END INTERFACE
+    
+    namelen = LEN(name)
+
+    tapl_id_default = H5P_DEFAULT_F
+    IF(PRESENT(tapl_id)) tapl_id_default = tapl_id
+
+    hdferr = h5topen_c(loc_id, name, namelen, type_id, tapl_id_default)
+  END SUBROUTINE h5topen_f
 
 !----------------------------------------------------------------------
 ! Name:		h5tcommit_f 
@@ -100,53 +109,84 @@
 !				 	Success:  0
 !				 	Failure: -1   
 ! Optional parameters:
-!				NONE
+!	       lcpl_id          - Link creation property list
+!              tcpl_id          - Datatype creation property list
+!              tapl_id          - Datatype access property list
 !
 ! Programmer:	Elena Pourmal
 !		August 12, 1999	
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
-!			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+! Modifications: - Explicit Fortran interfaces were added for 
+!		   called C functions (it is needed for Windows
+!	           port).  March 7, 2001
+!
+!                - Added optional parameters introduced in version 1.8 
+!                  M.S. Breitenfeld
+!
+!
 !
 ! Comment:		
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tcommit_f(loc_id, name, type_id, hdferr) 
+  SUBROUTINE h5tcommit_f(loc_id, name, type_id, hdferr, &
+       lcpl_id, tcpl_id, tapl_id  ) 
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5tcommit_f
 !DEC$endif
 !
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name  
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier 
+    CHARACTER(LEN=*), INTENT(IN) :: name  
                                   ! Datatype name within file or group
-            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-            INTEGER :: namelen          ! Name length 
+    INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier 
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tcpl_id ! Datatype creation property list
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id ! Datatype access property list
+
+
+    INTEGER :: namelen          ! Name length
+
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: tcpl_id_default
+    INTEGER(HID_T) :: tapl_id_default
 
-!            INTEGER, EXTERNAL :: h5tcommit_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5tcommit_c(loc_id, name, namelen, type_id)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TCOMMIT_C'::h5tcommit_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference ::name 
-              INTEGER(HID_T), INTENT(IN) :: loc_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER :: namelen
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              END FUNCTION h5tcommit_c
-            END INTERFACE
-
-            namelen = LEN(name)
-            hdferr = h5tcommit_c(loc_id, name, namelen, type_id)
-          END SUBROUTINE h5tcommit_f
+    INTERFACE
+       INTEGER FUNCTION h5tcommit_c(loc_id, name, namelen, type_id, &
+            lcpl_id_default, tcpl_id_default, tapl_id_default )
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TCOMMIT_C'::h5tcommit_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference ::name 
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         CHARACTER(LEN=*), INTENT(IN) :: name
+         INTEGER :: namelen
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: tcpl_id_default
+         INTEGER(HID_T) :: tapl_id_default
+       END FUNCTION h5tcommit_c
+    END INTERFACE
+
+    lcpl_id_default = H5P_DEFAULT_F
+    tcpl_id_default = H5P_DEFAULT_F
+    tapl_id_default = H5P_DEFAULT_F
+
+    IF (PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
+    IF (PRESENT(tcpl_id)) tcpl_id_default = tcpl_id
+    IF (PRESENT(tapl_id)) tapl_id_default = tapl_id
+    
+    namelen = LEN(name)
+
+    hdferr = h5tcommit_c(loc_id, name, namelen, type_id, &
+         lcpl_id_default, tcpl_id_default, tapl_id_default )
+
+  END SUBROUTINE h5tcommit_f
 
 !----------------------------------------------------------------------
 ! Name:		h5tcopy_f 
@@ -3249,4 +3289,357 @@
           END SUBROUTINE h5tget_member_class_f
 
 !----------------------------------------------------------------------
-      END MODULE H5T
+! Name:		h5tcommit_anon_f 
+!
+! Purpose: 	Commits a transient datatype to a file, 
+!               creating a new named datatype, 
+!               but does not link it into the file structure.	
+!
+! Inputs:
+!        loc_id - A file or group identifier specifying the file 
+!                 in which the new named datatype is to be created.
+!      dtype_id - A datatype identifier.
+!
+! Outputs:
+!	hdferr: - error code		
+!			Success:  0
+!          		Failure: -1   
+! Optional parameters:
+!       tcpl_id - A datatype creation property list identifier.
+!                 (H5P_DEFAULT_F for the default property list.)
+!       tapl_id - A datatype access property list identifier.
+!                 should always be passed as the value H5P_DEFAULT_F.
+!
+! Programmer:	M.S. Breitenfeld
+!		February 25, 2008
+!
+! Modifications:
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5tcommit_anon_f(loc_id, dtype_id, hdferr, tcpl_id, tapl_id) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5tcommit_anon_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: loc_id  ! A file or group identifier specifying 
+                                          ! the file in which the new named datatype 
+                                          ! is to be created.
+    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! Datatype identifier 
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tcpl_id ! A datatype creation property 
+                                                    ! list identifier.
+                                                    ! (H5P_DEFAULT_F for the default property list.)
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id ! A datatype access property list identifier.
+                                                    ! should always be passed as the value H5P_DEFAULT_F.
+    INTEGER(HID_T) :: tcpl_id_default
+    INTEGER(HID_T) :: tapl_id_default
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5tcommit_anon_c(loc_id, dtype_id, &
+            tcpl_id_default, tapl_id_default)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TCOMMIT_ANON_C'::h5tcommit_anon_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference ::name 
+         INTEGER(HID_T), INTENT(IN) :: loc_id
+         INTEGER(HID_T), INTENT(IN) :: dtype_id
+         INTEGER(HID_T) :: tcpl_id_default
+         INTEGER(HID_T) :: tapl_id_default
+       END FUNCTION h5tcommit_anon_c
+    END INTERFACE
+
+    tcpl_id_default = H5P_DEFAULT_F
+    tapl_id_default = H5P_DEFAULT_F
+
+    IF(PRESENT(tcpl_id)) tcpl_id_default = tcpl_id
+    IF(PRESENT(tapl_id)) tapl_id_default = tapl_id
+    
+    hdferr = h5tcommit_anon_c(loc_id, dtype_id, & 
+         tcpl_id_default, tapl_id_default )
+
+  END SUBROUTINE h5tcommit_anon_f
+
+!----------------------------------------------------------------------
+! Name:      h5tcommitted_f 
+!
+! Purpose:   Determines whether a datatype is a named type or a transient type.
+!
+! Inputs:
+!      dtype_id - A datatype identifier.
+!
+! Outputs:
+!     committed - .TRUE., if the datatype has been committed
+!                .FALSE., if the datatype has not been committed.
+!	hdferr: - error code		
+!			Success:  0
+!          		Failure: -1   
+! Optional parameters: None
+!
+! Programmer:	M.S. Breitenfeld
+!		February 25, 2008
+!
+! Modifications:
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5tcommitted_f(dtype_id, committed, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport ::  h5tcommitted_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! A datatype identifier
+    LOGICAL, INTENT(OUT) :: committed ! .TRUE., if the datatype has been committed
+                                      !.FALSE., if the datatype has not been committed.
+    INTEGER, INTENT(OUT) :: hdferr     ! Error code:		
+!			                   Success:  0
+!          		                   Failure: -1  
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5tcommitted_c(dtype_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TCOMMITTED_C'::h5tcommitted_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference ::name
+         INTEGER(HID_T), INTENT(IN) :: dtype_id
+       END FUNCTION h5tcommitted_c
+    END INTERFACE
+
+    hdferr = h5tcommitted_c(dtype_id)
+
+    IF(hdferr.GT.0)THEN
+       committed = .TRUE.
+       hdferr = 0
+    ELSE IF(hdferr.EQ.0)THEN
+       committed = .FALSE.
+       hdferr = 0
+    ELSE
+       hdferr = -1
+    ENDIF
+       
+
+  END SUBROUTINE h5tcommitted_f
+
+!----------------------------------------------------------------------
+! Name:		H5Tdecode_f
+!
+! Purpose:	Decode a binary object description of data type and return a new object handle.
+! Inputs:  
+!		buf -  Buffer for the data space object to be decoded.
+!            obj_id - Object ID
+! Outputs:
+!           hdferr: - error code		
+!			Success:  0
+!			Failure: -1
+!
+! Optional parameters:		- NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		April 9, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5tdecode_f(buf, obj_id, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5tdecode_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    CHARACTER(LEN=*), INTENT(IN) :: buf ! Buffer for the data space object to be decoded.
+    INTEGER, INTENT(OUT) :: obj_id  ! Object ID
+    INTEGER, INTENT(OUT) :: hdferr     ! Error code
+
+    INTERFACE
+       INTEGER FUNCTION h5tdecode_c(buf, obj_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TDECODE_C'::h5tdecode_c
+         !DEC$ ENDIF
+         CHARACTER(LEN=*), INTENT(IN) :: buf
+         INTEGER, INTENT(OUT) :: obj_id  ! Object ID
+       END FUNCTION h5tdecode_c
+    END INTERFACE
+
+    hdferr = h5tdecode_c(buf, obj_id)
+    
+  END SUBROUTINE h5tdecode_f
+
+!----------------------------------------------------------------------
+! Name:		H5Tencode_f
+!
+! Purpose:	Encode a data type object description into a binary buffer.
+!
+! Inputs:
+!            obj_id - Identifier of the object to be encoded.
+!		buf - Buffer for the object to be encoded into.
+!            nalloc - The size of the allocated buffer.
+! Outputs:
+!            nalloc - The size of the buffer needed.
+!           hdferr: - error code		
+!	                Success:  0
+!		        Failure: -1
+!
+! Optional parameters:		- NONE
+!
+! Programmer:	M.S. Breitenfeld
+!		April 9, 2008
+!
+! Modifications: 	
+!
+! Comment:		
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5tencode_f(obj_id, buf, nalloc, hdferr) 
+!
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5tencode_f
+!DEC$endif
+!
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: obj_id ! Identifier of the object to be encoded.
+    CHARACTER(LEN=*), INTENT(OUT) :: buf ! Buffer for the object to be encoded into.
+    INTEGER(SIZE_T), INTENT(INOUT) :: nalloc ! The size of the allocated buffer.
+    INTEGER, INTENT(OUT) :: hdferr     ! Error code
+
+
+    INTERFACE
+       INTEGER FUNCTION h5tencode_c(buf, obj_id, nalloc)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TENCODE_C'::h5tencode_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: obj_id
+         CHARACTER(LEN=*), INTENT(OUT) :: buf
+         INTEGER(SIZE_T), INTENT(INOUT) :: nalloc
+       END FUNCTION h5tencode_c
+    END INTERFACE
+    
+    hdferr = h5tencode_c(buf, obj_id, nalloc)
+
+  END SUBROUTINE h5tencode_f
+
+!----------------------------------------------------------------------
+! Name:		h5tget_create_plist_f 
+!
+! Purpose:  	Returns a copy of a datatype creation property list.
+!		
+! Inputs:  
+!		dtype_id   - Datatype identifier
+! Outputs:  
+!               dtpl_id    - Datatype property list identifier
+!		hdferr:    - Error code		
+!				 Success:  0
+!				 Failure: -1   
+! Optional parameters:
+!				NONE			
+!
+! Programmer:	M.S. Breitenfeld
+!		April 9, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5tget_create_plist_f(dtype_id, dtpl_id, hdferr) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5tget_create_plist_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! Datatype identifier
+    INTEGER(HID_T), INTENT(OUT) :: dtpl_id  ! Datatype property list identifier.
+    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
+                                         ! 0 on success and -1 on failure
+
+!  MS FORTRAN needs explicit interface for C functions called here.
+!
+    INTERFACE
+       INTEGER FUNCTION h5tget_create_plist_c(dtype_id, dtpl_id)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_CREATE_PLIST_C'::h5tget_create_plist_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: dtype_id
+         INTEGER(HID_T), INTENT(OUT) :: dtpl_id
+       END FUNCTION h5tget_create_plist_c
+    END INTERFACE
+    
+    hdferr = h5tget_create_plist_c(dtype_id, dtpl_id)
+  END SUBROUTINE h5tget_create_plist_f
+
+!----------------------------------------------------------------------
+! Name:		h5tcompiler_conv_f 
+!
+! Purpose:  	Check whether the library’s default conversion is hard conversion.R
+!		
+! Inputs:  
+!           src_id - Identifier for the source datatype.
+!           dst_id - Identifier for the destination datatype.
+! Outputs:  
+!           flag - TRUE for compiler conversion, FALSE for library conversion
+!          hdferr: - Error code		
+!			Success:  0
+!			Failure: -1   
+! Optional parameters:
+!				NONE			
+!
+! Programmer:	M.S. Breitenfeld
+!		April 9, 2008	
+!
+! Modifications:  N/A
+!
+!----------------------------------------------------------------------
+
+  SUBROUTINE h5tcompiler_conv_f( src_id, dst_id, flag, hdferr) 
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: h5tcompiler_conv_f
+!DEC$endif
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: src_id ! Identifier for the source datatype.
+    INTEGER(HID_T), INTENT(IN) :: dst_id ! Identifier for the destination datatype.
+    LOGICAL, INTENT(OUT) :: flag  ! .TRUE. for compiler conversion, .FALSE. for library conversion
+    INTEGER, INTENT(OUT) :: hdferr  ! Error code:
+                                    ! 0 on success and -1 on failure
+    INTEGER :: c_flag
+
+    INTERFACE
+       INTEGER FUNCTION h5tcompiler_conv_c(src_id, dst_id, c_flag)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TCOMPILER_CONV_C'::h5tcompiler_conv_c
+         !DEC$ ENDIF
+         INTEGER(HID_T), INTENT(IN) :: src_id
+         INTEGER(HID_T), INTENT(IN) :: dst_id
+         INTEGER :: c_flag
+       END FUNCTION h5tcompiler_conv_c
+    END INTERFACE
+    
+    hdferr = h5tcompiler_conv_c(src_id, dst_id, c_flag)
+
+    flag = .FALSE.
+    IF(c_flag .GT. 0) flag = .TRUE.
+
+  END SUBROUTINE h5tcompiler_conv_f
+
+END MODULE H5T
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index a9ac279..77240b2 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -215,213 +215,310 @@ nh5close_types_c( hid_t_f * types, int_f *lentypes,
  *                    Added more FD flags and new H5LIB flags
  *                    Added more FD flags for HDF5 file driver
  *                                  EIP, April 9, 2005
+ *                    Added Generic flags introduced in version 1.8
+ *                                  MSB, January, 2008
+ *                    Added types in lines h5*_flags = ( )variable to match input 
  *---------------------------------------------------------------------------*/
 int_f
 nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
                  int_f *h5fd_flags, hid_t_f *h5fd_hid_flags,
-                 int_f *h5g_flags, int_f *h5i_flags,
+                 int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags,
                  hid_t_f *h5p_flags, int_f *h5r_flags, int_f *h5s_flags,
-                 int_f *h5t_flags, int_f *h5z_flags)
+                 int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags)
 {
     int ret_value = -1;
 /*
  *  H5D flags
  */
-    h5d_flags[0] = H5D_COMPACT;
-    h5d_flags[1] = H5D_CONTIGUOUS;
-    h5d_flags[2] = H5D_CHUNKED;
-    h5d_flags[3] = H5D_ALLOC_TIME_ERROR;
-    h5d_flags[4] = H5D_ALLOC_TIME_DEFAULT;
-    h5d_flags[5] = H5D_ALLOC_TIME_EARLY;
-    h5d_flags[6] = H5D_ALLOC_TIME_LATE;
-    h5d_flags[7] = H5D_ALLOC_TIME_INCR;
-    h5d_flags[8] = H5D_SPACE_STATUS_ERROR;
-    h5d_flags[9] = H5D_SPACE_STATUS_NOT_ALLOCATED;
-    h5d_flags[10] = H5D_SPACE_STATUS_PART_ALLOCATED;
-    h5d_flags[11] = H5D_SPACE_STATUS_ALLOCATED;
-    h5d_flags[12] = H5D_FILL_TIME_ERROR;
-    h5d_flags[13] = H5D_FILL_TIME_ALLOC;
-    h5d_flags[14] = H5D_FILL_TIME_NEVER;
-    h5d_flags[15] = H5D_FILL_VALUE_ERROR;
-    h5d_flags[16] = H5D_FILL_VALUE_UNDEFINED;
-    h5d_flags[17] = H5D_FILL_VALUE_DEFAULT;
-    h5d_flags[18] = H5D_FILL_VALUE_USER_DEFINED;
+    h5d_flags[0] = (int_f)H5D_COMPACT;
+    h5d_flags[1] = (int_f)H5D_CONTIGUOUS;
+    h5d_flags[2] = (int_f)H5D_CHUNKED;
+    h5d_flags[3] = (int_f)H5D_ALLOC_TIME_ERROR;
+    h5d_flags[4] = (int_f)H5D_ALLOC_TIME_DEFAULT;
+    h5d_flags[5] = (int_f)H5D_ALLOC_TIME_EARLY;
+    h5d_flags[6] = (int_f)H5D_ALLOC_TIME_LATE;
+    h5d_flags[7] = (int_f)H5D_ALLOC_TIME_INCR;
+    h5d_flags[8] = (int_f)H5D_SPACE_STATUS_ERROR;
+    h5d_flags[9] = (int_f)H5D_SPACE_STATUS_NOT_ALLOCATED;
+    h5d_flags[10] = (int_f)H5D_SPACE_STATUS_PART_ALLOCATED;
+    h5d_flags[11] = (int_f)H5D_SPACE_STATUS_ALLOCATED;
+    h5d_flags[12] = (int_f)H5D_FILL_TIME_ERROR;
+    h5d_flags[13] = (int_f)H5D_FILL_TIME_ALLOC;
+    h5d_flags[14] = (int_f)H5D_FILL_TIME_NEVER;
+    h5d_flags[15] = (int_f)H5D_FILL_VALUE_ERROR;
+    h5d_flags[16] = (int_f)H5D_FILL_VALUE_UNDEFINED;
+    h5d_flags[17] = (int_f)H5D_FILL_VALUE_DEFAULT;
+    h5d_flags[18] = (int_f)H5D_FILL_VALUE_USER_DEFINED;
 
 /*
  *  H5F flags
  */
-      h5f_flags[0] = (int_f)H5F_ACC_RDWR;
-      h5f_flags[1] = (int_f)H5F_ACC_RDONLY;
-      h5f_flags[2] = (int_f)H5F_ACC_TRUNC;
-      h5f_flags[3] = (int_f)H5F_ACC_EXCL;
-      h5f_flags[4] = (int_f)H5F_ACC_DEBUG;
-      h5f_flags[5] = (int_f)H5F_SCOPE_LOCAL;
-      h5f_flags[6] = (int_f)H5F_SCOPE_GLOBAL;
-      h5f_flags[7] = (int_f)H5F_CLOSE_DEFAULT;
-      h5f_flags[8] = (int_f)H5F_CLOSE_WEAK;
-      h5f_flags[9] = (int_f)H5F_CLOSE_SEMI;
-      h5f_flags[10] = (int_f)H5F_CLOSE_STRONG;
-      h5f_flags[11] = (int_f)H5F_OBJ_FILE;
-      h5f_flags[12] = (int_f)H5F_OBJ_DATASET;
-      h5f_flags[13] = (int_f)H5F_OBJ_GROUP;
-      h5f_flags[14] = (int_f)H5F_OBJ_DATATYPE;
-      h5f_flags[15] = (int_f)H5F_OBJ_ALL;
-
+    h5f_flags[0] = (int_f)H5F_ACC_RDWR;
+    h5f_flags[1] = (int_f)H5F_ACC_RDONLY;
+    h5f_flags[2] = (int_f)H5F_ACC_TRUNC;
+    h5f_flags[3] = (int_f)H5F_ACC_EXCL;
+    h5f_flags[4] = (int_f)H5F_ACC_DEBUG;
+    h5f_flags[5] = (int_f)H5F_SCOPE_LOCAL;
+    h5f_flags[6] = (int_f)H5F_SCOPE_GLOBAL;
+    h5f_flags[7] = (int_f)H5F_CLOSE_DEFAULT;
+    h5f_flags[8] = (int_f)H5F_CLOSE_WEAK;
+    h5f_flags[9] = (int_f)H5F_CLOSE_SEMI;
+    h5f_flags[10] = (int_f)H5F_CLOSE_STRONG;
+    h5f_flags[11] = (int_f)H5F_OBJ_FILE;
+    h5f_flags[12] = (int_f)H5F_OBJ_DATASET;
+    h5f_flags[13] = (int_f)H5F_OBJ_GROUP;
+    h5f_flags[14] = (int_f)H5F_OBJ_DATATYPE;
+    h5f_flags[15] = (int_f)H5F_OBJ_ALL;
+    h5f_flags[16] = (int_f)H5F_LIBVER_EARLIEST;
+    h5f_flags[17] = (int_f)H5F_LIBVER_LATEST;
+                           
 /*
  *  H5FD flags
  */
-      h5fd_flags[0] = H5FD_MPIO_INDEPENDENT;
-      h5fd_flags[1] = H5FD_MPIO_COLLECTIVE;
-      h5fd_flags[2] = H5FD_MEM_NOLIST;
-      h5fd_flags[3] = H5FD_MEM_DEFAULT;
-      h5fd_flags[4] = H5FD_MEM_SUPER;
-      h5fd_flags[5] = H5FD_MEM_BTREE;
-      h5fd_flags[6] = H5FD_MEM_DRAW;
-      h5fd_flags[7] = H5FD_MEM_GHEAP;
-      h5fd_flags[8] = H5FD_MEM_LHEAP;
-      h5fd_flags[9] = H5FD_MEM_OHDR;
-      h5fd_flags[10] = H5FD_MEM_NTYPES;
+    h5fd_flags[0] = (int_f)H5FD_MPIO_INDEPENDENT;
+    h5fd_flags[1] = (int_f)H5FD_MPIO_COLLECTIVE;
+    h5fd_flags[2] = (int_f)H5FD_MEM_NOLIST;
+    h5fd_flags[3] = (int_f)H5FD_MEM_DEFAULT;
+    h5fd_flags[4] = (int_f)H5FD_MEM_SUPER;
+    h5fd_flags[5] = (int_f)H5FD_MEM_BTREE;
+    h5fd_flags[6] = (int_f)H5FD_MEM_DRAW;
+    h5fd_flags[7] = (int_f)H5FD_MEM_GHEAP;
+    h5fd_flags[8] = (int_f)H5FD_MEM_LHEAP;
+    h5fd_flags[9] = (int_f)H5FD_MEM_OHDR;
+    h5fd_flags[10] = (int_f)H5FD_MEM_NTYPES;
 
 /*
  *  H5FD flags of type hid_t
  */
-      h5fd_hid_flags[0] = H5FD_CORE;
-      h5fd_hid_flags[1] = H5FD_FAMILY;
-      h5fd_hid_flags[2] = H5FD_LOG;
-      h5fd_hid_flags[3] = H5FD_MPIO;
-      h5fd_hid_flags[4] = H5FD_MULTI;
-      h5fd_hid_flags[5] = H5FD_SEC2;
-      h5fd_hid_flags[6] = H5FD_STDIO;
+    h5fd_hid_flags[0] = (int_f)H5FD_CORE;
+    h5fd_hid_flags[1] = (int_f)H5FD_FAMILY;
+    h5fd_hid_flags[2] = (int_f)H5FD_LOG;
+    h5fd_hid_flags[3] = (int_f)H5FD_MPIO;
+    h5fd_hid_flags[4] = (int_f)H5FD_MULTI;
+    h5fd_hid_flags[5] = (int_f)H5FD_SEC2;
+    h5fd_hid_flags[6] = (int_f)H5FD_STDIO;
 
 /*
  *  H5G flags
  */
 
-      h5g_flags[0] = H5O_TYPE_UNKNOWN;
-      h5g_flags[1] = H5O_TYPE_GROUP;
-      h5g_flags[2] = H5O_TYPE_DATASET;
-      h5g_flags[3] = H5O_TYPE_NAMED_DATATYPE;
+    h5g_flags[0] = (int_f)H5O_TYPE_UNKNOWN;
+    h5g_flags[1] = (int_f)H5O_TYPE_GROUP;
+    h5g_flags[2] = (int_f)H5O_TYPE_DATASET;
+    h5g_flags[3] = (int_f)H5O_TYPE_NAMED_DATATYPE;
 /* This value can no longer be returned and all these flags should be updated
  *      to reflect the refinements between links and objects. -QAK */
-/*      h5g_flags[4] = H5G_LINK; */
-      h5g_flags[5] = H5L_TYPE_ERROR;
-      h5g_flags[6] = H5L_TYPE_HARD;
-      h5g_flags[7] = H5L_TYPE_SOFT;
+/*      h5g_flags[4] = H5G_LINK; */    
+    h5g_flags[5] = (int_f)H5L_TYPE_ERROR;
+    h5g_flags[6] = (int_f)H5L_TYPE_HARD;
+    h5g_flags[7] = (int_f)H5L_TYPE_SOFT;
+
+    h5g_flags[8] = (int_f)H5G_STORAGE_TYPE_UNKNOWN;
+    h5g_flags[9] = (int_f)H5G_STORAGE_TYPE_SYMBOL_TABLE;
+    h5g_flags[10] = (int_f)H5G_STORAGE_TYPE_COMPACT;
+    h5g_flags[11] = (int_f)H5G_STORAGE_TYPE_DENSE;
 
 /*
  *  H5I flags
  */
 
-      h5i_flags[0] = H5I_FILE;
-      h5i_flags[1] = H5I_GROUP;
-      h5i_flags[2] = H5I_DATATYPE;
-      h5i_flags[3] = H5I_DATASPACE;
-      h5i_flags[4] = H5I_DATASET;
-      h5i_flags[5] = H5I_ATTR;
-      h5i_flags[6] = H5I_BADID;
+    h5i_flags[0] = (int_f)H5I_FILE;
+    h5i_flags[1] = (int_f)H5I_GROUP;
+    h5i_flags[2] = (int_f)H5I_DATATYPE;
+    h5i_flags[3] = (int_f)H5I_DATASPACE;
+    h5i_flags[4] = (int_f)H5I_DATASET;
+    h5i_flags[5] = (int_f)H5I_ATTR;
+    h5i_flags[6] = (int_f)H5I_BADID;
+/*
+ *  H5L flags
+ */
+    h5l_flags[0] = (int_f)H5L_TYPE_ERROR;
+    h5l_flags[1] = (int_f)H5L_TYPE_HARD;
+    h5l_flags[2] = (int_f)H5L_TYPE_SOFT;
+    h5l_flags[3] = (int_f)H5L_TYPE_EXTERNAL;
+    h5l_flags[4] = (int_f)H5L_SAME_LOC; /* Macro to indicate operation occurs on same location */
+    h5l_flags[5] = (int_f)H5L_LINK_CLASS_T_VERS; /* Current version of the H5L_class_t struct */
+ 
+/*
+ *  H5O flags
+ */
+
+/* Flags for object copy (H5Ocopy) */
+    h5o_flags[0] = (int_f)H5O_COPY_SHALLOW_HIERARCHY_FLAG; /* Copy only immediate members */
+    h5o_flags[1] = (int_f)H5O_COPY_EXPAND_SOFT_LINK_FLAG; /* Expand soft links into new objects */
+    h5o_flags[2] = (int_f)H5O_COPY_EXPAND_EXT_LINK_FLAG; /* Expand external links into new objects */
+    h5o_flags[3] = (int_f)H5O_COPY_EXPAND_REFERENCE_FLAG; /* Copy objects that are pointed by references */
+    h5o_flags[4] = (int_f)H5O_COPY_WITHOUT_ATTR_FLAG; /* Copy object without copying attributes */
+    h5o_flags[5] = (int_f)H5O_COPY_PRESERVE_NULL_FLAG; /* Copy NULL messages (empty space) */
+    h5o_flags[6] = (int_f)H5O_COPY_ALL; /* All object copying flags (for internal checking) */
+
+/* Flags for shared message indexes.
+ * Pass these flags in using the mesg_type_flags parameter in
+ * H5P_set_shared_mesg_index.
+ * (Developers: These flags correspond to object header message type IDs,
+ * but we need to assign each kind of message to a different bit so that
+ * one index can hold multiple types.)
+ */
+      h5o_flags[7] = (int_f)H5O_SHMESG_NONE_FLAG;  /* No shared messages */
+      h5o_flags[8] = (int_f)H5O_SHMESG_SDSPACE_FLAG; /* Simple Dataspace Message.  */
+      h5o_flags[9] = (int_f)H5O_SHMESG_DTYPE_FLAG; /* Datatype Message.  */
+      h5o_flags[10] = (int_f)H5O_SHMESG_FILL_FLAG; /* Fill Value Message. */
+      h5o_flags[11] = (int_f)H5O_SHMESG_PLINE_FLAG; /* Filter pipeline message.  */
+      h5o_flags[12] = (int_f)H5O_SHMESG_ATTR_FLAG; /* Attribute Message.  */
+      h5o_flags[13] = (int_f)H5O_SHMESG_ALL_FLAG;
+
+/* Object header status flag definitions */
+      h5o_flags[14] = (int_f)H5O_HDR_CHUNK0_SIZE; /* 2-bit field indicating # of bytes to store the size of chunk 0's data */
+      h5o_flags[15] = (int_f)H5O_HDR_ATTR_CRT_ORDER_TRACKED; /* Attribute creation order is tracked */
+      h5o_flags[16] = (int_f)H5O_HDR_ATTR_CRT_ORDER_INDEXED; /* Attribute creation order has index */
+      h5o_flags[17] = (int_f)H5O_HDR_ATTR_STORE_PHASE_CHANGE; /* Non-default attribute storage phase change values stored */
+      h5o_flags[18] = (int_f)H5O_HDR_STORE_TIMES; /* Store access, modification, change & birth times for object */
+      h5o_flags[19] = (int_f)H5O_HDR_ALL_FLAGS; 
+
+/* Maximum shared message values.  Number of indexes is 8 to allow room to add
+ * new types of messages.
+ */
+      h5o_flags[20] = (int_f)H5O_SHMESG_MAX_NINDEXES;
+      h5o_flags[21] = (int_f)H5O_SHMESG_MAX_LIST_SIZE;
 
 /*
  *  H5P flags
  */
 
-      h5p_flags[0] = H5P_FILE_CREATE;
-      h5p_flags[1] = H5P_FILE_ACCESS;
-      h5p_flags[2] = H5P_DATASET_CREATE;
-      h5p_flags[3] = H5P_DATASET_XFER;
-      h5p_flags[4] = H5P_FILE_MOUNT;
-      h5p_flags[5] = H5P_DEFAULT;
-      h5p_flags[6] = H5P_ROOT;
-
+      h5p_flags[0] = (hid_t_f)H5P_FILE_CREATE;
+      h5p_flags[1] = (hid_t_f)H5P_FILE_ACCESS;
+      h5p_flags[2] = (hid_t_f)H5P_DATASET_CREATE;
+      h5p_flags[3] = (hid_t_f)H5P_DATASET_XFER;
+      h5p_flags[4] = (hid_t_f)H5P_FILE_MOUNT;
+      h5p_flags[5] = (hid_t_f)H5P_DEFAULT;
+      h5p_flags[6] = (hid_t_f)H5P_ROOT;
+      h5p_flags[7] = (hid_t_f)H5P_CRT_ORDER_INDEXED;
+      h5p_flags[8] = (hid_t_f)H5P_CRT_ORDER_TRACKED;
+      h5p_flags[9] = (hid_t_f)H5P_OBJECT_CREATE;
+      h5p_flags[10] = (hid_t_f)H5P_DATASET_ACCESS;
+      h5p_flags[11] = (hid_t_f)H5P_GROUP_CREATE;
+      h5p_flags[12] = (hid_t_f)H5P_GROUP_ACCESS;
+      h5p_flags[13] = (hid_t_f)H5P_DATATYPE_CREATE;
+      h5p_flags[14] = (hid_t_f)H5P_DATATYPE_ACCESS;
+      h5p_flags[15] = (hid_t_f)H5P_STRING_CREATE;
+      h5p_flags[16] = (hid_t_f)H5P_ATTRIBUTE_CREATE;
+      h5p_flags[17] = (hid_t_f)H5P_OBJECT_COPY;
+      h5p_flags[18] = (hid_t_f)H5P_LINK_CREATE;
+      h5p_flags[19] = (hid_t_f)H5P_LINK_ACCESS;
 /*
  *  H5R flags
  */
 
-      h5r_flags[0] = H5R_OBJECT;
-      h5r_flags[1] = H5R_DATASET_REGION;
+      h5r_flags[0] = (int_f)H5R_OBJECT;
+      h5r_flags[1] = (int_f)H5R_DATASET_REGION;
 
 /*
  *  H5S flags
  */
 
 
-      h5s_flags[0] = H5S_SCALAR;
-      h5s_flags[1] = H5S_SIMPLE;
-      h5s_flags[2] = H5S_NULL;
-      h5s_flags[3] = H5S_SELECT_SET;
-      h5s_flags[4] = H5S_SELECT_OR;
+      h5s_flags[0] = (int_f)H5S_SCALAR;
+      h5s_flags[1] = (int_f)H5S_SIMPLE;
+      h5s_flags[2] = (int_f)H5S_NULL;
+      h5s_flags[3] = (int_f)H5S_SELECT_SET;
+      h5s_flags[4] = (int_f)H5S_SELECT_OR;
       h5s_flags[5] = (int_f)H5S_UNLIMITED;
       h5s_flags[6] = (int_f)H5S_ALL;
 
-      h5s_flags[7] = H5S_SELECT_NOOP;
-      h5s_flags[8] = H5S_SELECT_AND;
-      h5s_flags[9] = H5S_SELECT_XOR;
-      h5s_flags[10] = H5S_SELECT_NOTB;
-      h5s_flags[11] = H5S_SELECT_NOTA;
-      h5s_flags[12] = H5S_SELECT_APPEND;
-      h5s_flags[13] = H5S_SELECT_PREPEND;
-      h5s_flags[14] = H5S_SELECT_INVALID;
+      h5s_flags[7] = (int_f)H5S_SELECT_NOOP;
+      h5s_flags[8] = (int_f)H5S_SELECT_AND;
+      h5s_flags[9] = (int_f)H5S_SELECT_XOR;
+      h5s_flags[10] = (int_f)H5S_SELECT_NOTB;
+      h5s_flags[11] = (int_f)H5S_SELECT_NOTA;
+      h5s_flags[12] = (int_f)H5S_SELECT_APPEND;
+      h5s_flags[13] = (int_f)H5S_SELECT_PREPEND;
+      h5s_flags[14] = (int_f)H5S_SELECT_INVALID;
 
 
-      h5s_flags[15] = H5S_SEL_ERROR;
-      h5s_flags[16] = H5S_SEL_NONE;
-      h5s_flags[17] = H5S_SEL_POINTS;
-      h5s_flags[18] = H5S_SEL_HYPERSLABS;
-      h5s_flags[19] = H5S_SEL_ALL;
+      h5s_flags[15] = (int_f)H5S_SEL_ERROR;
+      h5s_flags[16] = (int_f)H5S_SEL_NONE;
+      h5s_flags[17] = (int_f)H5S_SEL_POINTS;
+      h5s_flags[18] = (int_f)H5S_SEL_HYPERSLABS;
+      h5s_flags[19] = (int_f)H5S_SEL_ALL;
 
 /*
  *  H5T flags
  */
 
 
-      h5t_flags[0] = H5T_NO_CLASS;
-      h5t_flags[1] = H5T_INTEGER;
-      h5t_flags[2] = H5T_FLOAT;
-      h5t_flags[3] = H5T_TIME;
-      h5t_flags[4] = H5T_STRING;
-      h5t_flags[5] = H5T_BITFIELD;
-      h5t_flags[6] = H5T_OPAQUE;
-      h5t_flags[7] = H5T_COMPOUND;
-      h5t_flags[8] = H5T_REFERENCE;
-      h5t_flags[9] = H5T_ENUM;
-      h5t_flags[10] = H5T_ORDER_LE;
-      h5t_flags[11] = H5T_ORDER_BE;
-      h5t_flags[12] = H5T_ORDER_VAX;
-      h5t_flags[13] = H5T_PAD_ZERO;
-      h5t_flags[14] = H5T_PAD_ONE;
-      h5t_flags[15] = H5T_PAD_BACKGROUND;
-      h5t_flags[16] = H5T_PAD_ERROR;
-      h5t_flags[17] = H5T_SGN_NONE;
-      h5t_flags[18] = H5T_SGN_2;
-      h5t_flags[19] = H5T_SGN_ERROR;
-      h5t_flags[20] = H5T_NORM_IMPLIED;
-      h5t_flags[21] = H5T_NORM_MSBSET;
-      h5t_flags[22] = H5T_NORM_NONE;
-      h5t_flags[23] = H5T_CSET_ASCII;
-      h5t_flags[24] = H5T_CSET_UTF8;
-      h5t_flags[25] = H5T_STR_NULLTERM;
-      h5t_flags[26] = H5T_STR_NULLPAD;
-      h5t_flags[27] = H5T_STR_SPACEPAD;
-      h5t_flags[28] = H5T_STR_ERROR;
-      h5t_flags[29] = H5T_VLEN;
-      h5t_flags[30] = H5T_ARRAY;
+      h5t_flags[0] = (int_f)H5T_NO_CLASS;
+      h5t_flags[1] = (int_f)H5T_INTEGER;
+      h5t_flags[2] = (int_f)H5T_FLOAT;
+      h5t_flags[3] = (int_f)H5T_TIME;
+      h5t_flags[4] = (int_f)H5T_STRING;
+      h5t_flags[5] = (int_f)H5T_BITFIELD;
+      h5t_flags[6] = (int_f)H5T_OPAQUE;
+      h5t_flags[7] = (int_f)H5T_COMPOUND;
+      h5t_flags[8] = (int_f)H5T_REFERENCE;
+      h5t_flags[9] = (int_f)H5T_ENUM;
+      h5t_flags[10] = (int_f)H5T_ORDER_LE;
+      h5t_flags[11] = (int_f)H5T_ORDER_BE;
+      h5t_flags[12] = (int_f)H5T_ORDER_VAX;
+      h5t_flags[13] = (int_f)H5T_PAD_ZERO;
+      h5t_flags[14] = (int_f)H5T_PAD_ONE;
+      h5t_flags[15] = (int_f)H5T_PAD_BACKGROUND;
+      h5t_flags[16] = (int_f)H5T_PAD_ERROR;
+      h5t_flags[17] = (int_f)H5T_SGN_NONE;
+      h5t_flags[18] = (int_f)H5T_SGN_2;
+      h5t_flags[19] = (int_f)H5T_SGN_ERROR;
+      h5t_flags[20] = (int_f)H5T_NORM_IMPLIED;
+      h5t_flags[21] = (int_f)H5T_NORM_MSBSET;
+      h5t_flags[22] = (int_f)H5T_NORM_NONE;
+      h5t_flags[23] = (int_f)H5T_CSET_ASCII;
+      h5t_flags[24] = (int_f)H5T_CSET_UTF8;
+      h5t_flags[25] = (int_f)H5T_STR_NULLTERM;
+      h5t_flags[26] = (int_f)H5T_STR_NULLPAD;
+      h5t_flags[27] = (int_f)H5T_STR_SPACEPAD;
+      h5t_flags[28] = (int_f)H5T_STR_ERROR;
+      h5t_flags[29] = (int_f)H5T_VLEN;
+      h5t_flags[30] = (int_f)H5T_ARRAY;
 /*
  *  H5Z flags
  */
 
-      h5z_flags[0] = H5Z_FILTER_ERROR;
-      h5z_flags[1] = H5Z_FILTER_NONE;
-      h5z_flags[2] = H5Z_FILTER_DEFLATE;
-      h5z_flags[3] = H5Z_FILTER_SHUFFLE;
-      h5z_flags[4] = H5Z_FILTER_FLETCHER32;
-      h5z_flags[5] = H5Z_ERROR_EDC;
-      h5z_flags[6] = H5Z_DISABLE_EDC;
-      h5z_flags[7] = H5Z_ENABLE_EDC;
-      h5z_flags[8] = H5Z_NO_EDC;
-      h5z_flags[9] = H5Z_FILTER_SZIP;
-      h5z_flags[10] = H5Z_FLAG_OPTIONAL;
-      h5z_flags[11] = H5Z_FILTER_CONFIG_ENCODE_ENABLED;
-      h5z_flags[12] = H5Z_FILTER_CONFIG_DECODE_ENABLED;
-      h5z_flags[13] = H5Z_FILTER_ALL;
+      h5z_flags[0] = (int_f)H5Z_FILTER_ERROR;
+      h5z_flags[1] = (int_f)H5Z_FILTER_NONE;
+      h5z_flags[2] = (int_f)H5Z_FILTER_DEFLATE;
+      h5z_flags[3] = (int_f)H5Z_FILTER_SHUFFLE;
+      h5z_flags[4] = (int_f)H5Z_FILTER_FLETCHER32;
+      h5z_flags[5] = (int_f)H5Z_ERROR_EDC;
+      h5z_flags[6] = (int_f)H5Z_DISABLE_EDC;
+      h5z_flags[7] = (int_f)H5Z_ENABLE_EDC;
+      h5z_flags[8] = (int_f)H5Z_NO_EDC;
+      h5z_flags[9] = (int_f)H5Z_FILTER_SZIP;
+      h5z_flags[10] = (int_f)H5Z_FLAG_OPTIONAL;
+      h5z_flags[11] = (int_f)H5Z_FILTER_CONFIG_ENCODE_ENABLED;
+      h5z_flags[12] = (int_f)H5Z_FILTER_CONFIG_DECODE_ENABLED;
+      h5z_flags[13] = (int_f)H5Z_FILTER_ALL;
+/*
+ *  H5A flags
+ */
+
+
+/*
+ *  H5 Generic flags introduced in version 1.8 -MSB-
+ */
+
+      /* H5_index_t enum struct */
+
+      h5_generic_flags[0] = (int_f)H5_INDEX_UNKNOWN;   /* Unknown index type			*/
+      h5_generic_flags[1] = (int_f)H5_INDEX_NAME;      /* Index on names 			*/
+      h5_generic_flags[2] = (int_f)H5_INDEX_CRT_ORDER; /* Index on creation order 		*/
+      h5_generic_flags[3] = (int_f)H5_INDEX_N;         /* Index on creation order 		*/
+      
+      
+      /* H5_iter_order_t enum struct */
+
+      h5_generic_flags[4] = (int_f)H5_ITER_UNKNOWN;       /* Unknown order */
+      h5_generic_flags[5] = (int_f)H5_ITER_INC;           /* Increasing order */
+      h5_generic_flags[6] = (int_f)H5_ITER_DEC;           /* Decreasing order */
+      h5_generic_flags[7] = (int_f)H5_ITER_NATIVE;        /* No particular order, whatever is fastest */
+      h5_generic_flags[8] = (int_f)H5_ITER_N;		   /* Number of iteration orders */
 
     ret_value = 0;
     return ret_value;
diff --git a/fortran/src/H5_ff.f90 b/fortran/src/H5_ff.f90
index eeffa34..899ce00 100644
--- a/fortran/src/H5_ff.f90
+++ b/fortran/src/H5_ff.f90
@@ -13,8 +13,9 @@
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
 !
-   MODULE H5LIB
-     CONTAINS
+MODULE H5LIB
+
+CONTAINS
 !----------------------------------------------------------------------
 ! Name:		h5open_f 
 !
@@ -37,18 +38,18 @@
 !
 ! Comment:		
 !----------------------------------------------------------------------
-      SUBROUTINE h5open_f(error)
+  SUBROUTINE h5open_f(error)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5open_f
 !DEC$endif
 !
-        USE H5GLOBAL
+    USE H5GLOBAL
 
-        IMPLICIT NONE
-        INTEGER, INTENT(OUT) :: error
-        INTEGER :: error_0, error_1, error_2, error_3
+    IMPLICIT NONE
+    INTEGER, INTENT(OUT) :: error
+    INTEGER :: error_0, error_1, error_2, error_3
 !        INTEGER, EXTERNAL :: h5init_types_c
 !        INTEGER, EXTERNAL :: h5init_flags_c
 !        INTEGER, EXTERNAL :: h5init1_flags_c
@@ -57,78 +58,87 @@
 !
 ! MS FORTRAN needs explicit interfaces for C functions called here.
 !
-        INTERFACE
-          INTEGER FUNCTION h5open_c()
-          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5OPEN_C'::h5open_c
-          !DEC$ ENDIF
-          END FUNCTION h5open_c
-        END INTERFACE
-        INTERFACE
-          INTEGER FUNCTION h5init_types_c(p_types, f_types, i_types)
-          USE H5GLOBAL
-          INTEGER(HID_T), DIMENSION(PREDEF_TYPES_LEN) :: p_types
-          INTEGER(HID_T), DIMENSION(FLOATING_TYPES_LEN) :: f_types
-          INTEGER(HID_T), DIMENSION(INTEGER_TYPES_LEN) :: i_types   
-          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5INIT_TYPES_C'::h5init_types_c
-          !DEC$ ENDIF
-          END FUNCTION h5init_types_c
-        END INTERFACE
-        INTERFACE
-          INTEGER FUNCTION h5init_flags_c(i_H5D_flags, &
-                                i_H5F_flags, &
-                                i_H5FD_flags, &
-                                i_H5FD_hid_flags, &
-                                i_H5G_flags, &
-                                i_H5I_flags, &
-                                i_H5P_flags, &
-                                i_H5R_flags, &
-                                i_H5S_flags, &
-                                i_H5T_flags, &               
-                                i_H5Z_flags)
-          USE H5GLOBAL
-          INTEGER i_H5F_flags(H5F_FLAGS_LEN)
-          INTEGER i_H5G_flags(H5G_FLAGS_LEN)
-          INTEGER i_H5D_flags(H5D_FLAGS_LEN)
-          INTEGER i_H5FD_flags(H5FD_FLAGS_LEN)
-          INTEGER(HID_T) i_H5FD_hid_flags(H5FD_HID_FLAGS_LEN)
-          INTEGER i_H5I_flags(H5I_FLAGS_LEN)
-          INTEGER(HID_T) i_H5P_flags(H5P_FLAGS_LEN)
-          INTEGER i_H5R_flags(H5R_FLAGS_LEN)
-          INTEGER i_H5S_flags(H5S_FLAGS_LEN)
-          INTEGER i_H5T_flags(H5T_FLAGS_LEN)
-          INTEGER i_H5Z_flags(H5Z_FLAGS_LEN)
+    INTERFACE
+       INTEGER FUNCTION h5open_c()
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5OPEN_C'::h5open_c
+         !DEC$ ENDIF
+       END FUNCTION h5open_c
+    END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5init_types_c(p_types, f_types, i_types)
+         USE H5GLOBAL
+         INTEGER(HID_T), DIMENSION(PREDEF_TYPES_LEN) :: p_types
+         INTEGER(HID_T), DIMENSION(FLOATING_TYPES_LEN) :: f_types
+         INTEGER(HID_T), DIMENSION(INTEGER_TYPES_LEN) :: i_types   
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5INIT_TYPES_C'::h5init_types_c
+         !DEC$ ENDIF
+       END FUNCTION h5init_types_c
+    END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5init_flags_c(i_H5D_flags, &
+            i_H5F_flags, &
+            i_H5FD_flags, &
+            i_H5FD_hid_flags, &
+            i_H5G_flags, &
+            i_H5I_flags, &
+            i_H5L_flags, &
+            i_H5O_flags, &
+            i_H5P_flags, &
+            i_H5R_flags, &
+            i_H5S_flags, &
+            i_H5T_flags, &               
+            i_H5Z_flags, &
+            i_H5generic_flags)
+         USE H5GLOBAL
+         INTEGER i_H5F_flags(H5F_FLAGS_LEN)
+         INTEGER i_H5G_flags(H5G_FLAGS_LEN)
+         INTEGER i_H5D_flags(H5D_FLAGS_LEN)
+         INTEGER i_H5FD_flags(H5FD_FLAGS_LEN)
+         INTEGER(HID_T) i_H5FD_hid_flags(H5FD_HID_FLAGS_LEN)
+         INTEGER i_H5I_flags(H5I_FLAGS_LEN)
+         INTEGER i_H5L_flags(H5L_FLAGS_LEN)
+         INTEGER i_H5O_flags(H5O_FLAGS_LEN)
+         INTEGER(HID_T) i_H5P_flags(H5P_FLAGS_LEN)
+         INTEGER i_H5R_flags(H5R_FLAGS_LEN)
+         INTEGER i_H5S_flags(H5S_FLAGS_LEN)
+         INTEGER i_H5T_flags(H5T_FLAGS_LEN)
+         INTEGER i_H5Z_flags(H5Z_FLAGS_LEN)
+         INTEGER i_H5generic_flags(H5generic_FLAGS_LEN)
           !DEC$ IF DEFINED(HDF5F90_WINDOWS)
           !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5INIT_FLAGS_C'::h5init_flags_c
           !DEC$ ENDIF
-          END FUNCTION h5init_flags_c
-        END INTERFACE
-        INTERFACE
-          INTEGER FUNCTION h5init1_flags_c( i_H5LIB_flags )
-          USE H5GLOBAL
-          INTEGER i_H5LIB_flags(H5LIB_FLAGS_LEN)
-          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5INIT1_FLAGS_C'::h5init1_flags_c
-          !DEC$ ENDIF
-          END FUNCTION h5init1_flags_c
-        END INTERFACE
-        error_0 = h5open_c()
-        error_1 = h5init_types_c(predef_types, floating_types, integer_types)
-        error_2 = h5init_flags_c(H5D_flags, &
-                                H5F_flags, &
-                                H5FD_flags, &
-                                H5FD_hid_flags, &
-                                H5G_flags, &
-                                H5I_flags, &
-                                H5P_flags, &
-                                H5R_flags, &
-                                H5S_flags, &
-                                H5T_flags, &
-                                H5Z_flags)
-        error_3 = h5init1_flags_c(H5LIB_flags )
-        error = error_0 + error_1 + error_2 + error_3
-      END SUBROUTINE h5open_f
+       END FUNCTION h5init_flags_c
+    END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5init1_flags_c( i_H5LIB_flags )
+         USE H5GLOBAL
+         INTEGER i_H5LIB_flags(H5LIB_FLAGS_LEN)
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5INIT1_FLAGS_C'::h5init1_flags_c
+         !DEC$ ENDIF
+       END FUNCTION h5init1_flags_c
+    END INTERFACE
+    error_0 = h5open_c()
+    error_1 = h5init_types_c(predef_types, floating_types, integer_types)
+    error_2 = h5init_flags_c(H5D_flags, &
+         H5F_flags, &
+         H5FD_flags, &
+         H5FD_hid_flags, &
+         H5G_flags, &
+         H5I_flags, &
+         H5L_flags, &
+         H5O_flags, &
+         H5P_flags, &
+         H5R_flags, &
+         H5S_flags, &
+         H5T_flags, &
+         H5Z_flags, &
+         H5generic_flags)
+    error_3 = h5init1_flags_c(H5LIB_flags )
+    error = error_0 + error_1 + error_2 + error_3
+  END SUBROUTINE h5open_f
 
 !----------------------------------------------------------------------
 ! Name:		h5close_f 
@@ -153,49 +163,49 @@
 ! Comment:		
 !----------------------------------------------------------------------
 
-      SUBROUTINE h5close_f(error)
+  SUBROUTINE h5close_f(error)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5close_f
 !DEC$endif
 !
-        USE H5GLOBAL
+    USE H5GLOBAL
 
-        IMPLICIT NONE
-        INTEGER :: error_1, error_2
-        INTEGER, INTENT(OUT) :: error
-!        INTEGER, EXTERNAL :: h5close_types_c, h5close_c
-        INTERFACE
-          INTEGER FUNCTION h5close_c()
-          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5CLOSE_C'::h5close_c
-          !DEC$ ENDIF
-          END FUNCTION h5close_c
-        END INTERFACE
-        INTERFACE
-          INTEGER FUNCTION h5close_types_c(p_types, P_TYPES_LEN, &
-                                         f_types, F_TYPES_LEN, &
-                                         i_types, I_TYPES_LEN )
-          USE H5GLOBAL
-          INTEGER P_TYPES_LEN
-          INTEGER F_TYPES_LEN
-          INTEGER I_TYPES_LEN
-          INTEGER(HID_T), DIMENSION(P_TYPES_LEN) :: p_types
-          INTEGER(HID_T), DIMENSION(F_TYPES_LEN) :: f_types
-          INTEGER(HID_T), DIMENSION(I_TYPES_LEN) :: i_types   
-          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5CLOSE_TYPES_C'::h5close_types_c
-          !DEC$ ENDIF
-          END FUNCTION h5close_types_c
-        END INTERFACE
-        error_1 = h5close_types_c(predef_types, PREDEF_TYPES_LEN, &
-                                floating_types, FLOATING_TYPES_LEN, &
-                                integer_types, INTEGER_TYPES_LEN )
-        error_2 = h5close_c()
-        error = error_1 + error_2
+    IMPLICIT NONE
+    INTEGER :: error_1, error_2
+    INTEGER, INTENT(OUT) :: error
+    !        INTEGER, EXTERNAL :: h5close_types_c, h5close_c
+    INTERFACE
+       INTEGER FUNCTION h5close_c()
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5CLOSE_C'::h5close_c
+         !DEC$ ENDIF
+       END FUNCTION h5close_c
+    END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5close_types_c(p_types, P_TYPES_LEN, &
+            f_types, F_TYPES_LEN, &
+            i_types, I_TYPES_LEN )
+         USE H5GLOBAL
+         INTEGER P_TYPES_LEN
+         INTEGER F_TYPES_LEN
+         INTEGER I_TYPES_LEN
+         INTEGER(HID_T), DIMENSION(P_TYPES_LEN) :: p_types
+         INTEGER(HID_T), DIMENSION(F_TYPES_LEN) :: f_types
+         INTEGER(HID_T), DIMENSION(I_TYPES_LEN) :: i_types   
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5CLOSE_TYPES_C'::h5close_types_c
+         !DEC$ ENDIF
+       END FUNCTION h5close_types_c
+    END INTERFACE
+    error_1 = h5close_types_c(predef_types, PREDEF_TYPES_LEN, &
+         floating_types, FLOATING_TYPES_LEN, &
+         integer_types, INTEGER_TYPES_LEN )
+    error_2 = h5close_c()
+    error = error_1 + error_2
 
-      END SUBROUTINE h5close_f
+  END SUBROUTINE h5close_f
         
 !----------------------------------------------------------------------
 ! Name:		h5get_libversion_f 
@@ -219,29 +229,29 @@
 ! Comment:		
 !----------------------------------------------------------------------
 
-      SUBROUTINE h5get_libversion_f(majnum, minnum, relnum, error)
+  SUBROUTINE h5get_libversion_f(majnum, minnum, relnum, error)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5get_libversion_f
 !DEC$endif
 !
-        USE H5GLOBAL
-
-        IMPLICIT NONE
-        INTEGER, INTENT(OUT) :: majnum, minnum, relnum, error
-        INTERFACE
-          INTEGER FUNCTION h5get_libversion_c(majnum, minnum, relnum)
-          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GET_LIBVERSION_C'::h5get_libversion_c
-          !DEC$ ENDIF
-          INTEGER, INTENT(OUT) :: majnum, minnum, relnum
-          END FUNCTION h5get_libversion_c
-        END INTERFACE
-
-        error = h5get_libversion_c(majnum, minnum, relnum)
-
-      END SUBROUTINE h5get_libversion_f
+    USE H5GLOBAL
+    
+    IMPLICIT NONE
+    INTEGER, INTENT(OUT) :: majnum, minnum, relnum, error
+    INTERFACE
+       INTEGER FUNCTION h5get_libversion_c(majnum, minnum, relnum)
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GET_LIBVERSION_C'::h5get_libversion_c
+         !DEC$ ENDIF
+         INTEGER, INTENT(OUT) :: majnum, minnum, relnum
+       END FUNCTION h5get_libversion_c
+    END INTERFACE
+    
+    error = h5get_libversion_c(majnum, minnum, relnum)
+    
+  END SUBROUTINE h5get_libversion_f
 
 !----------------------------------------------------------------------
 ! Name:		h5check_version_f 
@@ -265,30 +275,30 @@
 ! Comment:		
 !----------------------------------------------------------------------
 
-      SUBROUTINE h5check_version_f(majnum, minnum, relnum, error)
+  SUBROUTINE h5check_version_f(majnum, minnum, relnum, error)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5check_version_f
 !DEC$endif
 !
-        USE H5GLOBAL
-
-        IMPLICIT NONE
-        INTEGER, INTENT(IN) :: majnum, minnum, relnum
-        INTEGER, INTENT(OUT) :: error
-        INTERFACE
-          INTEGER FUNCTION h5check_version_c(majnum, minnum, relnum)
-          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5CHECK_VERSION_C'::h5check_version_c
-          !DEC$ ENDIF
-          INTEGER, INTENT(IN) :: majnum, minnum, relnum
-          END FUNCTION h5check_version_c
-        END INTERFACE
-
-        error = h5check_version_c(majnum, minnum, relnum)
-
-      END SUBROUTINE h5check_version_f
+    USE H5GLOBAL
+    
+    IMPLICIT NONE
+    INTEGER, INTENT(IN) :: majnum, minnum, relnum
+    INTEGER, INTENT(OUT) :: error
+    INTERFACE
+       INTEGER FUNCTION h5check_version_c(majnum, minnum, relnum)
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5CHECK_VERSION_C'::h5check_version_c
+         !DEC$ ENDIF
+         INTEGER, INTENT(IN) :: majnum, minnum, relnum
+       END FUNCTION h5check_version_c
+    END INTERFACE
+    
+    error = h5check_version_c(majnum, minnum, relnum)
+    
+  END SUBROUTINE h5check_version_f
 
 !----------------------------------------------------------------------
 ! Name:		h5garbage_collect_f 
@@ -310,28 +320,28 @@
 ! Comment:		
 !----------------------------------------------------------------------
 
-      SUBROUTINE h5garbage_collect_f(error)
+  SUBROUTINE h5garbage_collect_f(error)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5garbage_collect_f
 !DEC$endif
 !
-        USE H5GLOBAL
+    USE H5GLOBAL
+    
+    IMPLICIT NONE
+    INTEGER, INTENT(OUT) :: error
+    INTERFACE
+       INTEGER FUNCTION h5garbage_collect_c()
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GARBAGE_COLLECT_C'::h5garbage_collect_c
+         !DEC$ ENDIF
+       END FUNCTION h5garbage_collect_c
+    END INTERFACE
+    
+    error = h5garbage_collect_c()
 
-        IMPLICIT NONE
-        INTEGER, INTENT(OUT) :: error
-        INTERFACE
-          INTEGER FUNCTION h5garbage_collect_c()
-          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GARBAGE_COLLECT_C'::h5garbage_collect_c
-          !DEC$ ENDIF
-          END FUNCTION h5garbage_collect_c
-        END INTERFACE
-
-        error = h5garbage_collect_c()
-
-      END SUBROUTINE h5garbage_collect_f
+  END SUBROUTINE h5garbage_collect_f
 
 !----------------------------------------------------------------------
 ! Name:		h5dont_atexit_f 
@@ -353,26 +363,26 @@
 ! Comment:		
 !----------------------------------------------------------------------
 
-      SUBROUTINE h5dont_atexit_f(error)
+  SUBROUTINE h5dont_atexit_f(error)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5dont_atexit_f
 !DEC$endif
 !
-        USE H5GLOBAL
-
-        IMPLICIT NONE
-        INTEGER, INTENT(OUT) :: error
-        INTERFACE
-          INTEGER FUNCTION h5dont_atexit_c()
-          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DONT_ATEXIT_C'::h5dont_atexit_c
-          !DEC$ ENDIF
-          END FUNCTION h5dont_atexit_c
-        END INTERFACE
-
-        error = h5dont_atexit_c()
-
-      END SUBROUTINE h5dont_atexit_f
-   END MODULE H5LIB
+    USE H5GLOBAL
+    
+    IMPLICIT NONE
+    INTEGER, INTENT(OUT) :: error
+    INTERFACE
+       INTEGER FUNCTION h5dont_atexit_c()
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DONT_ATEXIT_C'::h5dont_atexit_c
+         !DEC$ ENDIF
+       END FUNCTION h5dont_atexit_c
+    END INTERFACE
+    
+    error = h5dont_atexit_c()
+    
+  END SUBROUTINE h5dont_atexit_f
+END MODULE H5LIB
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90
index a13d732..8a8ca8e 100644
--- a/fortran/src/H5f90global.f90
+++ b/fortran/src/H5f90global.f90
@@ -15,19 +15,20 @@
 !
     MODULE H5GLOBAL
       USE H5FORTRAN_TYPES
+! 
 !
 ! Definitions for reference datatypes.
 ! If you change the value of these parameters, do not forget to change corresponding
 ! values in the H5f90.h file. 
-        INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 
+      INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 
 
-        TYPE hobj_ref_t_f
-             INTEGER(HADDR_T) ref
-        END TYPE 
+      TYPE hobj_ref_t_f
+         INTEGER(HADDR_T) ref
+      END TYPE hobj_ref_t_f
 
-        TYPE hdset_reg_ref_t_f
-             INTEGER ref(REF_REG_BUF_LEN) 
-        END TYPE 
+      TYPE hdset_reg_ref_t_f
+         INTEGER ref(REF_REG_BUF_LEN) 
+      END TYPE hdset_reg_ref_t_f
 
       INTEGER, PARAMETER :: PREDEF_TYPES_LEN = 6 ! Do not forget to change this
                                                  ! value when new predefined
@@ -41,32 +42,32 @@
       INTEGER, PARAMETER :: INTEGER_TYPES_LEN = 17
 
       INTEGER(HID_T) H5T_NATIVE_INTEGER, &
-                     H5T_NATIVE_REAL, &
-                     H5T_NATIVE_DOUBLE, &
-                     H5T_NATIVE_CHARACTER , &
-                     H5T_STD_REF_OBJ,      &
-                     H5T_STD_REF_DSETREG, &
-                     H5T_IEEE_F32BE,  &
-                     H5T_IEEE_F32LE,  &
-                     H5T_IEEE_F64BE,  &
-                     H5T_IEEE_F64LE,  &
-                     H5T_STD_I8BE,    &
-                     H5T_STD_I8LE,    &
-                     H5T_STD_I16BE,   &
-                     H5T_STD_I16LE,   &
-                     H5T_STD_I32BE,   &
-                     H5T_STD_I32LE,   &
-                     H5T_STD_I64BE,   &
-                     H5T_STD_I64LE,   &
-                     H5T_STD_U8BE,    &
-                     H5T_STD_U8LE,    &
-                     H5T_STD_U16BE,   &
-                     H5T_STD_U16LE,   &
-                     H5T_STD_U32BE,   &
-                     H5T_STD_U32LE,   &
-                     H5T_STD_U64BE,   &
-                     H5T_STD_U64LE,   &
-                     H5T_STRING
+           H5T_NATIVE_REAL, &
+           H5T_NATIVE_DOUBLE, &
+           H5T_NATIVE_CHARACTER , &
+           H5T_STD_REF_OBJ,      &
+           H5T_STD_REF_DSETREG, &
+           H5T_IEEE_F32BE,  &
+           H5T_IEEE_F32LE,  &
+           H5T_IEEE_F64BE,  &
+           H5T_IEEE_F64LE,  &
+           H5T_STD_I8BE,    &
+           H5T_STD_I8LE,    &
+           H5T_STD_I16BE,   &
+           H5T_STD_I16LE,   &
+           H5T_STD_I32BE,   &
+           H5T_STD_I32LE,   &
+           H5T_STD_I64BE,   &
+           H5T_STD_I64LE,   &
+           H5T_STD_U8BE,    &
+           H5T_STD_U8LE,    &
+           H5T_STD_U16BE,   &
+           H5T_STD_U16LE,   &
+           H5T_STD_U32BE,   &
+           H5T_STD_U32LE,   &
+           H5T_STD_U64BE,   &
+           H5T_STD_U64LE,   &
+           H5T_STRING
 
 
       INTEGER(HID_T), DIMENSION(PREDEF_TYPES_LEN) :: predef_types
@@ -76,13 +77,13 @@
       EQUIVALENCE (predef_types(4), H5T_NATIVE_CHARACTER)
       EQUIVALENCE (predef_types(5), H5T_STD_REF_OBJ)
       EQUIVALENCE (predef_types(6), H5T_STD_REF_DSETREG)
-
+      
       INTEGER(HID_T), DIMENSION(FLOATING_TYPES_LEN) :: floating_types
       EQUIVALENCE (floating_types(1), H5T_IEEE_F32BE )
       EQUIVALENCE (floating_types(2), H5T_IEEE_F32LE)
       EQUIVALENCE (floating_types(3), H5T_IEEE_F64BE)
       EQUIVALENCE (floating_types(4), H5T_IEEE_F64LE)
-
+      
       INTEGER(HID_T), DIMENSION(INTEGER_TYPES_LEN) :: integer_types
       EQUIVALENCE (integer_types(1), H5T_STD_I8BE )
       EQUIVALENCE (integer_types(2), H5T_STD_I8LE)
@@ -151,7 +152,7 @@
 !
 ! H5F flags declaration
 !
-      INTEGER, PARAMETER :: H5F_FLAGS_LEN = 16
+      INTEGER, PARAMETER :: H5F_FLAGS_LEN = 19
       INTEGER H5F_flags(H5F_FLAGS_LEN)
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$ ATTRIBUTES DLLEXPORT :: /H5F_FLAGS/
@@ -174,6 +175,8 @@
       INTEGER :: H5F_OBJ_GROUP_F
       INTEGER :: H5F_OBJ_DATATYPE_F
       INTEGER :: H5F_OBJ_ALL_F
+      INTEGER :: H5F_LIBVER_EARLIEST_F
+      INTEGER :: H5F_LIBVER_LATEST_F
 
       EQUIVALENCE(H5F_flags(1), H5F_ACC_RDWR_F)
       EQUIVALENCE(H5F_flags(2), H5F_ACC_RDONLY_F)
@@ -191,10 +194,43 @@
       EQUIVALENCE(H5F_flags(14), H5F_OBJ_GROUP_F)
       EQUIVALENCE(H5F_flags(15), H5F_OBJ_DATATYPE_F)
       EQUIVALENCE(H5F_flags(16), H5F_OBJ_ALL_F)
+      EQUIVALENCE(H5F_flags(17), H5F_LIBVER_EARLIEST_F)
+      EQUIVALENCE(H5F_flags(18), H5F_LIBVER_LATEST_F)
+!
+! H5generic flags declaration
+!
+      INTEGER, PARAMETER :: H5generic_FLAGS_LEN = 9
+      INTEGER H5generic_flags(H5generic_FLAGS_LEN)
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$ ATTRIBUTES DLLEXPORT :: /H5generic_FLAGS/
+!DEC$endif
+      COMMON /H5generic_FLAGS/ H5generic_flags
+
+      INTEGER :: H5_INDEX_UNKNOWN_F
+      INTEGER :: H5_INDEX_NAME_F
+      INTEGER :: H5_INDEX_CRT_ORDER_F
+      INTEGER :: H5_INDEX_N_F
+      INTEGER :: H5_ITER_UNKNOWN_F
+      INTEGER :: H5_ITER_INC_F
+      INTEGER :: H5_ITER_DEC_F
+      INTEGER :: H5_ITER_NATIVE_F 
+      INTEGER :: H5_ITER_N_F
+
+      EQUIVALENCE(H5generic_flags(1), H5_INDEX_UNKNOWN_F)
+      EQUIVALENCE(H5generic_flags(2), H5_INDEX_NAME_F)
+      EQUIVALENCE(H5generic_flags(3), H5_INDEX_CRT_ORDER_F)
+      EQUIVALENCE(H5generic_flags(4), H5_INDEX_N_F)
+      EQUIVALENCE(H5generic_flags(5), H5_ITER_UNKNOWN_F)
+      EQUIVALENCE(H5generic_flags(6), H5_ITER_INC_F)     
+      EQUIVALENCE(H5generic_flags(7), H5_ITER_DEC_F)
+      EQUIVALENCE(H5generic_flags(8), H5_ITER_NATIVE_F)
+      EQUIVALENCE(H5generic_flags(9), H5_ITER_N_F)
+
+
 !
 ! H5G flags declaration
 !
-      INTEGER, PARAMETER :: H5G_FLAGS_LEN = 8 
+      INTEGER, PARAMETER :: H5G_FLAGS_LEN = 12
       INTEGER H5G_flags(H5G_FLAGS_LEN)
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$ ATTRIBUTES DLLEXPORT :: /H5G_FLAGS/
@@ -210,16 +246,26 @@
       INTEGER :: H5G_LINK_ERROR_F
       INTEGER :: H5G_LINK_HARD_F
       INTEGER :: H5G_LINK_SOFT_F
+      INTEGER :: H5G_STORAGE_TYPE_UNKNOWN_F
+      INTEGER :: H5G_STORAGE_TYPE_SYMBOL_TABLE_F
+      INTEGER :: H5G_STORAGE_TYPE_COMPACT_F
+      INTEGER :: H5G_STORAGE_TYPE_DENSE_F
 
       EQUIVALENCE(H5G_flags(1), H5G_UNKNOWN_F)
       EQUIVALENCE(H5G_flags(2), H5G_GROUP_F)
       EQUIVALENCE(H5G_flags(3), H5G_DATASET_F)
       EQUIVALENCE(H5G_flags(4), H5G_TYPE_F) 
-! XXX: Fix problems with H5G_LINK_F! - QAK
+! XXX: Fix problems with H5G_LINK_F! - QAK ! these are really H5L values -MSB-
       EQUIVALENCE(H5G_flags(5), H5G_LINK_F)
-      EQUIVALENCE(H5G_flags(6), H5G_LINK_ERROR_F) 
-      EQUIVALENCE(H5G_flags(7), H5G_LINK_HARD_F) 
-      EQUIVALENCE(H5G_flags(8), H5G_LINK_SOFT_F) 
+      EQUIVALENCE(H5G_flags(6), H5G_LINK_ERROR_F)
+      EQUIVALENCE(H5G_flags(7), H5G_LINK_HARD_F)
+      EQUIVALENCE(H5G_flags(8), H5G_LINK_SOFT_F)
+! XXX
+
+      EQUIVALENCE(H5G_flags(9), H5G_STORAGE_TYPE_UNKNOWN_F ) 
+      EQUIVALENCE(H5G_flags(10), H5G_STORAGE_TYPE_SYMBOL_TABLE_F) 
+      EQUIVALENCE(H5G_flags(11), H5G_STORAGE_TYPE_COMPACT_F)  
+      EQUIVALENCE(H5G_flags(12), H5G_STORAGE_TYPE_DENSE_F) 
 !
 ! H5D flags declaration
 !
@@ -338,8 +384,6 @@
       EQUIVALENCE(H5FD_hid_flags(6), H5FD_SEC2_F)
       EQUIVALENCE(H5FD_hid_flags(7), H5FD_STDIO_F)
 
-      
-
 !
 ! H5I flags declaration
 !
@@ -365,24 +409,108 @@
       EQUIVALENCE(H5I_flags(5), H5I_DATASET_F)
       EQUIVALENCE(H5I_flags(6), H5I_ATTR_F)
       EQUIVALENCE(H5I_flags(7), H5I_BADID_F)
+!
+! H5L flags declaration
+!
+      INTEGER, PARAMETER :: H5L_FLAGS_LEN = 6
+      INTEGER :: H5L_flags(H5L_FLAGS_LEN)
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$ ATTRIBUTES DLLEXPORT :: /H5L_FLAGS/
+!DEC$endif
+      COMMON /H5L_FLAGS/ H5L_flags
+
+      EQUIVALENCE(H5L_flags(1), H5L_LINK_F)
+      EQUIVALENCE(H5L_flags(2), H5L_LINK_ERROR_F)
+      EQUIVALENCE(H5L_flags(3), H5L_LINK_HARD_F)
+      EQUIVALENCE(H5L_flags(4), H5L_LINK_SOFT_F)
+      EQUIVALENCE(H5L_flags(5), H5L_SAME_LOC_F)
+      EQUIVALENCE(H5L_flags(6), H5L_LINK_CLASS_T_VERS_F)
+!
+! H5O flags declaration
+!
+      INTEGER, PARAMETER :: H5O_FLAGS_LEN = 22
+      INTEGER :: H5o_flags(H5O_FLAGS_LEN)
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$ ATTRIBUTES DLLEXPORT :: /H5O_FLAGS/
+!DEC$endif
+      COMMON /H5O_FLAGS/ H5O_flags
+
+      INTEGER :: H5O_COPY_SHALLOW_HIERARCHY_F ! * THESE VARIABLES DO
+      INTEGER :: H5O_COPY_EXPAND_SOFT_LINK_F ! NOT MATCH THE C VARIABLE
+      INTEGER :: H5O_COPY_EXPAND_EXT_LINK_F !  IN ORDER
+      INTEGER :: H5O_COPY_EXPAND_REFERENCE_F ! TO STAY UNDER THE
+      INTEGER :: H5O_COPY_WITHOUT_ATTR_FLAG_F 
+      INTEGER :: H5O_COPY_PRESERVE_NULL_FLAG_F
+      INTEGER :: H5O_COPY_ALL_F
+      INTEGER :: H5O_SHMESG_NONE_FLAG_F
+      INTEGER :: H5O_SHMESG_SDSPACE_FLAG_F
+      INTEGER :: H5O_SHMESG_DTYPE_FLAG_F
+      INTEGER :: H5O_SHMESG_FILL_FLAG_F
+      INTEGER :: H5O_SHMESG_PLINE_FLAG_F
+      INTEGER :: H5O_SHMESG_ATTR_FLAG_F
+      INTEGER :: H5O_SHMESG_ALL_FLAG_F
+      INTEGER :: H5O_HDR_CHUNK0_SIZE_F
+      INTEGER :: H5O_HDR_ATTR_CRT_ORDER_TRACK_F ! 32 CHARACTER
+      INTEGER :: H5O_HDR_ATTR_CRT_ORDER_INDEX_F ! VARIABLE
+      INTEGER :: H5O_HDR_ATTR_STORE_PHASE_CHA_F !  LENGTH *
+      INTEGER :: H5O_HDR_STORE_TIMES_F
+      INTEGER :: H5O_HDR_ALL_FLAGS_F
+      INTEGER :: H5O_SHMESG_MAX_NINDEXES_F
+      INTEGER :: H5O_SHMESG_MAX_LIST_SIZE_F
+
+      EQUIVALENCE(h5o_flags(1) , H5O_COPY_SHALLOW_HIERARCHY_F)
+      EQUIVALENCE(h5o_flags(2) , H5O_COPY_EXPAND_SOFT_LINK_F)
+      EQUIVALENCE(h5o_flags(3) , H5O_COPY_EXPAND_EXT_LINK_F)
+      EQUIVALENCE(h5o_flags(4) , H5O_COPY_EXPAND_REFERENCE_F)
+      EQUIVALENCE(h5o_flags(5) , H5O_COPY_WITHOUT_ATTR_FLAG_F)
+      EQUIVALENCE(h5o_flags(6) , H5O_COPY_PRESERVE_NULL_FLAG_F)
+      EQUIVALENCE(h5o_flags(7) , H5O_COPY_ALL_F)
+      EQUIVALENCE(h5o_flags(8) , H5O_SHMESG_NONE_FLAG_F)
+      EQUIVALENCE(h5o_flags(9) , H5O_SHMESG_SDSPACE_FLAG_F)
+      EQUIVALENCE(h5o_flags(10) , H5O_SHMESG_DTYPE_FLAG_F)
+      EQUIVALENCE(h5o_flags(11) , H5O_SHMESG_FILL_FLAG_F)
+      EQUIVALENCE(h5o_flags(12) , H5O_SHMESG_PLINE_FLAG_F)
+      EQUIVALENCE(h5o_flags(13) , H5O_SHMESG_ATTR_FLAG_F)
+      EQUIVALENCE(h5o_flags(14) , H5O_SHMESG_ALL_FLAG_F)
+      EQUIVALENCE(h5o_flags(15) , H5O_HDR_CHUNK0_SIZE_F)
+      EQUIVALENCE(h5o_flags(16) , H5O_HDR_ATTR_CRT_ORD_TRACK_F)
+      EQUIVALENCE(h5o_flags(17) , H5O_HDR_ATTR_CRT_ORDE_INDEX_F)
+      EQUIVALENCE(h5o_flags(18) , H5O_HDR_ATTR_STORE_PHASE_CHA_F)
+      EQUIVALENCE(h5o_flags(19) , H5O_HDR_STORE_TIMES_F)
+      EQUIVALENCE(h5o_flags(20) , H5O_HDR_ALL_FLAGS_F) 
+      EQUIVALENCE(h5o_flags(21) , H5O_SHMESG_MAX_NINDEXES_F)
+      EQUIVALENCE(h5o_flags(22) , H5O_SHMESG_MAX_LIST_SIZE_F)
 
 !
 ! H5P flags declaration
 !
-      INTEGER, PARAMETER :: H5P_FLAGS_LEN = 7 
+      INTEGER, PARAMETER :: H5P_FLAGS_LEN = 20 
       INTEGER(HID_T) H5P_flags(H5P_FLAGS_LEN)
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$ ATTRIBUTES DLLEXPORT :: /H5P_FLAGS/
 !DEC$endif
       COMMON /H5P_FLAGS/ H5P_flags
 
-      INTEGER(HID_T) ::  H5P_FILE_CREATE_F 
-      INTEGER(HID_T) ::  H5P_FILE_ACCESS_F 
-      INTEGER(HID_T) ::  H5P_DATASET_CREATE_F
-      INTEGER(HID_T) ::  H5P_DATASET_XFER_F 
-      INTEGER(HID_T) ::  H5P_FILE_MOUNT_F 
-      INTEGER(HID_T) ::  H5P_DEFAULT_F 
-      INTEGER(HID_T) ::  H5P_ROOT_F 
+      INTEGER(HID_T) :: H5P_FILE_CREATE_F 
+      INTEGER(HID_T) :: H5P_FILE_ACCESS_F 
+      INTEGER(HID_T) :: H5P_DATASET_CREATE_F
+      INTEGER(HID_T) :: H5P_DATASET_XFER_F 
+      INTEGER(HID_T) :: H5P_FILE_MOUNT_F 
+      INTEGER(HID_T) :: H5P_DEFAULT_F 
+      INTEGER(HID_T) :: H5P_ROOT_F  
+      INTEGER(HID_T) :: H5P_CRT_ORDER_INDEXED_F 
+      INTEGER(HID_T) :: H5P_CRT_ORDER_TRACKED_F 
+      INTEGER(HID_T) :: H5P_OBJECT_CREATE_F
+      INTEGER(HID_T) :: H5P_DATASET_ACCESS_F
+      INTEGER(HID_T) :: H5P_GROUP_CREATE_F
+      INTEGER(HID_T) :: H5P_GROUP_ACCESS_F
+      INTEGER(HID_T) :: H5P_DATATYPE_CREATE_F
+      INTEGER(HID_T) :: H5P_DATATYPE_ACCESS_F
+      INTEGER(HID_T) :: H5P_STRING_CREATE_F
+      INTEGER(HID_T) :: H5P_ATTRIBUTE_CREATE_F
+      INTEGER(HID_T) :: H5P_OBJECT_COPY_F
+      INTEGER(HID_T) :: H5P_LINK_CREATE_F
+      INTEGER(HID_T) :: H5P_LINK_ACCESS_F
 
       EQUIVALENCE(H5P_flags(1), H5P_FILE_CREATE_F)
       EQUIVALENCE(H5P_flags(2), H5P_FILE_ACCESS_F)
@@ -391,9 +519,21 @@
       EQUIVALENCE(H5P_flags(5), H5P_FILE_MOUNT_F)
       EQUIVALENCE(H5P_flags(6), H5P_DEFAULT_F)
       EQUIVALENCE(H5P_flags(7), H5P_ROOT_F)
-
+      EQUIVALENCE(H5P_flags(8), H5P_CRT_ORDER_INDEXED_F)
+      EQUIVALENCE(H5P_flags(9), H5P_CRT_ORDER_TRACKED_F)
+      EQUIVALENCE(H5P_flags(10), H5P_OBJECT_CREATE_F)
+      EQUIVALENCE(H5P_flags(11), H5P_DATASET_ACCESS_F)
+      EQUIVALENCE(H5P_flags(12), H5P_GROUP_CREATE_F)
+      EQUIVALENCE(H5P_flags(13), H5P_GROUP_ACCESS_F)
+      EQUIVALENCE(H5P_flags(14), H5P_DATATYPE_CREATE_F)
+      EQUIVALENCE(H5P_flags(15), H5P_DATATYPE_ACCESS_F)
+      EQUIVALENCE(H5P_flags(16), H5P_STRING_CREATE_F)
+      EQUIVALENCE(H5P_flags(17), H5P_ATTRIBUTE_CREATE_F)
+      EQUIVALENCE(H5P_flags(18), H5P_OBJECT_COPY_F)
+      EQUIVALENCE(H5P_flags(19), H5P_LINK_CREATE_F)
+      EQUIVALENCE(H5P_flags(20), H5P_LINK_ACCESS_F)
 !
-! H5P flags declaration
+! H5R flags declaration
 !
       INTEGER, PARAMETER :: H5R_FLAGS_LEN = 2
       INTEGER H5R_flags(H5R_FLAGS_LEN)
@@ -592,11 +732,27 @@
 !DEC$ ATTRIBUTES DLLEXPORT :: /H5LIB_FLAGS/
 !DEC$endif
      COMMON /H5LIB_FLAGS/ H5LIB_flags
-      INTEGER :: H5_SZIP_EC_OM_F
-      INTEGER :: H5_SZIP_NN_OM_F
+     INTEGER :: H5_SZIP_EC_OM_F
+     INTEGER :: H5_SZIP_NN_OM_F
 !
-      EQUIVALENCE(H5LIB_flags(1), H5_SZIP_EC_OM_F)
-      EQUIVALENCE(H5LIB_flags(2), H5_SZIP_NN_OM_F)
+     EQUIVALENCE(H5LIB_flags(1), H5_SZIP_EC_OM_F)
+     EQUIVALENCE(H5LIB_flags(2), H5_SZIP_NN_OM_F)
+
 
-    END MODULE H5GLOBAL
+! General H5 flags declarations
+!
+!!$      INTEGER, PARAMETER :: H5_FLAGS_LEN = 2
+!!$      INTEGER H5_flags(H5_FLAGS_LEN)
+!!$!DEC$if defined(BUILD_HDF5_DLL)
+!!$!DEC$ ATTRIBUTES DLLEXPORT :: /H5_FLAGS/
+!!$!DEC$endif
+!!$      COMMON /H5_FLAGS/ H5_flags
+!!$
+!!$      INTEGER :: _F
+!!$      INTEGER :: H5F_SCOPE_LOCAL_F
+!!$
+!!$      EQUIVALENCE(H5F_flags(1), H5F_SCOPE_GLOBAL_F)
+!!$      EQUIVALENCE(H5F_flags(2), H5F_SCOPE_LOCAL_F)
+
+   END MODULE H5GLOBAL
       
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 8099ecc..071b74a 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -93,6 +93,9 @@ H5_FCDLL int_f nh5fget_filesize_c(hid_t_f *file_id, hsize_t_f *size);
 #   define nh5sselect_select_c   H5_FC_FUNC_(h5sselect_select_c, H5SSELECT_SELECT_C)
 #   define nh5sget_select_type_c   H5_FC_FUNC_(h5sget_select_type_c, H5SGET_SELECT_TYPE_C)
 #   define nh5sselect_elements_c    H5_FC_FUNC_(h5sselect_elements_c, H5SSELECT_ELEMENTS_C)
+#   define nh5sdecode_c    H5_FC_FUNC_(h5sdecode_c, H5SDECODE_C)
+#   define nh5sencode_c    H5_FC_FUNC_(h5sencode_c, H5SENCODE_C)
+#   define nh5sextent_equal_c    H5_FC_FUNC_(h5sextent_equal_c, H5SEXTENT_EQUAL_C)
 
 H5_FCDLL int_f nh5screate_simple_c ( int_f *rank, hsize_t_f *dims, hsize_t_f *maxdims, hid_t_f *space_id );
 H5_FCDLL int_f nh5sclose_c ( hid_t_f *space_id );
@@ -123,6 +126,9 @@ H5_FCDLL int_f nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *
 H5_FCDLL int_f nh5scombine_hyperslab_c ( hid_t_f *space_id , int_f *op, hsize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block, hid_t_f *hyper_id);
 H5_FCDLL int_f nh5scombine_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id, hid_t_f *ds_id);
 H5_FCDLL int_f nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id);
+H5_FCDLL int_f nh5sdecode_c ( _fcd buf, int_f *obj_id );
+H5_FCDLL int_f nh5sencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc );
+H5_FCDLL int_f nh5sextent_equal_c ( hid_t_f * space1_id, hid_t_f *space2_id, hid_t_f *c_equal);
 
 /*
  * Functions from H5Df.c
@@ -207,7 +213,7 @@ H5_FCDLL int_f nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *sp
 #   define nh5dget_space_c             H5_FC_FUNC_(h5dget_space_c, H5DGET_SPACE_C)
 #   define nh5dget_type_c              H5_FC_FUNC_(h5dget_type_c, H5DGET_TYPE_C)
 #   define nh5dget_create_plist_c      H5_FC_FUNC_(h5dget_create_plist_c, H5DGET_CREATE_PLIST_C)
-#   define nh5dextend_c                H5_FC_FUNC_(h5dextend_c, H5DEXTEND_C)
+#   define nh5dset_extent_c            H5_FC_FUNC_(h5dset_extent_c, H5DSET_EXTENT_C)
 #   define nh5dget_storage_size_c      H5_FC_FUNC_(h5dget_storage_size_c, H5DGET_STORAGE_SIZE_C)
 #   define nh5dvlen_get_max_len_c      H5_FC_FUNC_(h5dvlen_get_max_len_c, H5DVLEN_GET_MAX_LEN_C)
 #   define nh5dwrite_vl_integer_c      H5_FC_FUNC_(h5dwrite_vl_integer_c, H5DWRITE_VL_INTEGER_C)
@@ -222,12 +228,13 @@ H5_FCDLL int_f nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *sp
 #   define nh5dfill_real_c                  H5_FC_FUNC_(h5dfill_real_c, H5DFILL_REAL_C)
 #   define nh5dfill_double_c                  H5_FC_FUNC_(h5dfill_double_c, H5DFILL_DOUBLE_C)
 #   define nh5dget_space_status_c      H5_FC_FUNC_(h5dget_space_status_c, H5DGET_SPACE_STATUS_C)
+#   define nh5dcreate_anon_c      H5_FC_FUNC_(h5dcreate_anon_c, H5DCREATE_ANON_C)
 
 
-H5_FCDLL int_f nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *crt_prp,  hid_t_f *dset_id);
-H5_FCDLL int_f nh5dopen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dset_id);
+H5_FCDLL int_f nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id, 
+			     hid_t_f *lcpl_id, hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id);
+H5_FCDLL int_f nh5dopen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dapl_id, hid_t_f *dset_id);
 H5_FCDLL int_f nh5dclose_c ( hid_t_f *dset_id );
-
 H5_FCDLL int_f nh5dwrite_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
 H5_FCDLL int_f nh5dwrite_integer_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
 H5_FCDLL int_f nh5dwrite_integer_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
@@ -322,7 +329,7 @@ H5_FCDLL int_f nh5dreadc_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *m
 H5_FCDLL int_f nh5dget_space_c ( hid_t_f *dset_id , hid_t_f *space_id);
 H5_FCDLL int_f nh5dget_type_c ( hid_t_f *dset_id , hid_t_f *type_id);
 H5_FCDLL int_f nh5dget_create_plist_c ( hid_t_f *dset_id , hid_t_f *plist_id);
-H5_FCDLL int_f nh5dextend_c ( hid_t_f *dset_id , hsize_t_f *dims);
+H5_FCDLL int_f nh5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims);
 H5_FCDLL int_f nh5dvlen_get_max_len_c(hid_t_f *dataset_id, hid_t_f *type_id, hid_t_f *space_id, size_t_f *len);
 H5_FCDLL int_f nh5dget_storage_size_c(hid_t_f *dataset_id, hsize_t_f *size);
 H5_FCDLL int_f nh5dfillc_c(_fcd fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, _fcd buf, hid_t_f *mem_type_id);
@@ -331,6 +338,8 @@ H5_FCDLL int_f nh5dfill_integer_c(void * fill_value, hid_t_f *fill_type_id, hid_
 H5_FCDLL int_f nh5dfill_real_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
 H5_FCDLL int_f nh5dfill_double_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
 H5_FCDLL int_f nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag);
+H5_FCDLL int_f nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id, 
+				  hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id); /*MSB*/
 
 /*
  * Functions from H5Gf.c
@@ -348,10 +357,16 @@ H5_FCDLL int_f nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag);
 #   define nh5gget_linkval_c   H5_FC_FUNC_(h5gget_linkval_c, H5GGET_LINKVAL_C)
 #   define nh5gset_comment_c   H5_FC_FUNC_(h5gset_comment_c, H5GSET_COMMENT_C)
 #   define nh5gget_comment_c   H5_FC_FUNC_(h5gget_comment_c, H5GGET_COMMENT_C)
+#   define nh5gcreate_anon_c      H5_FC_FUNC_(h5gcreate_anon_c, H5GCREATE_ANON_C)
+#   define nh5gget_create_plist_c H5_FC_FUNC_(h5gget_create_plist_c, H5GGET_CREATE_PLIST_C)
+#   define nh5gget_info_c  H5_FC_FUNC_(h5gget_info_c, H5GGET_INFO_C)
+#   define nh5gget_info_by_idx_c  H5_FC_FUNC_(h5gget_info_by_idx_c, H5GGET_INFO_BY_IDX_C)
+#   define nh5gget_info_by_name_c  H5_FC_FUNC_(h5gget_info_by_name_c, H5GGET_INFO_BY_NAME_C)
 
 
-H5_FCDLL int_f nh5gcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint,  hid_t_f *grp_id);
-H5_FCDLL int_f nh5gopen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *grp_id);
+H5_FCDLL int_f nh5gcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint,  hid_t_f *grp_id,
+			     hid_t_f *lcpl_id, hid_t_f *gcpl_id, hid_t_f *gapl_id);
+H5_FCDLL int_f nh5gopen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *gapl_id, hid_t_f *grp_id);
 H5_FCDLL int_f nh5gclose_c ( hid_t_f *grp_id );
 H5_FCDLL int_f nh5gget_obj_info_idx_c (hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *idx, _fcd obj_name, int_f *obj_namelen, int_f *obj_type);
 H5_FCDLL int_f nh5gn_members_c (hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *nmembers);
@@ -363,6 +378,14 @@ H5_FCDLL int_f nh5gmove2_c (hid_t_f *src_loc_id, _fcd src_name, int_f *src_namel
 H5_FCDLL int_f nh5gget_linkval_c (hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size, _fcd value );
 H5_FCDLL int_f nh5gset_comment_c (hid_t_f *loc_id, _fcd name, int_f *namelen, _fcd comment, int_f *commentlen);
 H5_FCDLL int_f nh5gget_comment_c (hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *bufsize, _fcd comment);
+H5_FCDLL int_f nh5gcreate_anon_c (hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *gapl_id, hid_t_f *grp_id); /*MSB*/
+H5_FCDLL int_f nh5gget_create_plist_c(hid_t_f *grp_id, hid_t_f *gcpl_id ); /*MSB*/
+H5_FCDLL int_f nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder); /*MSB*/
+H5_FCDLL int_f nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+				     hid_t_f *index_type, hid_t_f *order, hsize_t_f *n, hid_t_f *lapl_id, 
+				     int_f *storage_type, int_f *nlinks, int_f *max_corder); /*MSB*/
+H5_FCDLL int_f nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id, 
+				      int_f *storage_type, int_f *nlinks, int_f *max_corder); /*MSB*/
 
 /*
  * Functions from H5Af.c
@@ -444,9 +467,25 @@ H5_FCDLL int_f nh5gget_comment_c (hid_t_f *loc_id, _fcd name, int_f *namelen, si
 #   define nh5aget_type_c    H5_FC_FUNC_(h5aget_type_c, H5AGET_TYPE_C)
 #   define nh5aget_num_attrs_c H5_FC_FUNC_(h5aget_num_attrs_c, H5AGET_NUM_ATTRS_C)
 #   define nh5adelete_c      H5_FC_FUNC_(h5adelete_c, H5ADELETE_C)
+#   define nh5aget_storage_size_c H5_FC_FUNC_(h5aget_storage_size_c, H5AGET_STORAGE_SIZE_C) /* MSB */
+#   define nh5arename_by_name_c H5_FC_FUNC_(h5arename_by_name_c, H5ARENAME_BY_NAME_C) /* MSB */
+#   define nh5aopen_c H5_FC_FUNC_(h5aopen_c, H5AOPEN_C) /* MSB */
+#   define nh5adelete_by_name_c H5_FC_FUNC_(h5adelete_by_name_c,H5ADELETE_BY_NAME_C) /* MSB */
+#   define nh5adelete_by_idx_c H5_FC_FUNC_(h5adelete_by_idx_c,H5ADELETE_BY_IDX_C) /* MSB */
+#   define nh5aget_name_by_idx_c H5_FC_FUNC_(h5aget_name_by_idx_c,H5AGET_NAME_BY_IDX_C) /* MSB */
+#   define nh5aget_create_plist_c H5_FC_FUNC_(h5aget_create_plist_c,H5AGET_CREATE_PLIST_C) /* MSB */
+#   define nh5aopen_by_idx_c H5_FC_FUNC_(h5aopen_by_idx_c,H5AOPEN_BY_IDX_C) /* MSB */
+#   define nh5aget_info_c H5_FC_FUNC_(h5aget_info_c,H5AGET_INFO_C) /* MSB */
+#   define nh5aget_info_by_idx_c H5_FC_FUNC_(h5aget_info_by_idx_c,H5AGET_INFO_BY_IDX_C) /* MSB */
+#   define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C) /* MSB */
+#   define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C) /* MSB */
+#   define nh5acreate_by_name_c H5_FC_FUNC_(h5acreate_by_name_c,H5ACREATE_BY_NAME_C) /* MSB */
+#   define nh5aexists_c H5_FC_FUNC_(h5aexists_c,H5AEXISTS_C) /* MSB */
+#   define nh5aexists_by_name_c H5_FC_FUNC_(h5aexists_by_name_c,H5AEXISTS_BY_NAME_C) /* MSB */
+#   define nh5aopen_by_name_c H5_FC_FUNC_(h5aopen_by_name_c,H5AOPEN_BY_NAME_C) /* MSB */
+#   define nh5arename_c H5_FC_FUNC_(h5arename_c,H5ARENAME_C) /* MSB */
 
-
-H5_FCDLL int_f nh5acreate_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *crt_prp,  hid_t_f *attr_id);
+H5_FCDLL int_f nh5acreate_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *crt_prp, hid_t_f *aapl,  hid_t_f *attr_id);
 H5_FCDLL int_f nh5aopen_name_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_id);
 H5_FCDLL int_f nh5awritec_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
 H5_FCDLL int_f nh5awritec_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
@@ -523,6 +562,45 @@ H5_FCDLL int_f nh5aget_space_c (hid_t_f *attr_id, hid_t_f *space_id);
 H5_FCDLL int_f nh5aget_type_c (hid_t_f *attr_id, hid_t_f *type_id);
 H5_FCDLL int_f nh5aget_num_attrs_c (hid_t_f *obj_id, int_f *attr_num);
 H5_FCDLL int_f nh5aget_name_c(hid_t_f *attr_id, size_t_f *size, _fcd buf);
+H5_FCDLL int_f nh5aget_storage_size_c ( hid_t_f *attr_id, hsize_t_f *size ); /* MSB */
+H5_FCDLL int_f nh5arename_by_name_c ( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+				      _fcd old_attr_name, size_t_f *old_attr_namelen,
+				      _fcd new_attr_name, size_t_f *new_attr_namelen, 
+				      hid_t_f *lapl_id ); /* MSB */
+H5_FCDLL int_f nh5aopen_c ( hid_t_f *obj_id, _fcd attr_name, size_t_f *attr_namelen, 
+			    hid_t_f *aapl_id, hid_t_f *attr_id); /* MSB */
+H5_FCDLL int_f nh5adelete_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+				     _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id); /* MSB */
+H5_FCDLL int_f nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+				    int_f *idx_type, int_f *order, size_t_f *n, hid_t_f *lapl_id); /* MSB */
+H5_FCDLL int_f nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+				      int_f *idx_type, int_f *order, size_t_f *n, _fcd name, 
+				      size_t_f *size, hid_t_f *lapl_id); /* MSB */
+H5_FCDLL int_f nh5aget_create_plist_c ( hid_t_f *attr_id, hid_t_f *creation_prop_id ); /* MSB */
+H5_FCDLL int_f nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+		     int_f *idx_type, int_f *order, size_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id); /* MSB */
+H5_FCDLL int_f nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder, 
+			       int_f *cset, hsize_t_f *data_size ); /* MSB */
+H5_FCDLL int_f nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+				      int_f *idx_type, int_f *order, size_t_f *n, hid_t_f *lapl_id,
+				      int_f *corder_valid, int_f *corder, 
+				      int_f *cset, hsize_t_f *data_size ); /* MSB */
+H5_FCDLL int_f nh5aget_info_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+				       _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id,
+				       int_f *corder_valid, int_f *corder, 
+				       int_f *cset, hsize_t_f *data_size ); /* MSB */
+H5_FCDLL int_f nh5acreate_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+				    _fcd attr_name, size_t_f *attr_namelen,  hid_t_f *type_id,
+				    hid_t_f *space_id, hid_t_f *acpl_id, hid_t_f *aapl_id,
+				    hid_t_f *lapl_id, hid_t_f *attr_id ); /* MSB */
+H5_FCDLL int_f nh5aexists_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists); /* MSB */
+H5_FCDLL int_f nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, 
+		      hid_t_f *lapl_id, hid_t_f *attr_exists); /* MSB */
+H5_FCDLL int_f nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, 
+				   hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id); /* MSB */
+H5_FCDLL int_f nh5arename_c( hid_t_f *loc_id,
+		      _fcd old_attr_name, size_t_f *old_attr_namelen,
+		      _fcd new_attr_name, size_t_f *new_attr_namelen); /* MSB */
 
 /*
  * Functions form H5Tf.c file
@@ -583,11 +661,15 @@ H5_FCDLL int_f nh5aget_name_c(hid_t_f *attr_id, size_t_f *size, _fcd buf);
 #   define nh5tvlen_create_c               H5_FC_FUNC_(h5tvlen_create_c, H5TVLEN_CREATE_C)
 #   define nh5tis_variable_str_c         H5_FC_FUNC_(h5tis_variable_str_c, H5TIS_VARIABLE_STR_C)
 #   define nh5tget_member_class_c         H5_FC_FUNC_(h5tget_member_class_c, H5TGET_MEMBER_CLASS_C)
-
+#   define nh5tcommit_anon_c       H5_FC_FUNC_(h5tcommit_anon_c, H5TCOMMIT_ANON_C)
+#   define nh5tdecode_c    H5_FC_FUNC_(h5tdecode_c, H5TDECODE_C)
+#   define nh5tencode_c    H5_FC_FUNC_(h5tencode_c, H5TENCODE_C)
+#   define nh5tget_create_plist_c H5_FC_FUNC_(h5tget_create_plist_c, H5TGET_CREATE_PLIST_C)
+#   define nh5tcompiler_conv_c H5_FC_FUNC_(h5tcompiler_conv_c, H5TCOMPILER_CONV_C)
 
 H5_FCDLL int_f nh5tcreate_c(int_f *class, size_t_f *size, hid_t_f *type_id);
-H5_FCDLL int_f nh5topen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id);
-H5_FCDLL int_f nh5tcommit_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id);
+H5_FCDLL int_f nh5topen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *tapl_id );
+H5_FCDLL int_f nh5tcommit_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *lcpl_id, hid_t_f *tcpl_id, hid_t_f *tapl_id);
 H5_FCDLL int_f nh5tclose_c ( hid_t_f *type_id );
 H5_FCDLL int_f nh5tequal_c ( hid_t_f *type1_id , hid_t_f *type2_id, int_f *c_flag);
 H5_FCDLL int_f nh5tcopy_c ( hid_t_f *type_id , hid_t_f *new_type_id);
@@ -596,7 +678,7 @@ H5_FCDLL int_f nh5tget_order_c ( hid_t_f *type_id , int_f *order);
 H5_FCDLL int_f nh5tset_order_c ( hid_t_f *type_id , int_f *order);
 H5_FCDLL int_f nh5tget_size_c ( hid_t_f *type_id , size_t_f *size);
 H5_FCDLL int_f nh5tset_size_c ( hid_t_f *type_id , size_t_f *size);
-H5_FCDLL int_f nh5tcommitted_c (hid_t_f *type_id);
+H5_FCDLL int_f nh5tcommitted_c (hid_t_f *dtype_id);
 H5_FCDLL int_f nh5tget_precision_c ( hid_t_f *type_id , size_t_f *precision);
 H5_FCDLL int_f nh5tset_precision_c ( hid_t_f *type_id , size_t_f *precision);
 H5_FCDLL int_f nh5tget_offset_c ( hid_t_f *type_id , size_t_f *offset);
@@ -641,7 +723,24 @@ H5_FCDLL int_f nh5tget_super_c ( hid_t_f *type_id , hid_t_f *base_type_id);
 H5_FCDLL int_f nh5tvlen_create_c ( hid_t_f *type_id , hid_t_f *vltype_id);
 H5_FCDLL int_f nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag );
 H5_FCDLL int_f nh5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, int_f *class );
+H5_FCDLL int_f nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id, hid_t_f *tcpl_id, hid_t_f *tapl_id);
+H5_FCDLL int_f nh5tdecode_c ( _fcd buf, int_f *obj_id );
+H5_FCDLL int_f nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc );
+H5_FCDLL int_f nh5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id);
+H5_FCDLL int_f nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag);
+
+
+/*
+ * Functions from H5Of.c
+ */
+
+#   define nh5olink_c       H5_FC_FUNC_(h5olink_c, H5OLINK_C)
+#   define nh5oopen_c       H5_FC_FUNC_(h5oopen_c, H5OOPEN_C)
 
+
+H5_FCDLL int_f nh5oopen_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, hid_t_f *obj_id);
+H5_FCDLL int_f nh5olink_c (hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, size_t_f *namelen,
+			   hid_t_f *lcpl_id, hid_t_f *lapl_id);
 /*
  * Functions from H5Pf.c
  */
@@ -768,7 +867,37 @@ H5_FCDLL int_f nh5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, in
 #   define nh5pset_fapl_multi_sc          H5_FC_FUNC_(h5pset_fapl_multi_sc, H5PSET_FAPL_MULTI_SC)
 #   define nh5pset_szip_c                 H5_FC_FUNC_(h5pset_szip_c, H5PSET_SZIP_C)
 #   define nh5pall_filters_avail_c        H5_FC_FUNC_(h5pall_filters_avail_c, H5PALL_FILTERS_AVAIL_C)
-
+#   define nh5pget_attr_phase_change_c    H5_FC_FUNC_(h5pget_attr_phase_change_c, H5PGET_ATTR_PHASE_CHANGE_C) /* MSB */
+#   define nh5pset_attr_creation_order_c  H5_FC_FUNC_(h5pset_attr_creation_order_c, H5PSET_ATTR_CREATION_ORDER_C) /* MSB */
+#   define nh5pset_shared_mesg_nindexes_c  H5_FC_FUNC_(h5pset_shared_mesg_nindexes_c, H5PSET_SHARED_MESG_NINDEXES_C) /* MSB */
+#   define nh5pset_shared_mesg_index_c  H5_FC_FUNC_(h5pset_shared_mesg_index_c,H5PSET_SHARED_MESG_INDEX_C) /* MSB */
+#   define nh5pget_attr_creation_order_c  H5_FC_FUNC_(h5pget_attr_creation_order_c,H5PGET_ATTR_CREATION_ORDER_C) /* MSB */
+#   define nh5pset_libver_bounds_c H5_FC_FUNC_(h5pset_libver_bounds_c,H5PSET_LIBVER_BOUNDS_C) /* MSB */
+#   define nh5pset_link_creation_order_c H5_FC_FUNC_(h5pset_link_creation_order_c, H5PSET_LINK_CREATION_ORDER_C) /* MSB */
+#   define nh5pget_link_phase_change_c H5_FC_FUNC_(h5pget_link_phase_change_c, H5PGET_LINK_PHASE_CHANGE_C) /* MSB */
+#   define nh5pget_obj_track_times_c H5_FC_FUNC_(h5pget_obj_track_times_c, H5PGET_OBJ_TRACK_TIMES_C) /* MSB */
+#   define nh5pset_obj_track_times_c H5_FC_FUNC_(h5pset_obj_track_times_c, H5PSET_OBJ_TRACK_TIMES_C) /* MSB */
+#   define nh5pset_create_inter_group_c H5_FC_FUNC_(h5pset_create_inter_group_c,H5PSET_CREATE_INTER_GROUP_C) /* MSB */
+#   define nh5pget_create_inter_group_c H5_FC_FUNC_(h5pget_create_inter_group_c,H5PGET_CREATE_INTER_GROUP_C) /* MSB */
+#   define nh5pget_link_creation_order_c H5_FC_FUNC_(h5pget_link_creation_order_c,H5PGET_LINK_CREATION_ORDER_C) /* MSB */
+#   define nh5pset_char_encoding_c H5_FC_FUNC_(h5pset_char_encoding_c, H5PSET_CHAR_ENCODING_C) /* MSB */
+#   define nh5pget_char_encoding_c H5_FC_FUNC_(h5pget_char_encoding_c, H5PGET_CHAR_ENCODING_C) /* MSB */
+#   define nh5pset_copy_object_c H5_FC_FUNC_(h5pset_copy_object_c, H5PSET_COPY_OBJECT_C) /* MSB */
+#   define nh5pget_copy_object_c H5_FC_FUNC_(h5pget_copy_object_c, H5PGET_COPY_OBJECT_C) /* MSB */
+#   define nh5pget_data_transform_c H5_FC_FUNC_(h5pget_data_transform_c, H5PGET_DATA_TRANSFORM_C) /* MSB */
+#   define nh5pset_data_transform_c H5_FC_FUNC_(h5pset_data_transform_c, H5PSET_DATA_TRANSFORM_C) /* MSB */
+#   define nh5pget_local_heap_size_hint_c H5_FC_FUNC_(h5pget_local_heap_size_hint_c, H5PGET_LOCAL_HEAP_SIZE_HINT_C) /* MSB */
+#   define nh5pget_est_link_info_c H5_FC_FUNC_(h5pget_est_link_info_c,H5PGET_EST_LINK_INFO_C) /* MSB */
+#   define nh5pset_est_link_info_c H5_FC_FUNC_(h5pset_est_link_info_c,H5PSET_EST_LINK_INFO_C) /* MSB */
+#   define nh5pset_local_heap_size_hint_c H5_FC_FUNC_(h5pset_local_heap_size_hint_c, H5PSET_LOCAL_HEAP_SIZE_HINT_C) /* MSB */
+#   define nh5pset_link_phase_change_c H5_FC_FUNC_(h5pset_link_phase_change_c, H5PSET_LINK_PHASE_CHANGE_C) /* MSB */
+#   define nh5pset_fapl_direct_c H5_FC_FUNC_(h5pset_fapl_direct_c, H5PSET_FAPL_DIRECT_C) /* MSB */
+#   define nh5pget_fapl_direct_c H5_FC_FUNC_(h5pget_fapl_direct_c, H5PGET_FAPL_DIRECT_C) /* MSB */
+#   define nh5pset_attr_phase_change_c H5_FC_FUNC_(h5pset_attr_phase_change_c, H5PSET_ATTR_PHASE_CHANGE_C) /* MSB */
+#   define nh5pset_nbit_c H5_FC_FUNC_(h5pset_nbit_c, H5PSET_NBIT_C) /* MSB */
+#   define nh5pset_scaleoffset_c H5_FC_FUNC_(h5pset_scaleoffset_c, H5PSET_SCALEOFFSET_C) /* MSB */
+#   define nh5pset_nlinks_c H5_FC_FUNC_(h5pset_nlinks_c, H5PSET_NLINKS_C) /* MSB */
+#   define nh5pget_nlinks_c H5_FC_FUNC_(h5pget_nlinks_c, H5PGET_NLINKS_C) /* MSB */
 
 H5_FCDLL int_f nh5pcreate_c ( hid_t_f *class, hid_t_f *prp_id );
 H5_FCDLL int_f nh5pclose_c ( hid_t_f *prp_id );
@@ -894,7 +1023,37 @@ H5_FCDLL int_f nh5pset_fapl_multi_sc ( hid_t_f *prp_id , int_f *flag);
 H5_FCDLL int_f nh5pset_szip_c ( hid_t_f *prp_id , int_f *options_mask, int_f *pixels_per_block);
 H5_FCDLL int_f nh5pall_filters_avail_c ( hid_t_f *prp_id , int_f *status);
 H5_FCDLL int_f nh5pfill_value_defined_c ( hid_t_f *prp_id , int_f *flag);
-
+H5_FCDLL int_f nh5pget_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense ); /* MSB */
+H5_FCDLL int_f nh5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags ); /* MSB */
+H5_FCDLL int_f nh5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes ); /* MSB */
+H5_FCDLL int_f nh5pset_shared_mesg_index_c(hid_t_f *fcpl_id, int_f *index_num, int_f *mesg_type_flags, int_f *min_mesg_size); /* MSB */
+H5_FCDLL int_f nh5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags); /* MSB */
+H5_FCDLL int_f nh5pset_libver_bounds_c(hid_t_f *fapl_id, int_f *low, int_f *high); /* MSB */
+H5_FCDLL int_f nh5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags); /* MSB */
+H5_FCDLL int_f nh5pget_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense ); /* MSB */
+H5_FCDLL int_f nh5pget_obj_track_times_c(hid_t_f *plist_id, int_f *flag); /* MSB */
+H5_FCDLL int_f nh5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag); /* MSB */
+H5_FCDLL int_f nh5pset_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group); /* MSB */
+H5_FCDLL int_f nh5pget_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group); /* MSB */
+H5_FCDLL int_f nh5pget_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags); /* MSB */
+H5_FCDLL int_f nh5pset_char_encoding_c(hid_t_f *plist_id, int_f *encoding); /* MSB */
+H5_FCDLL int_f nh5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding); /* MSB */
+H5_FCDLL int_f nh5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options); /* MSB */
+H5_FCDLL int_f nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options); /* MSB */
+H5_FCDLL int_f nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len, size_t_f *size); /* MSB */
+H5_FCDLL int_f nh5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len); /* MSB */
+H5_FCDLL int_f nh5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint); /* MSB */
+H5_FCDLL int_f nh5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len); /* MSB */
+H5_FCDLL int_f nh5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint); /* MSB */
+H5_FCDLL int_f nh5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len); /* MSB */
+H5_FCDLL int_f nh5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense ); /* MSB */
+H5_FCDLL int_f nh5pset_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size ); /* MSB */
+H5_FCDLL int_f nh5pget_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size ); /* MSB */
+H5_FCDLL int_f nh5pset_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense ); /* MSB */
+H5_FCDLL int_f nh5pset_nbit_c(hid_t_f *plist_id ); /* MSB */
+H5_FCDLL int_f nh5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor ); /* MSB */
+H5_FCDLL int_f nh5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks); /* MSB */
+H5_FCDLL int_f nh5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks); /* MSB */
 /*
  * Functions frome H5Rf.c
  */
@@ -904,6 +1063,8 @@ H5_FCDLL int_f nh5pfill_value_defined_c ( hid_t_f *prp_id , int_f *flag);
 #   define nh5rdereference_object_c H5_FC_FUNC_(h5rdereference_object_c, H5RDEREFERENCE_OBJECT_C)
 #   define nh5rget_region_region_c H5_FC_FUNC_(h5rget_region_region_c, H5RGET_REGION_REGION_C)
 #   define nh5rget_object_type_obj_c H5_FC_FUNC_(h5rget_object_type_obj_c, H5RGET_OBJECT_TYPE_OBJ_C)
+#   define nh5rget_name_object_c H5_FC_FUNC_(h5rget_name_object_c, H5RGET_NAME_OBJECT_C)
+#   define nh5rget_name_region_c H5_FC_FUNC_(h5rget_name_region_c, H5RGET_NAME_REGION_C)
 
 
 H5_FCDLL int_f nh5rcreate_object_c (haddr_t_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen);
@@ -912,7 +1073,8 @@ H5_FCDLL int_f nh5rdereference_region_c (hid_t_f *dset_id, int_f *ref, hid_t_f *
 H5_FCDLL int_f nh5rdereference_object_c (hid_t_f *dset_id, haddr_t_f *ref, hid_t_f *obj_id);
 H5_FCDLL int_f nh5rget_region_region_c (hid_t_f *dset_id, int_f *ref, hid_t_f *space_id);
 H5_FCDLL int_f nh5rget_object_type_obj_c (hid_t_f *dset_id, haddr_t_f *ref, int_f *obj_type);
-
+H5_FCDLL int_f nh5rget_name_object_c (hid_t_f *loc_id, haddr_t_f *ref, _fcd name, size_t_f *name_len, size_t_f *size_default);
+H5_FCDLL int_f nh5rget_name_region_c (hid_t_f *loc_id, int_f *ref, _fcd name, size_t_f *name_len, size_t_f *size_default);
 /*
  * Functions from H5If.c
  */
@@ -968,10 +1130,10 @@ H5_FCDLL int_f nh5close_c(void);
 H5_FCDLL int_f nh5init_types_c(hid_t_f *types, hid_t_f * floatingtypes, hid_t_f * integertypes);
 H5_FCDLL int_f nh5close_types_c(hid_t_f *types, int_f *lentypes, hid_t_f * floatingtypes, int_f * floatinglen, hid_t_f * integertypes,  int_f * integerlen);
 H5_FCDLL int_f nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
-                              int_f *h5fd_flags, hid_t_f *h5fd_hid_flags,
-                              int_f *h5g_flags, int_f *h5i_flags,
-                              hid_t_f *h5p_flags, int_f *h5r_flags, int_f *h5s_flags,
-                              int_f *h5t_flags, int_f *h5z_flags);
+				int_f *h5fd_flags, hid_t_f *h5fd_hid_flags,
+				int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags,
+				hid_t_f *h5p_flags, int_f *h5r_flags, int_f *h5s_flags,
+				int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags);
 H5_FCDLL int_f nh5init1_flags_c(int_f *h5lib_flags);
 H5_FCDLL int_f nh5get_libversion_c(int_f *majnum, int_f *minnum, int_f *relnum);
 H5_FCDLL int_f nh5check_version_c(int_f *majnum, int_f *minnum, int_f *relnum);
@@ -991,4 +1153,55 @@ H5_FCDLL int_f nh5zfilter_avail_c (int_f *filter, int_f *flag);
 H5_FCDLL int_f nh5zget_filter_info_c (int_f *filter, int_f *flag);
 
 
+/*
+ * Functions from H5Lf.c
+ */
+# define nh5lcopy_c H5_FC_FUNC_(h5lcopy_c, H5LCOPY_C) /*MSB*/
+# define nh5lcreate_external_c H5_FC_FUNC_(h5lcreate_external_c, H5LCREATE_EXTERNAL_C) /*MSB*/
+# define nh5lcreate_hard_c H5_FC_FUNC_(h5lcreate_hard_c, H5LCREATE_HARD_C) /*MSB*/
+# define nh5lcreate_soft_c H5_FC_FUNC_(h5lcreate_soft_c, H5LCREATE_SOFT_C) /*MSB*/
+# define nh5ldelete_c H5_FC_FUNC_(h5ldelete_c, H5LDELETE_C) /*MSB*/
+# define nh5ldelete_by_idx_c H5_FC_FUNC_(h5ldelete_by_idx_c, H5LDELETE_BY_IDX_C) /*MSB*/
+# define nh5lexists_c H5_FC_FUNC_(h5lexists_c, H5LEXISTS_C) /*MSB*/
+# define nh5lget_info_c H5_FC_FUNC_(h5lget_info_c, H5LGET_INFO_C) /*MSB*/
+# define nh5lget_info_by_idx_c H5_FC_FUNC_(h5lget_info_by_idx_c, H5LGET_INFO_BY_IDX_C) /*MSB*/
+# define nh5lis_registered_c H5_FC_FUNC_(h5lis_registered_c, H5LIS_REGISTERED_C) /*MSB*/
+# define nh5lmove_c H5_FC_FUNC_(h5lmove_c, H5LMOVE_C) /* MSB */
+# define nh5lget_name_by_idx_c H5_FC_FUNC_(h5lget_name_by_idx_c, H5LGET_NAME_BY_IDX_C) /* MSB */
+# define nh5lget_val_c H5_FC_FUNC_(h5lget_val_c, H5LGET_VAL_C) /* MSB */
+
+H5_FCDLL int_f nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id, 
+			  _fcd dest_name, size_t_f *dest_namelen,
+			  hid_t_f *lcpl_id, hid_t_f *lapl_id); /*MSB*/
+H5_FCDLL int_f nh5lcreate_external_c(_fcd file_name, size_t_f *file_namelen, _fcd obj_name, size_t_f *obj_namelen,
+				     hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, 
+				     hid_t_f *lcpl_id, hid_t_f *lapl_id); /*MSB*/
+H5_FCDLL int_f nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+				 hid_t_f *link_loc_id, 
+				 _fcd link_name, size_t_f *link_namelen, 
+				 hid_t_f *lcpl_id, hid_t_f *lapl_id ); /*MSB*/
+H5_FCDLL int_f nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len, 
+				 hid_t_f *link_loc_id, 
+				 _fcd link_name, size_t_f *link_name_len, 
+				 hid_t_f *lcpl_id, hid_t_f *lapl_id ); /*MSB*/
+H5_FCDLL int_f nh5ldelete_c( hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id ); /*MSB*/
+H5_FCDLL int_f nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+				    int_f *index_field, int_f *order, size_t_f *n, hid_t_f *lapl_id); /*MSB*/
+H5_FCDLL int_f nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, hid_t_f *link_exists); /*MSB*/
+H5_FCDLL int_f nh5lget_info_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
+			       int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type, 
+			       int_f *address, hsize_t_f *link_len,
+			       hid_t_f *lapl_id); /*MSB*/
+H5_FCDLL int_f nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+				     int_f *index_field, int_f *order, hsize_t_f *n, 
+				     int_f *corder_valid, int_f *corder, int_f *cset, hsize_t_f *data_size, hid_t_f *lapl_id); /*MSB*/
+H5_FCDLL int_f nh5lis_registered_c(int_f *link_cls_id); /*MSB*/
+H5_FCDLL int_f nh5lmove_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
+			  _fcd dest_name, size_t_f *dest_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id); /*MSB*/
+H5_FCDLL int_f nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+				     int_f *index_field, int_f *order, hsize_t_f *n,
+				     size_t_f *size, _fcd name, hid_t_f *lapl_id); /*MSB*/
+H5_FCDLL int_f nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size, 
+			     void *linkval_buff, hid_t_f *lapl_id) ;
+
 #endif /* _H5f90proto_H */
diff --git a/fortran/src/HDF5.f90 b/fortran/src/HDF5.f90
index b24d295..04ad33d 100644
--- a/fortran/src/HDF5.f90
+++ b/fortran/src/HDF5.f90
@@ -13,18 +13,21 @@
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
 !
-    MODULE HDF5
-       USE H5GLOBAL
-       USE H5F
-       USE H5G
-       USE H5E
-       USE H5I
-       USE H5S
-       USE H5D
-       USE H5A
-       USE H5T
-       USE H5P
-       USE H5R
-       USE H5Z
-       USE H5LIB
-    END MODULE HDF5
+MODULE HDF5
+  USE H5GLOBAL
+  USE H5F
+  USE H5G
+  USE H5E
+  USE H5I
+  USE H5L
+  USE H5S
+  USE H5D
+  USE H5A
+  USE H5T
+  USE H5O
+  USE H5P
+  USE H5R
+  USE H5Z
+  USE H5LIB
+
+END MODULE HDF5
diff --git a/fortran/src/HDF5mpio.f90 b/fortran/src/HDF5mpio.f90
index 95c6273..59ec309 100644
--- a/fortran/src/HDF5mpio.f90
+++ b/fortran/src/HDF5mpio.f90
@@ -19,10 +19,12 @@
        USE H5E
        USE H5G
        USE H5I
+       USE H5L
        USE H5S
        USE H5D
        USE H5A
        USE H5T
+       USE H5O
        USE H5P
        USE H5FDMPIO
        USE H5R
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index a4f9025..4216f34 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -48,10 +48,10 @@ endif
 # Source files for the library.
 libhdf5_fortran_la_SOURCES=H5fortran_flags.f90 H5f90global.f90          \
          H5fortran_types.f90 H5_ff.f90 H5Aff.f90 H5Dff.f90 H5Eff.f90    \
-         H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Pff.f90 H5Rff.f90 H5Sff.f90    \
+         H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Lff.f90 H5Off.f90 H5Pff.f90 H5Rff.f90 H5Sff.f90    \
          H5Tff.f90 H5Zff.f90                                            \
          H5f90kit.c H5_f.c H5Af.c H5Df.c H5Ef.c H5Ff.c H5Gf.c           \
-         H5If.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c                      \
+         H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c               \
          $(PARALLEL_COND_SRC)
 
 # h5fc and libhdf5_fortran.settings are generated during configure.
@@ -167,17 +167,19 @@ H5Eff.lo:            $(srcdir)/H5Eff.f90 H5f90global.lo
 H5Fff.lo:            $(srcdir)/H5Fff.f90 H5f90global.lo
 H5Gff.lo:            $(srcdir)/H5Gff.f90 H5f90global.lo
 H5Iff.lo:            $(srcdir)/H5Iff.f90 H5f90global.lo
+H5Lff.lo:            $(srcdir)/H5Lff.f90 H5f90global.lo
+H5Off.lo:            $(srcdir)/H5Off.f90 H5f90global.lo
 H5Pff.lo:            $(srcdir)/H5Pff.f90 H5f90global.lo
 H5Rff.lo:            $(srcdir)/H5Rff.f90 H5f90global.lo
 H5Sff.lo:            $(srcdir)/H5Sff.f90 H5f90global.lo
 H5Tff.lo:            $(srcdir)/H5Tff.f90 H5f90global.lo
 H5Zff.lo:            $(srcdir)/H5Zff.f90 H5f90global.lo
 HDF5.lo:             $(srcdir)/HDF5.f90 H5f90global.lo H5Aff.lo      \
-                     H5Dff.lo H5Eff.lo H5Fff.lo H5Gff.lo H5Iff.lo    \
+                     H5Dff.lo H5Eff.lo H5Fff.lo H5Gff.lo H5Iff.lo H5Lff.lo \
                      H5Pff.lo H5Rff.lo H5Sff.lo H5Tff.lo H5Zff.lo
 H5FDmpioff.lo:       $(srcdir)/H5FDmpioff.f90 H5f90global.lo
 HDF5mpio.lo:         $(srcdir)/H5FDmpioff.f90 H5f90global.lo H5Aff.lo  \
-                     H5Dff.lo H5Eff.lo H5Fff.lo H5Gff.lo H5Iff.lo    \
+                     H5Dff.lo H5Eff.lo H5Fff.lo H5Gff.lo H5Iff.lo H5Lff.lo  \
                      H5Pff.lo H5Rff.lo H5Sff.lo H5Tff.lo H5Zff.lo H5FDmpioff.lo
 
 include $(top_srcdir)/config/conclude.am
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 31baee2..a51254a 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -78,19 +78,20 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 libhdf5_fortran_la_LIBADD =
 am__libhdf5_fortran_la_SOURCES_DIST = H5fortran_flags.f90 \
 	H5f90global.f90 H5fortran_types.f90 H5_ff.f90 H5Aff.f90 \
-	H5Dff.f90 H5Eff.f90 H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Pff.f90 \
-	H5Rff.f90 H5Sff.f90 H5Tff.f90 H5Zff.f90 H5f90kit.c H5_f.c \
-	H5Af.c H5Df.c H5Ef.c H5Ff.c H5Gf.c H5If.c H5Pf.c H5Rf.c H5Sf.c \
-	H5Tf.c H5Zf.c HDF5.f90 H5FDmpiof.c HDF5mpio.f90 H5FDmpioff.f90
+	H5Dff.f90 H5Eff.f90 H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Lff.f90 \
+	H5Off.f90 H5Pff.f90 H5Rff.f90 H5Sff.f90 H5Tff.f90 H5Zff.f90 \
+	H5f90kit.c H5_f.c H5Af.c H5Df.c H5Ef.c H5Ff.c H5Gf.c H5If.c \
+	H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c HDF5.f90 \
+	H5FDmpiof.c HDF5mpio.f90 H5FDmpioff.f90
 @BUILD_PARALLEL_CONDITIONAL_FALSE@am__objects_1 = HDF5.lo
 @BUILD_PARALLEL_CONDITIONAL_TRUE@am__objects_1 = H5FDmpiof.lo \
 @BUILD_PARALLEL_CONDITIONAL_TRUE@	HDF5mpio.lo H5FDmpioff.lo
 am_libhdf5_fortran_la_OBJECTS = H5fortran_flags.lo H5f90global.lo \
 	H5fortran_types.lo H5_ff.lo H5Aff.lo H5Dff.lo H5Eff.lo \
-	H5Fff.lo H5Gff.lo H5Iff.lo H5Pff.lo H5Rff.lo H5Sff.lo H5Tff.lo \
-	H5Zff.lo H5f90kit.lo H5_f.lo H5Af.lo H5Df.lo H5Ef.lo H5Ff.lo \
-	H5Gf.lo H5If.lo H5Pf.lo H5Rf.lo H5Sf.lo H5Tf.lo H5Zf.lo \
-	$(am__objects_1)
+	H5Fff.lo H5Gff.lo H5Iff.lo H5Lff.lo H5Off.lo H5Pff.lo H5Rff.lo \
+	H5Sff.lo H5Tff.lo H5Zff.lo H5f90kit.lo H5_f.lo H5Af.lo H5Df.lo \
+	H5Ef.lo H5Ff.lo H5Gf.lo H5If.lo H5Lf.lo H5Of.lo H5Pf.lo \
+	H5Rf.lo H5Sf.lo H5Tf.lo H5Zf.lo $(am__objects_1)
 libhdf5_fortran_la_OBJECTS = $(am_libhdf5_fortran_la_OBJECTS)
 PROGRAMS = $(noinst_PROGRAMS)
 am_H5fortran_detect_OBJECTS = H5fortran_detect.$(OBJEXT)
@@ -381,10 +382,10 @@ lib_LTLIBRARIES = libhdf5_fortran.la
 # Source files for the library.
 libhdf5_fortran_la_SOURCES = H5fortran_flags.f90 H5f90global.f90          \
          H5fortran_types.f90 H5_ff.f90 H5Aff.f90 H5Dff.f90 H5Eff.f90    \
-         H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Pff.f90 H5Rff.f90 H5Sff.f90    \
+         H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Lff.f90 H5Off.f90 H5Pff.f90 H5Rff.f90 H5Sff.f90    \
          H5Tff.f90 H5Zff.f90                                            \
          H5f90kit.c H5_f.c H5Af.c H5Df.c H5Ef.c H5Ff.c H5Gf.c           \
-         H5If.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c                      \
+         H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c               \
          $(PARALLEL_COND_SRC)
 
 
@@ -536,6 +537,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ff.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Gf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5If.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Lf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Of.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Rf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Sf.Plo@am__quote@
@@ -869,17 +872,19 @@ H5Eff.lo:            $(srcdir)/H5Eff.f90 H5f90global.lo
 H5Fff.lo:            $(srcdir)/H5Fff.f90 H5f90global.lo
 H5Gff.lo:            $(srcdir)/H5Gff.f90 H5f90global.lo
 H5Iff.lo:            $(srcdir)/H5Iff.f90 H5f90global.lo
+H5Lff.lo:            $(srcdir)/H5Lff.f90 H5f90global.lo
+H5Off.lo:            $(srcdir)/H5Off.f90 H5f90global.lo
 H5Pff.lo:            $(srcdir)/H5Pff.f90 H5f90global.lo
 H5Rff.lo:            $(srcdir)/H5Rff.f90 H5f90global.lo
 H5Sff.lo:            $(srcdir)/H5Sff.f90 H5f90global.lo
 H5Tff.lo:            $(srcdir)/H5Tff.f90 H5f90global.lo
 H5Zff.lo:            $(srcdir)/H5Zff.f90 H5f90global.lo
 HDF5.lo:             $(srcdir)/HDF5.f90 H5f90global.lo H5Aff.lo      \
-                     H5Dff.lo H5Eff.lo H5Fff.lo H5Gff.lo H5Iff.lo    \
+                     H5Dff.lo H5Eff.lo H5Fff.lo H5Gff.lo H5Iff.lo H5Lff.lo \
                      H5Pff.lo H5Rff.lo H5Sff.lo H5Tff.lo H5Zff.lo
 H5FDmpioff.lo:       $(srcdir)/H5FDmpioff.f90 H5f90global.lo
 HDF5mpio.lo:         $(srcdir)/H5FDmpioff.f90 H5f90global.lo H5Aff.lo  \
-                     H5Dff.lo H5Eff.lo H5Fff.lo H5Gff.lo H5Iff.lo    \
+                     H5Dff.lo H5Eff.lo H5Fff.lo H5Gff.lo H5Iff.lo H5Lff.lo  \
                      H5Pff.lo H5Rff.lo H5Sff.lo H5Tff.lo H5Zff.lo H5FDmpioff.lo
 
 # lib/progs/tests targets recurse into subdirectories. build-* targets
diff --git a/fortran/src/README_DEVELOPEMENT b/fortran/src/README_DEVELOPEMENT
new file mode 100644
index 0000000..dc65f47
--- /dev/null
+++ b/fortran/src/README_DEVELOPEMENT
@@ -0,0 +1,36 @@
+Procedure to add a new function:
+
+(1) Edit the fortran/src/H5*ff.f90 file
+(2) Edit the fortran/sr/H5*f.c file
+(3) Edit the fortran/src/H5f90proto.h file
+
+
+
+Procedure:
+(1) Find the struct name you are interested in: 
+	(a) src/H5public.h if it is a generic type, i.e. H5_*
+            or
+        (b) src/H5*public.h if is a specific type, i.e. H5*_ 
+                            
+(2) Put that structure into an array that will be passed to fortran in:
+        (a) fortran/src/H5_f.c (add to nh5init_flags_c subroutine)
+        (b) edit fortran/src/H5f90proto.h and edit nh5init_flags_c interface call
+                         
+(3) Edit the function call in fortran/src/H5_ff.f90
+        (a) edit the call  FUNCTION h5init_flags_c 
+        (b) edit h5init_flags_c call in h5open_f to match the number of arguments passing
+                             
+(4) add the size of the array and array to fortran/src/H5f90global.f90 
+         - must match the size found it H5_f.c
+
+NOTE: To just add a default C value argument, do steps (2a) and (4) 
+
+Adding a new file to the repository
+-------------------------------------
+
+Add the name of the file to: 
+    (1) Makefile.am located in the same directory as the newfile
+    (2) MANIFEST located in the top level directory
+
+
+If you add a new file, be sure to add it to the MANIFEST located in the top directory
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index ed4b9fd..042cfab 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -36,12 +36,10 @@ else
 endif
 
 # Our main targets, the tests themselves
-TEST_PROG=fortranlib_test fflush1 fflush2
+TEST_PROG=fortranlib_test fflush1 fflush2 fortranlib_test_1_8
 check_PROGRAMS=$(TEST_PROG)
 
-libh5test_fortran_la_SOURCES=fortranlib_test.f90 tH5F.f90 tH5D.f90 \
-        tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 tH5Sselect.f90 \
-        tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tf.f90 t.c
+libh5test_fortran_la_SOURCES= tf.f90 t.c
 
 # Source files are used for both the library and fortranlib_test.
 # Automake will complain about this without the following workaround.
@@ -50,8 +48,12 @@ fortranlib_test_CFLAGS=$(AM_CFLAGS)
 
 fortranlib_test_SOURCES = fortranlib_test.f90 \
         tH5F.f90 tH5D.f90 tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 \
-        tH5Sselect.f90 tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tf.f90 \
-        t.c
+        tH5Sselect.f90 tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90
+
+fortranlib_test_1_8_SOURCES = fortranlib_test_1_8.f90 \
+        tH5F.f90 tH5D.f90 tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 \
+        tH5Sselect.f90 tH5O.f90 tH5P.f90 tH5A_1_8.f90 tH5I.f90 tH5G_1_8.f90 tH5E.f90
+ 
 fflush1_SOURCES=fflush1.f90
 fflush2_SOURCES=fflush2.f90
 
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 5e0b92f..3c748e9 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -64,12 +64,10 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libh5test_fortran_la_LIBADD =
-am_libh5test_fortran_la_OBJECTS = fortranlib_test.lo tH5F.lo tH5D.lo \
-	tH5R.lo tH5S.lo tH5T.lo tH5VL.lo tH5Z.lo tH5Sselect.lo tH5P.lo \
-	tH5A.lo tH5I.lo tH5G.lo tH5E.lo tf.lo t.lo
+am_libh5test_fortran_la_OBJECTS = tf.lo t.lo
 libh5test_fortran_la_OBJECTS = $(am_libh5test_fortran_la_OBJECTS)
 am__EXEEXT_1 = fortranlib_test$(EXEEXT) fflush1$(EXEEXT) \
-	fflush2$(EXEEXT)
+	fflush2$(EXEEXT) fortranlib_test_1_8$(EXEEXT)
 am_fflush1_OBJECTS = fflush1.$(OBJEXT)
 fflush1_OBJECTS = $(am_fflush1_OBJECTS)
 fflush1_LDADD = $(LDADD)
@@ -89,8 +87,7 @@ am_fortranlib_test_OBJECTS =  \
 	fortranlib_test-tH5Sselect.$(OBJEXT) \
 	fortranlib_test-tH5P.$(OBJEXT) fortranlib_test-tH5A.$(OBJEXT) \
 	fortranlib_test-tH5I.$(OBJEXT) fortranlib_test-tH5G.$(OBJEXT) \
-	fortranlib_test-tH5E.$(OBJEXT) fortranlib_test-tf.$(OBJEXT) \
-	fortranlib_test-t.$(OBJEXT)
+	fortranlib_test-tH5E.$(OBJEXT)
 fortranlib_test_OBJECTS = $(am_fortranlib_test_OBJECTS)
 fortranlib_test_LDADD = $(LDADD)
 fortranlib_test_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) \
@@ -98,6 +95,16 @@ fortranlib_test_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) \
 fortranlib_test_LINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(FCLD) $(fortranlib_test_FCFLAGS) $(FCFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_fortranlib_test_1_8_OBJECTS = fortranlib_test_1_8.$(OBJEXT) \
+	tH5F.$(OBJEXT) tH5D.$(OBJEXT) tH5R.$(OBJEXT) tH5S.$(OBJEXT) \
+	tH5T.$(OBJEXT) tH5VL.$(OBJEXT) tH5Z.$(OBJEXT) \
+	tH5Sselect.$(OBJEXT) tH5O.$(OBJEXT) tH5P.$(OBJEXT) \
+	tH5A_1_8.$(OBJEXT) tH5I.$(OBJEXT) tH5G_1_8.$(OBJEXT) \
+	tH5E.$(OBJEXT)
+fortranlib_test_1_8_OBJECTS = $(am_fortranlib_test_1_8_OBJECTS)
+fortranlib_test_1_8_LDADD = $(LDADD)
+fortranlib_test_1_8_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) \
+	$(LIBH5F) $(LIBHDF5)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
 am__depfiles_maybe = depfiles
@@ -118,9 +125,11 @@ FCLINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(FCLD) $(AM_FCFLAGS) $(FCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
 	$@
 SOURCES = $(libh5test_fortran_la_SOURCES) $(fflush1_SOURCES) \
-	$(fflush2_SOURCES) $(fortranlib_test_SOURCES)
+	$(fflush2_SOURCES) $(fortranlib_test_SOURCES) \
+	$(fortranlib_test_1_8_SOURCES)
 DIST_SOURCES = $(libh5test_fortran_la_SOURCES) $(fflush1_SOURCES) \
-	$(fflush2_SOURCES) $(fortranlib_test_SOURCES)
+	$(fflush2_SOURCES) $(fortranlib_test_SOURCES) \
+	$(fortranlib_test_1_8_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -368,11 +377,8 @@ noinst_LTLIBRARIES = libh5test_fortran.la
 @FORTRAN_SHARED_CONDITIONAL_FALSE@AM_LDFLAGS = -static
 
 # Our main targets, the tests themselves
-TEST_PROG = fortranlib_test fflush1 fflush2
-libh5test_fortran_la_SOURCES = fortranlib_test.f90 tH5F.f90 tH5D.f90 \
-        tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 tH5Sselect.f90 \
-        tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tf.f90 t.c
-
+TEST_PROG = fortranlib_test fflush1 fflush2 fortranlib_test_1_8
+libh5test_fortran_la_SOURCES = tf.f90 t.c
 
 # Source files are used for both the library and fortranlib_test.
 # Automake will complain about this without the following workaround.
@@ -380,8 +386,11 @@ fortranlib_test_FCFLAGS = $(AM_FCFLAGS)
 fortranlib_test_CFLAGS = $(AM_CFLAGS)
 fortranlib_test_SOURCES = fortranlib_test.f90 \
         tH5F.f90 tH5D.f90 tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 \
-        tH5Sselect.f90 tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tf.f90 \
-        t.c
+        tH5Sselect.f90 tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90
+
+fortranlib_test_1_8_SOURCES = fortranlib_test_1_8.f90 \
+        tH5F.f90 tH5D.f90 tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 \
+        tH5Sselect.f90 tH5O.f90 tH5P.f90 tH5A_1_8.f90 tH5I.f90 tH5G_1_8.f90 tH5E.f90
 
 fflush1_SOURCES = fflush1.f90
 fflush2_SOURCES = fflush2.f90
@@ -469,6 +478,9 @@ fflush2$(EXEEXT): $(fflush2_OBJECTS) $(fflush2_DEPENDENCIES)
 fortranlib_test$(EXEEXT): $(fortranlib_test_OBJECTS) $(fortranlib_test_DEPENDENCIES) 
 	@rm -f fortranlib_test$(EXEEXT)
 	$(fortranlib_test_LINK) $(fortranlib_test_OBJECTS) $(fortranlib_test_LDADD) $(LIBS)
+fortranlib_test_1_8$(EXEEXT): $(fortranlib_test_1_8_OBJECTS) $(fortranlib_test_1_8_DEPENDENCIES) 
+	@rm -f fortranlib_test_1_8$(EXEEXT)
+	$(FCLINK) $(fortranlib_test_1_8_OBJECTS) $(fortranlib_test_1_8_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -476,7 +488,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fortranlib_test-t.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t.Plo@am__quote@
 
 .c.o:
@@ -500,20 +511,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-fortranlib_test-t.o: t.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fortranlib_test_CFLAGS) $(CFLAGS) -MT fortranlib_test-t.o -MD -MP -MF $(DEPDIR)/fortranlib_test-t.Tpo -c -o fortranlib_test-t.o `test -f 't.c' || echo '$(srcdir)/'`t.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/fortranlib_test-t.Tpo $(DEPDIR)/fortranlib_test-t.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='t.c' object='fortranlib_test-t.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fortranlib_test_CFLAGS) $(CFLAGS) -c -o fortranlib_test-t.o `test -f 't.c' || echo '$(srcdir)/'`t.c
-
-fortranlib_test-t.obj: t.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fortranlib_test_CFLAGS) $(CFLAGS) -MT fortranlib_test-t.obj -MD -MP -MF $(DEPDIR)/fortranlib_test-t.Tpo -c -o fortranlib_test-t.obj `if test -f 't.c'; then $(CYGPATH_W) 't.c'; else $(CYGPATH_W) '$(srcdir)/t.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/fortranlib_test-t.Tpo $(DEPDIR)/fortranlib_test-t.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='t.c' object='fortranlib_test-t.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fortranlib_test_CFLAGS) $(CFLAGS) -c -o fortranlib_test-t.obj `if test -f 't.c'; then $(CYGPATH_W) 't.c'; else $(CYGPATH_W) '$(srcdir)/t.c'; fi`
-
 .f90.o:
 	$(FCCOMPILE) -c -o $@ $<
 
@@ -607,12 +604,6 @@ fortranlib_test-tH5E.o: tH5E.f90
 fortranlib_test-tH5E.obj: tH5E.f90
 	$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tH5E.obj `if test -f 'tH5E.f90'; then $(CYGPATH_W) 'tH5E.f90'; else $(CYGPATH_W) '$(srcdir)/tH5E.f90'; fi`
 
-fortranlib_test-tf.o: tf.f90
-	$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tf.o `test -f 'tf.f90' || echo '$(srcdir)/'`tf.f90
-
-fortranlib_test-tf.obj: tf.f90
-	$(FC) $(fortranlib_test_FCFLAGS) $(FCFLAGS) -c -o fortranlib_test-tf.obj `if test -f 'tf.f90'; then $(CYGPATH_W) 'tf.f90'; else $(CYGPATH_W) '$(srcdir)/tf.f90'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/fortran/test/fflush1.f90 b/fortran/test/fflush1.f90
index 44c4195..f42ae6e 100644
--- a/fortran/test/fflush1.f90
+++ b/fortran/test/fflush1.f90
@@ -58,12 +58,6 @@
      ! data space identifier
      !
      INTEGER(HID_T) :: dataspace
- 
-     !
-     ! data type identifier
-     !
-     INTEGER(HID_T) :: dtype_id
-
      ! 
      !The dimensions for the dataset.
      !
@@ -82,7 +76,7 @@
      !
      !data buffers 
      !         
-     INTEGER, DIMENSION(NX,NY) :: data_in, data_out
+     INTEGER, DIMENSION(NX,NY) :: data_in
      INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
      data_dims(1) = NX
      data_dims(2) = NY
diff --git a/fortran/test/fflush2.f90 b/fortran/test/fflush2.f90
index 0414d37..38a2bd7 100644
--- a/fortran/test/fflush2.f90
+++ b/fortran/test/fflush2.f90
@@ -50,22 +50,13 @@
      ! dataset identifier
      !
      INTEGER(HID_T) :: dset_id
- 
-     !
-     ! data space identifier
-     !
-     INTEGER(HID_T) :: dataspace
+
  
      !
      ! data type identifier
      !
      INTEGER(HID_T) :: dtype_id
 
-     ! 
-     !The dimensions for the dataset.
-     !
-     INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
-
      !
      !flag to check operation success 
      !         
diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90
new file mode 100644
index 0000000..970f570
--- /dev/null
+++ b/fortran/test/fortranlib_test_1_8.f90
@@ -0,0 +1,966 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!   Copyright by The HDF Group.                                               *
+!   Copyright by the Board of Trustees of the University of Illinois.         *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
+!   of the source code distribution tree; Copyright.html can be found at the  *
+!   root level of an installed copy of the electronic HDF5 document set and   *
+!   is linked from the top-level documents page.  It can also be found at     *
+!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+!   access to either file, you may request a copy from help@hdfgroup.org.     *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!
+!
+! 
+!    Testing Fortran wrappers introduced in 1.8 release.
+!
+PROGRAM fortranlibtest
+
+  USE HDF5
+
+  IMPLICIT NONE
+  INTEGER :: total_error = 0
+  INTEGER :: error 
+  INTEGER :: mounting_total_error = 0
+  INTEGER :: reopen_total_error = 0
+  INTEGER :: fclose_total_error = 0
+  INTEGER :: fspace_total_error = 0
+  INTEGER :: dataset_total_error = 0
+  INTEGER :: extend_dataset_total_error = 0
+  INTEGER :: refobj_total_error = 0
+  INTEGER :: refreg_total_error = 0
+  INTEGER :: dataspace_total_error = 0
+  INTEGER :: hyperslab_total_error = 0
+  INTEGER :: element_total_error = 0
+  INTEGER :: basic_select_total_error = 0
+  INTEGER :: total_error_compoundtest = 0
+  INTEGER :: basic_datatype_total_error = 0
+  INTEGER :: enum_total_error = 0
+  INTEGER :: external_total_error = 0
+  INTEGER :: multi_file_total_error = 0
+  INTEGER :: attribute_total_error = 0
+  INTEGER :: group_total_error = 0
+  INTEGER :: majnum, minnum, relnum
+  CHARACTER(LEN=8) error_string
+  CHARACTER(LEN=8) :: success = ' PASSED '
+  CHARACTER(LEN=8) :: failure = '*FAILED*'
+  CHARACTER(LEN=4) :: e_format ='(8a)'
+  LOGICAL :: cleanup = .TRUE.
+  !     LOGICAL :: cleanup = .FALSE.
+
+  CALL h5open_f(error) 
+  WRITE(*,*) '                       ==========================                            '
+  WRITE(*,*) '                              FORTRAN 1.8 tests '
+  WRITE(*,*) '                       ==========================                            '
+  CALL h5get_libversion_f(majnum, minnum, relnum, total_error)
+  IF(total_error .EQ. 0) THEN
+     WRITE(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO")
+     WRITE(*, '(I1)', advance="NO") majnum
+     WRITE(*, '(".")', advance="NO") 
+     WRITE(*, '(I1)', advance="NO") minnum
+     WRITE(*, '(" release ")', advance="NO")
+     WRITE(*, '(I3)') relnum
+  ELSE
+     total_error = total_error + 1
+  ENDIF
+  WRITE(*,*)
+
+  error_string = failure
+  CALL file_space(cleanup, fspace_total_error)
+  IF (fspace_total_error == 0) error_string = success
+  WRITE(*, fmt = '(21a)', advance = 'no') ' File free space test'     
+  WRITE(*, fmt = '(49x,a)', advance = 'no') ' ' 
+  WRITE(*, fmt = e_format) error_string
+  total_error = total_error + fspace_total_error 
+
+  !     write(*,*)
+  !     write(*,*) '========================================='
+  !     write(*,*) 'Testing ATTRIBUTE interface              ' 
+  !     write(*,*) '========================================='
+
+  error_string = failure
+  CALL attribute_test_1_8(cleanup, attribute_total_error)
+  WRITE(*, fmt = '(15a)', advance = 'no') ' ATTRIBUTE TEST'     
+  WRITE(*, fmt = '(55x,a)', advance = 'no')  ' '
+  IF (attribute_total_error == 0) error_string = success
+  WRITE(*, fmt = e_format) error_string
+  total_error = total_error + attribute_total_error
+
+  CALL group_test(cleanup, group_total_error)
+  WRITE(*, fmt = '(15a)', advance = 'no') ' GROUP TEST'     
+  WRITE(*, fmt = '(55x,a)', advance = 'no')  ' '
+  IF (group_total_error == 0) error_string = success
+  WRITE(*, fmt = e_format) error_string
+  total_error = total_error + group_total_error
+
+  CALL test_h5o(cleanup, group_total_error )
+  WRITE(*, fmt = '(15a)', advance = 'no') ' H5O TEST'     
+  WRITE(*, fmt = '(55x,a)', advance = 'no')  ' '
+  IF (group_total_error == 0) error_string = success
+  WRITE(*, fmt = e_format) error_string
+  total_error = total_error + group_total_error
+
+  CALL dtransform(cleanup, group_total_error)
+  WRITE(*, fmt = '(15a)', advance = 'no') ' Dtransform TEST'     
+  WRITE(*, fmt = '(55x,a)', advance = 'no')  ' '
+  IF (group_total_error == 0) error_string = success
+  WRITE(*, fmt = e_format) error_string
+  total_error = total_error + group_total_error
+
+  CALL test_genprop_basic_class(cleanup, group_total_error)
+  WRITE(*, fmt = '(30a)', advance = 'no') ' test_genprop_basic_class TEST'     
+  WRITE(*, fmt = '(55x,a)', advance = 'no')  ' '
+  IF (group_total_error == 0) error_string = success
+  WRITE(*, fmt = e_format) error_string
+  total_error = total_error + group_total_error
+  CALL test_h5s_encode(cleanup, group_total_error)
+  WRITE(*, fmt = '(15a)', advance = 'no') ' test_h5s_encode TEST'     
+  WRITE(*, fmt = '(55x,a)', advance = 'no')  ' '
+  IF (group_total_error == 0) error_string = success
+  WRITE(*, fmt = e_format) error_string
+  total_error = total_error + group_total_error
+
+!  CALL test_hard_query(group_total_error)
+
+  total_error = total_error + group_total_error
+
+  WRITE(*,*)
+
+  WRITE(*,*) '                  ============================================  '
+  WRITE(*, fmt = '(19x, 27a)', advance='NO') ' FORTRAN tests completed with '
+  WRITE(*, fmt = '(i4)', advance='NO') total_error
+  WRITE(*, fmt = '(12a)' ) ' error(s) ! '
+  WRITE(*,*) '                  ============================================  '
+
+  CALL h5close_f(error)
+
+  ! if errors detected, exit with non-zero code.
+  IF (total_error .NE. 0) CALL h5_exit_f (1)
+
+END PROGRAM fortranlibtest
+
+SUBROUTINE dtransform(cleanup, total_error)
+  USE HDF5 ! This module contains all necessary modules 
+  
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(HID_T) :: dxpl_id_c_to_f, dxpl_id_c_to_f_copy
+  INTEGER(HID_T) :: dxpl_id_simple, dxpl_id_polynomial, dxpl_id_polynomial_copy, dxpl_id_utrans_inv, file_id
+  
+  CHARACTER(LEN=15), PARAMETER :: c_to_f = "(9/5.0)*x + 123"
+  INTEGER :: error
+  CHARACTER(LEN=15) :: ptrgetTest
+  CHARACTER(LEN=7) :: ptrgetTest_small
+  CHARACTER(LEN=30) :: ptrgetTest_big
+
+  INTEGER(SIZE_T) :: size
+
+
+  CALL H5Fcreate_f("dtransform.h5", H5F_ACC_TRUNC_F, file_id, error)
+  CALL check("dtransform.H5Fcreate_f", error, total_error)
+
+  CALL H5Pcreate_f(H5P_DATASET_XFER_F, dxpl_id_c_to_f, error)
+  CALL check("dtransform.H5Pcreate_f", error, total_error)
+  
+  CALL H5Pset_data_transform_f(dxpl_id_c_to_f, c_to_f, error)
+  CALL check("dtransform.H5Pset_data_transform_f", error, total_error)
+
+  CALL H5Pget_data_transform_f(dxpl_id_c_to_f, ptrgetTest, error, size=size)
+  CALL check("dtransform.H5Pget_data_transform_f",  error, total_error)
+  CALL VerifyString("dtransform.H5Pget_data_transform_f", c_to_f, ptrgetTest, total_error)
+  CALL VERIFY("dtransform.H5Pget_data_transform_f", INT(size),15, total_error)
+
+! check case when receiving buffer to small
+
+  CALL H5Pget_data_transform_f(dxpl_id_c_to_f, ptrgetTest_small, error, size=size)
+  CALL check("dtransform.H5Pget_data_transform_f",  error, total_error)
+  CALL VerifyString("dtransform.H5Pget_data_transform_f", c_to_f(1:7), ptrgetTest_small, total_error)
+  CALL VERIFY("dtransform.H5Pget_data_transform_f", INT(size),15, total_error)
+
+! check case when receiving buffer to big
+
+  CALL H5Pget_data_transform_f(dxpl_id_c_to_f, ptrgetTest_big, error, size=size)
+  CALL check("dtransform.H5Pget_data_transform_f",  error, total_error)
+  CALL VerifyString("dtransform.H5Pget_data_transform_f", c_to_f(1:15), ptrgetTest_big(1:15), total_error)
+  CALL VERIFY("dtransform.H5Pget_data_transform_f", INT(size), 15, total_error)
+
+  CALL H5Fclose_f(file_id, error)
+  CALL check("H5Fclose_f", error, total_error)
+
+  IF(cleanup) CALL h5_cleanup_f("dtransform", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+
+END SUBROUTINE dtransform
+
+
+!/****************************************************************
+!**
+!**  test_genprop_basic_class(): Test basic generic property list code.
+!**      Tests creating new generic classes.
+!**
+!****************************************************************/
+
+SUBROUTINE test_genprop_basic_class(cleanup, total_error)
+
+  USE HDF5 ! This module contains all necessary modules 
+  
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(HID_T) :: cid1		!/* Generic Property class ID */
+  INTEGER(HID_T) :: cid2		!/* Generic Property class ID */
+  INTEGER(HID_T) :: cid3		!/* Generic Property class ID */
+
+  CHARACTER(LEN=7) :: CLASS1_NAME = "Class 1"
+  CHARACTER(LEN=7)  :: name              ! /* Name of class */
+  CHARACTER(LEN=10) :: name_big          ! /* Name of class bigger buffer */
+  CHARACTER(LEN=4)  :: name_small        ! /* Name of class smaller buffer*/
+  INTEGER :: error
+  INTEGER :: size
+  LOGICAL :: flag
+
+  !/* Output message about test being performed */
+
+  WRITE(*,*) "Testing Basic Generic Property List Class Creation Functionality"
+
+  ! /* Create a new generic class, derived from the root of the class hierarchy */
+  CALL H5Pcreate_class_f(H5P_ROOT_F, CLASS1_NAME, cid1, error)
+  CALL check("H5Pcreate_class", error, total_error)
+
+  ! /* Check class name */
+  CALL H5Pget_class_name_f(cid1, name, size, error)
+  CALL check("H5Pget_class_name", error, total_error)
+  CALL VERIFY("H5Pget_class_name", size,7,error)
+  CALL verifystring("H5Pget_class_name", name, CLASS1_NAME, error)
+  IF(error.NE.0)THEN
+     WRITE(*,*) 'Class names do not match! name=',name, 'CLASS1_NAME=',CLASS1_NAME
+     total_error = total_error + 1
+  ENDIF  
+  
+  ! /* Check class name smaller buffer*/
+  CALL H5Pget_class_name_f(cid1, name_small, size, error)
+  CALL check("H5Pget_class_name", error, total_error)
+  CALL VERIFY("H5Pget_class_name", size,7,error)
+  CALL verifystring("H5Pget_class_name", name_small(1:4), CLASS1_NAME(1:4), error)
+  IF(error.NE.0)THEN
+     WRITE(*,*) 'Class names do not match! name=',name_small(1:4), 'CLASS1_NAME=',CLASS1_NAME(1:4)
+     total_error = total_error + 1
+  ENDIF
+
+  ! /* Check class name bigger buffer*/
+  CALL H5Pget_class_name_f(cid1, name_big, size, error)
+  CALL check("H5Pget_class_name", error, total_error)
+  CALL VERIFY("H5Pget_class_name", size,7,error)
+  CALL verifystring("H5Pget_class_name", TRIM(name_big), TRIM(CLASS1_NAME), error)
+  IF(error.NE.0)THEN
+     WRITE(*,*) 'Class names do not match! name=',TRIM(name_small), 'CLASS1_NAME=',TRIM(CLASS1_NAME)
+     total_error = total_error + 1
+  ENDIF
+
+  ! /* Check class parent */
+  CALL H5Pget_class_parent_f(cid1, cid2, error)
+  CALL check("H5Pget_class_parent_f", error, total_error)
+
+  ! /* Verify class parent correct */
+  CALL H5Pequal_f(cid2, H5P_ROOT_F, flag, error)
+  CALL check("H5Pequal_f", error, total_error)
+  CALL verifylogical("H5Pequal_f", flag, .TRUE., total_error)
+
+
+  ! /* Make certain false postives aren't being returned */
+  CALL H5Pequal_f(cid2, H5P_FILE_CREATE_F, flag, error)
+  CALL check("H5Pequal_f", error, total_error)
+  CALL verifylogical("H5Pequal_f", flag, .FALSE., total_error)
+
+  !/* Close parent class */
+  CALL H5Pclose_class_f(cid2, error)
+  CALL check("H5Pclose_class_f", error, total_error)
+
+
+  !/* Close class */
+  CALL H5Pclose_class_f(cid1, error)
+  CALL check("H5Pclose_class_f", error, total_error)
+
+END SUBROUTINE test_genprop_basic_class
+
+SUBROUTINE test_h5s_encode(cleanup, total_error)
+
+!/****************************************************************
+!**
+!**  test_h5s_encode(): Test H5S (dataspace) encoding and decoding.
+!**
+!****************************************************************/
+
+  USE HDF5 ! This module contains all necessary modules 
+  
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(hid_t) :: sid1, sid2, sid3!	/* Dataspace ID		*/
+  INTEGER(hid_t) :: decoded_sid1, decoded_sid2, decoded_sid3
+  INTEGER :: rank	!/* LOGICAL rank of dataspace	*/
+  INTEGER(size_t) :: sbuf_size=0, null_size=0, scalar_size=0
+
+! Make sure the size is large, need variable length in fortran 2003
+  CHARACTER(LEN=288) :: sbuf
+  CHARACTER(LEN=288) :: scalar_buf
+! F2003  CHARACTER(LEN=:), ALLOCATABLE :: sbuf
+
+!    unsigned char       *sbuf=NULL, *null_sbuf=NULL, *scalar_buf=NULL;
+!    hsize_t		tdims[4];	/* Dimension array to test with */
+  INTEGER(hsize_t) :: n ! /* Number of dataspace elements */
+
+  INTEGER(hsize_t), DIMENSION(1:3) :: start = (/0, 0, 0/)
+  INTEGER(hsize_t), DIMENSION(1:3) :: stride = (/2, 5, 3/)
+  INTEGER(hsize_t), DIMENSION(1:3) :: count = (/2, 2, 2/)
+  INTEGER(hsize_t), DIMENSION(1:3) :: BLOCK = (/1, 3, 1/)
+
+  INTEGER :: space_type
+
+!    H5S_sel_type        sel_type;
+!    hssize_t            nblocks;
+  !
+  !Dataset dimensions 
+  !
+  INTEGER, PARAMETER :: SPACE1_DIM1= 3,  SPACE1_DIM2=15, SPACE1_DIM3=13
+
+  INTEGER(HSIZE_T), DIMENSION(1:3) :: dims1 = (/SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3/)
+  INTEGER :: SPACE1_RANK = 3
+  INTEGER :: error
+
+  !/* Output message about test being performed */
+  WRITE(*,*) "Testing Dataspace Encoding and Decoding"
+
+  !/*-------------------------------------------------------------------------
+  ! * Test encoding and decoding of simple dataspace and hyperslab selection.
+  ! *-------------------------------------------------------------------------
+  ! */
+  
+  CALL H5Screate_simple_f(SPACE1_RANK, dims1, sid1, error)
+  CALL check("H5Screate_simple", error, total_error)
+  
+  CALL h5sselect_hyperslab_f(sid1, H5S_SELECT_SET_F, &
+       start, count, error, stride=stride, BLOCK=BLOCK) 
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+  
+  
+  !/* Encode simple data space in a buffer */
+
+  !         First find the buffer size
+  CALL H5Sencode_f(sid1, sbuf, sbuf_size, error)
+  CALL check("H5Sencode", error, total_error)
+
+  ! In fortran 2003 we can allocate the needed character size here
+
+  ! /* Try decoding bogus buffer */
+
+  CALL H5Sdecode_f(sbuf, decoded_sid1, error)
+  CALL VERIFY("H5Sdecode", error, -1, total_error)
+
+  CALL H5Sencode_f(sid1, sbuf, sbuf_size, error)
+  CALL check("H5Sencode", error, total_error)
+
+  ! /* Decode from the dataspace buffer and return an object handle */
+  CALL H5Sdecode_f(sbuf, decoded_sid1, error)
+  CALL check("H5Sdecode", error, total_error)
+
+
+  ! /* Verify the decoded dataspace */
+  CALL h5sget_simple_extent_npoints_f(decoded_sid1, n, error)
+  CALL check("h5sget_simple_extent_npoints_f", error, total_error)
+  CALL VERIFY("h5sget_simple_extent_npoints_f", INT(n), SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3, &
+       total_error)
+
+!!$
+!!$    rank = H5Sget_simple_extent_ndims(decoded_sid1);
+!!$    CHECK(rank, FAIL, "H5Sget_simple_extent_ndims");
+!!$    VERIFY(rank, SPACE1_RANK, "H5Sget_simple_extent_ndims");
+!!$
+!!$    rank = H5Sget_simple_extent_dims(decoded_sid1, tdims, NULL);
+!!$    CHECK(rank, FAIL, "H5Sget_simple_extent_dims");
+!!$    VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0,
+!!$	   "H5Sget_simple_extent_dims");
+!!$
+!!$    /* Verify hyperslabe selection */
+!!$    sel_type = H5Sget_select_type(decoded_sid1);
+!!$    VERIFY(sel_type, H5S_SEL_HYPERSLABS, "H5Sget_select_type");
+!!$
+!!$    nblocks = H5Sget_select_hyper_nblocks(decoded_sid1);
+!!$    VERIFY(nblocks, 2*2*2, "H5Sget_select_hyper_nblocks");
+!!$
+  !
+  !Close the dataspace for the dataset.
+  !
+  CALL h5sclose_f(sid1, error)
+  CALL check("h5sclose_f", error, total_error)
+ 
+  CALL h5sclose_f(decoded_sid1, error)
+  CALL check("h5sclose_f", error, total_error)    
+
+!!$
+!!$    ret = H5Sclose(decoded_sid1);
+!!$    CHECK(ret, FAIL, "H5Sclose");
+!!$
+!!$    /*-------------------------------------------------------------------------
+!!$     * Test encoding and decoding of null dataspace.
+!!$     *-------------------------------------------------------------------------
+!!$     */
+!!$    sid2 = H5Screate(H5S_NULL);
+!!$    CHECK(sid2, FAIL, "H5Screate");
+!!$
+!!$    /* Encode null data space in a buffer */
+!!$    ret = H5Sencode(sid2, NULL, &null_size);
+!!$    CHECK(ret, FAIL, "H5Sencode");
+!!$
+!!$    if(null_size>0)
+!!$        null_sbuf = (unsigned char*)HDcalloc((size_t)1, null_size);
+!!$
+!!$    ret = H5Sencode(sid2, null_sbuf, &null_size);
+!!$    CHECK(ret, FAIL, "H5Sencode");
+!!$
+!!$    /* Decode from the dataspace buffer and return an object handle */
+!!$    decoded_sid2=H5Sdecode(null_sbuf);
+!!$    CHECK(decoded_sid2, FAIL, "H5Sdecode");
+!!$
+!!$    /* Verify decoded dataspace */
+!!$    space_type = H5Sget_simple_extent_type(decoded_sid2);
+!!$    VERIFY(space_type, H5S_NULL, "H5Sget_simple_extent_type");
+!!$
+!!$    ret = H5Sclose(sid2);
+!!$    CHECK(ret, FAIL, "H5Sclose");
+!!$
+!!$    ret = H5Sclose(decoded_sid2);
+!!$    CHECK(ret, FAIL, "H5Sclose");
+!!$
+  ! /*-------------------------------------------------------------------------
+  !  * Test encoding and decoding of scalar dataspace.
+  !  *-------------------------------------------------------------------------
+  !  */
+  ! /* Create scalar dataspace */
+
+  CALL H5Screate_f(H5S_SCALAR_F, sid3, error)
+  CALL check("H5Screate_f",error, total_error)
+
+  ! /* Encode scalar data space in a buffer */
+
+  !        First find the buffer size
+  CALL H5Sencode_f(sid3, scalar_buf, scalar_size, error)
+  CALL check("H5Sencode_f", error, total_error)
+
+  ! encode
+
+  CALL H5Sencode_f(sid3, scalar_buf, scalar_size, error)
+  CALL check("H5Sencode_f", error, total_error)
+
+
+  ! /* Decode from the dataspace buffer and return an object handle */
+
+  CALL H5Sdecode_f(scalar_buf, decoded_sid3, error)
+  CALL check("H5Sdecode_f", error, total_error)
+
+
+  ! /* Verify extent type */
+
+  CALL H5Sget_simple_extent_type_f(decoded_sid3, space_type, error)
+  CALL check("H5Sget_simple_extent_type_f", error, total_error)
+  CALL VERIFY("H5Sget_simple_extent_type_f", space_type, H5S_SCALAR_F, total_error)
+
+  ! /* Verify decoded dataspace */
+  CALL h5sget_simple_extent_npoints_f(decoded_sid3, n, error)
+  CALL check("h5sget_simple_extent_npoints_f", error, total_error)
+  CALL VERIFY("h5sget_simple_extent_npoints_f", INT(n), 1, total_error)
+
+  CALL H5Sget_simple_extent_ndims_f(decoded_sid3, rank, error)
+  CALL CHECK("H5Sget_simple_extent_ndims_f", error, total_error)
+  CALL VERIFY("H5Sget_simple_extent_ndims_f", rank, 0, total_error )
+
+  CALL h5sclose_f(sid3, error)
+  CALL check("h5sclose_f", error, total_error)
+ 
+  CALL h5sclose_f(decoded_sid3, error)
+  CALL check("h5sclose_f", error, total_error)
+
+END SUBROUTINE test_h5s_encode
+
+!/*-------------------------------------------------------------------------
+! * Function:    test_hard_query
+! *
+! * Purpose:     Tests H5Tcompiler_conv() for querying whether a conversion is
+! *              a hard one.
+! *
+! * Return:      Success:        0
+! *
+! *              Failure:        number of errors
+! *
+! * Programmer:  Raymond Lu
+! *              Friday, Sept 2, 2005
+! *
+! * Modifications:
+! *
+! *-------------------------------------------------------------------------
+! */
+
+!!$SUBROUTINE test_hard_query(total_error)
+!!$
+!!$  USE HDF5 ! This module contains all necessary modules 
+!!$  
+!!$  IMPLICIT NONE
+!!$  INTEGER, INTENT(INOUT) :: total_error
+!!$
+!!$  INTEGER :: error
+!!$  LOGICAL :: flag
+!!$
+!!$  WRITE(*,*) "query functions of compiler conversion"
+!!$
+!!$  ! /* Verify the conversion from int to float is a hard conversion. */
+!!$
+!!$  CALL H5Tcompiler_conv_f(H5T_INTEGER_F, H5T_FLOAT_F, flag, error)
+!!$  CALL check("H5Tcompiler_conv", error, total_error)
+!!$  CALL VerifyLogical("H5Tcompiler_conv", flag, .TRUE.,total_error)
+
+!!$    if((ret = H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT))!=TRUE) {
+!!$        H5_FAILED();
+!!$        printf("Can't query conversion function\n");
+!!$        goto error;
+!!$    }
+
+!!$    /* Unregister the hard conversion from int to float.  Verify the conversion
+!!$     * is a soft conversion. */
+!!$    H5Tunregister(H5T_PERS_HARD, NULL, H5T_NATIVE_INT, H5T_NATIVE_FLOAT, H5T_conv_int_float);
+!!$    if((ret = H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT))!=FALSE) {
+!!$        H5_FAILED();
+!!$        printf("Can't query conversion function\n");
+!!$        goto error;
+!!$    }
+!!$
+!!$    /* Register the hard conversion from int to float.  Verify the conversion
+!!$     * is a hard conversion. */
+!!$    H5Tregister(H5T_PERS_HARD, "int_flt", H5T_NATIVE_INT, H5T_NATIVE_FLOAT, H5T_conv_int_float);
+!!$    if((ret = H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT))!=TRUE) {
+!!$        H5_FAILED();
+!!$        printf("Can't query conversion function\n");
+!!$        goto error;
+!!$    }
+!!$
+!!$    PASSED();
+!!$    reset_hdf5();
+!!$
+!!$    return 0;
+!!$
+!!$END SUBROUTINE test_hard_query
+
+
+!/*-------------------------------------------------------------------------
+! * Function:    test_encode
+! *
+! * Purpose:     Tests functions of encoding and decoding datatype.
+! *
+! * Return:      Success:        0
+! *
+! *              Failure:        number of errors
+! *
+! * Programmer:  Raymond Lu
+! *              July 14, 2004
+! *
+! * Modifications:
+! *
+! *-------------------------------------------------------------------------
+! */
+
+!!$SUBROUTINE test_encode(total_error)
+!!$
+!!$  USE HDF5 ! This module contains all necessary modules 
+!!$      struct s1 {
+!!$        int    a;
+!!$        float  b;
+!!$        long   c;
+!!$        double d;
+!!$    };
+!!$  IMPLICIT NONE
+!!$  INTEGER, INTENT(INOUT) :: total_error
+!!$  INTEGER(SIZE_T), PARAMETER :: sizechar = 1024
+!!$  INTEGER :: error
+!!$  INTEGER(hid_t) :: file=-1, tid1=-1, tid2=-1
+!!$  INTEGER(hid_t) :: decoded_tid1=-1, decoded_tid2=-1
+!!$  CHARACTER(LEN=1024) :: filename = 'encode.h5'
+!!$    char        compnd_type[]="Compound_type", enum_type[]="Enum_type";
+!!$    short       enum_val;
+!!$    size_t      cmpd_buf_size = 0;
+!!$    size_t      enum_buf_size = 0;
+!!$    unsigned char       *cmpd_buf=NULL, *enum_buf=NULL;
+!!$    herr_t      ret;
+!!$    INTEGER(HID_T) :: dt5_id      ! Memory datatype identifier 
+!!$
+!!$    INTEGER(SIZE_T)     ::   type_sizec  ! Size of the character datatype
+!!$
+!!$   WRITE(*,*) "functions of encoding and decoding datatypes"
+!!$
+!!$   !/* Create File */
+!!$
+!!$   CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file, error)
+!!$   CALL check("H5Fcreate_f", error, total_error)
+!!$
+!!$   !/*-----------------------------------------------------------------------
+!!$   ! * Create compound and enumerate datatypes
+!!$   ! *-----------------------------------------------------------------------
+!!$   ! */
+!!$
+!!$   ! /* Create a compound datatype */
+!!$   CALL h5tcopy_f(H5T_NATIVE_CHARACTER, dt5_id, error)
+!!$   CALL check("h5tcopy_f", error, total_error)
+!!$   sizechar = 2
+!!$   CALL h5tset_size_f(dt5_id, sizechar, error)
+!!$   CALL check("h5tset_size_f", error, total_error)
+!!$   CALL h5tget_size_f(dt5_id, type_sizec, error)
+!!$   CALL check("h5tget_size_f", error, total_error)
+!!$
+!!$   CALL h5tget_size_f(H5T_NATIVE_INTEGER, type_sizec, error)
+!!$   CALL check("h5tget_size_f", error, total_error)
+!!$   CALL h5tcreate_f(H5T_COMPOUND_F, type_sizec, dtype_id, error)
+!!$
+!!$
+!!$    if((tid1=H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't create datatype!\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't insert field 'a'\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't insert field 'b'\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't insert field 'c'\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tinsert(tid1, "d", HOFFSET(struct s1, d), H5T_NATIVE_DOUBLE) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't insert field 'd'\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /* Create a enumerate datatype */
+!!$    if((tid2=H5Tcreate(H5T_ENUM, sizeof(short))) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't create enumerate type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tenum_insert(tid2, "RED", (enum_val=0,&enum_val)) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't insert field into enumeration type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tenum_insert(tid2, "GREEN", (enum_val=1,&enum_val)) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't insert field into enumeration type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tenum_insert(tid2, "BLUE", (enum_val=2,&enum_val)) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't insert field into enumeration type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tenum_insert(tid2, "ORANGE", (enum_val=3,&enum_val)) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't insert field into enumeration type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tenum_insert(tid2, "YELLOW", (enum_val=4,&enum_val)) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't insert field into enumeration type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /*-----------------------------------------------------------------------
+!!$     * Test encoding and decoding compound and enumerate datatypes
+!!$     *-----------------------------------------------------------------------
+!!$     */
+!!$    /* Encode compound type in a buffer */
+!!$    if(H5Tencode(tid1, NULL, &cmpd_buf_size) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't encode compound type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    if(cmpd_buf_size>0)
+!!$        cmpd_buf = (unsigned char*)calloc(1, cmpd_buf_size);
+!!$
+!!$    /* Try decoding bogus buffer */
+!!$    H5E_BEGIN_TRY {
+!!$	ret = H5Tdecode(cmpd_buf);
+!!$    } H5E_END_TRY;
+!!$    if(ret!=FAIL) {
+!!$        H5_FAILED();
+!!$        printf("Decoded bogus buffer!\n");
+!!$        goto error;
+!!$    }
+!!$
+!!$    if(H5Tencode(tid1, cmpd_buf, &cmpd_buf_size) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't encode compound type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /* Decode from the compound buffer and return an object handle */
+!!$    if((decoded_tid1 = H5Tdecode(cmpd_buf)) < 0)
+!!$        FAIL_PUTS_ERROR("Can't decode compound type\n")
+!!$
+!!$    /* Verify that the datatype was copied exactly */
+!!$    if(H5Tequal(decoded_tid1, tid1)<=0) {
+!!$        H5_FAILED();
+!!$        printf("Datatype wasn't encoded & decoded identically\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /* Query member number and member index by name, for compound type. */
+!!$    if(H5Tget_nmembers(decoded_tid1)!=4) {
+!!$        H5_FAILED();
+!!$        printf("Can't get member number\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tget_member_index(decoded_tid1, "c")!=2) {
+!!$        H5_FAILED();
+!!$        printf("Can't get correct index number\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$
+!!$    /* Encode enumerate type in a buffer */
+!!$    if(H5Tencode(tid2, NULL, &enum_buf_size) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't encode enumerate type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    if(enum_buf_size>0)
+!!$        enum_buf = (unsigned char*)calloc(1, enum_buf_size);
+!!$
+!!$    if(H5Tencode(tid2, enum_buf, &enum_buf_size) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't encode enumerate type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /* Decode from the enumerate buffer and return an object handle */
+!!$    if((decoded_tid2=H5Tdecode(enum_buf)) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't decode enumerate type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /* Verify that the datatype was copied exactly */
+!!$    if(H5Tequal(decoded_tid2, tid2)<=0) {
+!!$        H5_FAILED();
+!!$        printf("Datatype wasn't encoded & decoded identically\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /* Query member number and member index by name, for enumeration type. */
+!!$    if(H5Tget_nmembers(decoded_tid2)!=5) {
+!!$        H5_FAILED();
+!!$        printf("Can't get member number\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tget_member_index(decoded_tid2, "ORANGE") != 3) {
+!!$        H5_FAILED();
+!!$        printf("Can't get correct index number\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /*-----------------------------------------------------------------------
+!!$     * Commit and reopen the compound and enumerate datatypes
+!!$     *-----------------------------------------------------------------------
+!!$     */
+!!$    /* Commit compound datatype and close it */
+!!$    if(H5Tcommit2(file, compnd_type, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't commit compound datatype\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tclose(tid1) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't close datatype\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tclose(decoded_tid1) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't close datatype\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    free(cmpd_buf);
+!!$    cmpd_buf_size = 0;
+!!$
+!!$    /* Commit enumeration datatype and close it */
+!!$    if(H5Tcommit2(file, enum_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't commit compound datatype\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tclose(tid2) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't close datatype\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tclose(decoded_tid2) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't close datatype\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    free(enum_buf);
+!!$    enum_buf_size = 0;
+!!$
+!!$    /* Open the dataytpe for query */
+!!$    if((tid1 = H5Topen2(file, compnd_type, H5P_DEFAULT)) < 0)
+!!$        FAIL_STACK_ERROR
+!!$    if((tid2 = H5Topen2(file, enum_type, H5P_DEFAULT)) < 0)
+!!$        FAIL_STACK_ERROR
+!!$
+!!$
+!!$    /* Encode compound type in a buffer */
+!!$    if(H5Tencode(tid1, NULL, &cmpd_buf_size) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't encode compound type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    if(cmpd_buf_size>0)
+!!$        cmpd_buf = (unsigned char*)calloc(1, cmpd_buf_size);
+!!$
+!!$    if(H5Tencode(tid1, cmpd_buf, &cmpd_buf_size) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't encode compound type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /* Decode from the compound buffer and return an object handle */
+!!$    if((decoded_tid1 = H5Tdecode(cmpd_buf)) < 0)
+!!$        FAIL_PUTS_ERROR("Can't decode compound type\n")
+!!$
+!!$    /* Verify that the datatype was copied exactly */
+!!$    if(H5Tequal(decoded_tid1, tid1)<=0) {
+!!$        H5_FAILED();
+!!$        printf("Datatype wasn't encoded & decoded identically\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /* Query member number and member index by name, for compound type. */
+!!$    if(H5Tget_nmembers(decoded_tid1)!=4) {
+!!$        H5_FAILED();
+!!$        printf("Can't get member number\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tget_member_index(decoded_tid1, "c")!=2) {
+!!$        H5_FAILED();
+!!$        printf("Can't get correct index number\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /*-----------------------------------------------------------------------
+!!$     * Test encoding and decoding compound and enumerate datatypes
+!!$     *-----------------------------------------------------------------------
+!!$     */
+!!$    /* Encode enumerate type in a buffer */
+!!$    if(H5Tencode(tid2, NULL, &enum_buf_size) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't encode enumerate type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    if(enum_buf_size>0)
+!!$        enum_buf = (unsigned char*)calloc(1, enum_buf_size);
+!!$
+!!$    if(H5Tencode(tid2, enum_buf, &enum_buf_size) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't encode enumerate type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /* Decode from the enumerate buffer and return an object handle */
+!!$    if((decoded_tid2=H5Tdecode(enum_buf)) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't decode enumerate type\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /* Verify that the datatype was copied exactly */
+!!$    if(H5Tequal(decoded_tid2, tid2)<=0) {
+!!$        H5_FAILED();
+!!$        printf("Datatype wasn't encoded & decoded identically\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /* Query member number and member index by name, for enumeration type. */
+!!$    if(H5Tget_nmembers(decoded_tid2)!=5) {
+!!$        H5_FAILED();
+!!$        printf("Can't get member number\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tget_member_index(decoded_tid2, "ORANGE")!=3) {
+!!$        H5_FAILED();
+!!$        printf("Can't get correct index number\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    /*-----------------------------------------------------------------------
+!!$     * Close and release
+!!$     *-----------------------------------------------------------------------
+!!$     */
+!!$    /* Close datatype and file */
+!!$    if(H5Tclose(tid1) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't close datatype\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tclose(tid2) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't close datatype\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    if(H5Tclose(decoded_tid1) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't close datatype\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$    if(H5Tclose(decoded_tid2) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't close datatype\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    if(H5Fclose(file) < 0) {
+!!$        H5_FAILED();
+!!$        printf("Can't close file\n");
+!!$        goto error;
+!!$    } /* end if */
+!!$
+!!$    free(cmpd_buf);
+!!$    free(enum_buf);
+!!$
+!!$    PASSED();
+!!$    return 0;
+!!$
+!!$ error:
+!!$    H5E_BEGIN_TRY {
+!!$        H5Tclose (tid1);
+!!$        H5Tclose (tid2);
+!!$        H5Tclose (decoded_tid1);
+!!$        H5Tclose (decoded_tid2);
+!!$        H5Fclose (file);
+!!$    } H5E_END_TRY;
+!!$    return 1;
+!!$}
diff --git a/fortran/test/tH5A.f90 b/fortran/test/tH5A.f90
index 44c7964..b73dd8a 100644
--- a/fortran/test/tH5A.f90
+++ b/fortran/test/tH5A.f90
@@ -56,10 +56,7 @@
      INTEGER(HID_T) :: attr5_id       !Integer Attribute identifier 
      INTEGER(HID_T) :: attr6_id       !Null Attribute identifier 
      INTEGER(HID_T) :: aspace_id      !String Attribute Dataspace identifier 
-     INTEGER(HID_T) :: aspace2_id     !Character Attribute Dataspace identifier 
-     INTEGER(HID_T) :: aspace3_id     !Double Attribute Dataspace identifier 
-     INTEGER(HID_T) :: aspace4_id     !Real Attribute Dataspace identifier 
-     INTEGER(HID_T) :: aspace5_id     !Integer Attribute Dataspace identifier 
+     INTEGER(HID_T) :: aspace2_id     !Character Attribute Dataspace identifier
      INTEGER(HID_T) :: aspace6_id     !Null Attribute Dataspace identifier 
      INTEGER(HID_T) :: atype_id       !String Attribute Datatype identifier 
      INTEGER(HID_T) :: atype2_id      !Character Attribute Datatype identifier 
@@ -79,7 +76,8 @@
      INTEGER(HID_T) :: attr4_type      !Returned REAL Attribute Datatype identifier
      INTEGER(HID_T) :: attr5_type      !Returned INTEGER Attribute Datatype identifier
      INTEGER(HID_T) :: attr6_type      !Returned NULL Attribute Datatype identifier
-     INTEGER        :: num_attrs      !number of attributes 
+     INTEGER        :: num_attrs      !number of attributes  
+     INTEGER(HSIZE_T) :: attr_storage   ! attributes storage requirements .MSB.
      CHARACTER(LEN=256) :: attr_name    !buffer to put attr_name
      INTEGER(SIZE_T)    ::  name_size = 80 !attribute name length
 
@@ -113,32 +111,32 @@
      !
      !data buffers 
      !         
-     INTEGER, DIMENSION(NX,NY) :: data_in, data_out
+     INTEGER, DIMENSION(NX,NY) :: data_in
 
 
      !
      !Initialize data_in buffer
      !
-     do i = 1, NX
-        do j = 1, NY
+     DO i = 1, NX
+        DO j = 1, NY
            data_in(i,j) =  (i-1) + (j-1)
-        end do
-     end do
+        END DO
+     END DO
      !
      ! Initialize attribute's data
      !
      attr_data(1) = 'Dataset character attribute'
      attr_data(2) = 'Some other string here     ' 
-     attrlen = len(attr_data(1)) 
+     attrlen = LEN(attr_data(1)) 
     
      !
      ! Create the file.
      !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify file name"
-              stop
-          endif
+          IF (error .NE. 0) THEN
+              WRITE(*,*) "Cannot modify file name"
+              STOP
+          ENDIF
      CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
      CALL check("h5fcreate_f",error,total_error)
 
@@ -247,8 +245,10 @@
      !
      ! Create dataset NULL attribute of INTEGER.
      !
+
      CALL h5acreate_f(dset_id, aname6, atype5_id, aspace6_id, &
                       attr6_id, error)
+
      CALL check("h5acreate_f",error,total_error)
     
      !
@@ -287,6 +287,29 @@
      !
      CALL h5awrite_f(attr6_id, atype5_id, attr_integer_data, data_dims, error)
      CALL check("h5awrite_f",error,total_error)
+
+     !
+     ! check the amount of storage that is required for the specified attribute .MSB.
+     !
+     CALL h5aget_storage_size_f(attr_id, attr_storage, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+!     CALL VERIFY("h5aget_storage_size_f",attr_storage,*SizeOf(attr_storage),total_error)
+     CALL h5aget_storage_size_f(attr2_id, attr_storage, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+!     CALL verify("h5aget_storage_size_f",attr_storage,1,total_error)
+     CALL h5aget_storage_size_f(attr3_id, attr_storage, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+!     CALL verify("h5aget_storage_size_f",attr_storage,8,total_error)
+     CALL h5aget_storage_size_f(attr4_id, attr_storage, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+!     CALL verify("h5aget_storage_size_f",attr_storage,4,total_error)
+     CALL h5aget_storage_size_f(attr5_id, attr_storage, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+!     CALL verify("h5aget_storage_size_f",attr_storage,4,total_error)
+     CALL h5aget_storage_size_f(attr6_id, attr_storage, error)
+     CALL check("h5aget_storage_size_f",error,total_error)
+!     CALL verify("h5aget_storage_size_f",attr_storage,0,total_error)
+
    
      !
      ! Close the attribute. 
@@ -383,12 +406,12 @@
      !
      CALL h5aget_name_f(attr5_id, name_size, attr_name, error)
      CALL check("h5aget_name_f",error,total_error)
-     if (attr_name(1:12) .ne. aname5) then
+     IF (attr_name(1:12) .NE. aname5) THEN
        total_error = total_error + 1
-     end if
-     if (error .ne. 12) then
+     END IF
+     IF (error .NE. 12) THEN
        total_error = total_error + 1
-     end if
+     END IF
        
      !
      !get the STRING attrbute space
@@ -438,10 +461,10 @@
      !
      CALL h5aget_num_attrs_f(dset_id, num_attrs, error)
      CALL check("h5aget_num_attrs_f",error,total_error)
-     if (num_attrs .ne. 6) then
-       write(*,*) "got number of attributes wrong", num_attrs
+     IF (num_attrs .NE. 6) THEN
+       WRITE(*,*) "got number of attributes wrong", num_attrs
        total_error = total_error +1
-     end if
+     END IF
 
      !
      !set the read back data type's size
@@ -458,60 +481,60 @@
      CALL h5aread_f(attr_id, atype_id, aread_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
 
-     if ( (aread_data(1) .ne. attr_data(1)) .or. (aread_data(2) .ne. attr_data(2)) ) then
-         write(*,*) "Read back string attrbute is wrong", aread_data(1), aread_data(2)
+     IF ( (aread_data(1) .NE. attr_data(1)) .OR. (aread_data(2) .NE. attr_data(2)) ) THEN
+         WRITE(*,*) "Read back string attrbute is wrong", aread_data(1), aread_data(2)
          total_error = total_error + 1  
-     end if
+     END IF
      
      !
      !read the CHARACTER attribute data back to memory
      !
      CALL h5aread_f(attr2_id, H5T_NATIVE_CHARACTER, aread_character_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
-     if (aread_character_data .ne. 'A' ) then
-         write(*,*) "Read back character attrbute is wrong ",aread_character_data
+     IF (aread_character_data .NE. 'A' ) THEN
+         WRITE(*,*) "Read back character attrbute is wrong ",aread_character_data
          total_error = total_error + 1  
-     end if
+     END IF
      !
      !read the double attribute data back to memory
      !
      data_dims(1) = 1 
      CALL h5aread_f(attr3_id, H5T_NATIVE_DOUBLE, aread_double_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
-     if (aread_double_data(1) .ne. 3.459 ) then
-         write(*,*) "Read back double attrbute is wrong", aread_double_data(1)
+     IF (aread_double_data(1) .NE. 3.459 ) THEN
+         WRITE(*,*) "Read back double attrbute is wrong", aread_double_data(1)
          total_error = total_error + 1
-     end if  
+     END IF  
      !
      !read the real attribute data back to memory
      !
      data_dims(1) = 1 
      CALL h5aread_f(attr4_id, H5T_NATIVE_REAL, aread_real_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
-     if (aread_real_data(1) .ne. 4.0 ) then
-         write(*,*) "Read back real attrbute is wrong ", aread_real_data
+     IF (aread_real_data(1) .NE. 4.0 ) THEN
+         WRITE(*,*) "Read back real attrbute is wrong ", aread_real_data
          total_error = total_error + 1 
-     end if 
+     END IF 
      !
      !read the Integer attribute data back to memory
      !
      data_dims(1) = 1 
      CALL h5aread_f(attr5_id, H5T_NATIVE_INTEGER, aread_integer_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
-     if (aread_integer_data(1) .ne. 5 ) then
-         write(*,*) "Read back integer attrbute is wrong ", aread_integer_data
+     IF (aread_integer_data(1) .NE. 5 ) THEN
+         WRITE(*,*) "Read back integer attrbute is wrong ", aread_integer_data
          total_error = total_error + 1 
-     end if 
+     END IF 
      !
      !read the null attribute data. nothing can be read.
      !
      data_dims(1) = 1 
      CALL h5aread_f(attr6_id, H5T_NATIVE_INTEGER, aread_null_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
-     if (aread_null_data(1) .ne. 7 ) then
-         write(*,*) "Read back null attrbute is wrong ", aread_null_data
+     IF (aread_null_data(1) .NE. 7 ) THEN
+         WRITE(*,*) "Read back null attrbute is wrong ", aread_null_data
          total_error = total_error + 1 
-     end if 
+     END IF 
     
      !
      ! Close the attribute. 
@@ -540,10 +563,10 @@
      !
      CALL h5aget_num_attrs_f(dset_id, num_attrs, error)
      CALL check("h5aget_num_attrs_f",error,total_error)
-     if (num_attrs .ne. 5) then
-       write(*,*) "got number of attributes wrong", num_attrs
+     IF (num_attrs .NE. 5) THEN
+       WRITE(*,*) "got number of attributes wrong", num_attrs
        total_error = total_error +1
-     end if
+     END IF
 
 
 
@@ -582,7 +605,7 @@
      !
      ! Remove the file
      !
-     if (cleanup) call h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+     IF (cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
 
      RETURN
      END SUBROUTINE attribute_test
diff --git a/fortran/test/tH5A_1_8.f90 b/fortran/test/tH5A_1_8.f90
new file mode 100644
index 0000000..bba0340
--- /dev/null
+++ b/fortran/test/tH5A_1_8.f90
@@ -0,0 +1,3777 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!   Copyright by The HDF Group.                                               *
+!   Copyright by the Board of Trustees of the University of Illinois.         *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
+!   of the source code distribution tree; Copyright.html can be found at the  *
+!   root level of an installed copy of the electronic HDF5 document set and   *
+!   is linked from the top-level documents page.  It can also be found at     *
+!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+!   access to either file, you may request a copy from help@hdfgroup.org.     *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!
+SUBROUTINE attribute_test_1_8(cleanup, total_error) 
+
+!   This subroutine tests following 1.8 functionalities:
+!   h5acreate_f,  h5awrite_f, h5aclose_f,h5aread_f, h5aopen_name_f,
+!   h5aget_name_f,h5aget_space_f, h5aget_type_f, H5Pset_shared_mesg_nindexes_f,
+!   H5Pset_shared_mesg_index_f
+! 
+
+  USE HDF5 ! This module contains all necessary modules 
+        
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(OUT) :: total_error 
+  
+  CHARACTER(LEN=5), PARAMETER :: filename = "atest"    !File name
+  CHARACTER(LEN=9), PARAMETER :: dsetname = "atestdset"        !Dataset name
+  CHARACTER(LEN=11), PARAMETER :: aname = "attr_string"   !String Attribute name
+  CHARACTER(LEN=14), PARAMETER :: aname2 = "attr_character"!Character Attribute name
+  CHARACTER(LEN=11), PARAMETER :: aname3 = "attr_double"   !DOuble Attribute name
+  CHARACTER(LEN=9), PARAMETER :: aname4 = "attr_real"      !Real Attribute name
+  CHARACTER(LEN=12), PARAMETER :: aname5 = "attr_integer"  !Integer Attribute name
+  CHARACTER(LEN=9), PARAMETER :: aname6 = "attr_null"     !Null Attribute name
+  
+  !
+  !data space rank and dimensions
+  !
+  INTEGER, PARAMETER :: RANK = 2
+  INTEGER, PARAMETER :: NX = 4
+  INTEGER, PARAMETER :: NY = 5
+
+  !
+  !general purpose integer 
+  !         
+  INTEGER     ::   i, j
+  INTEGER     ::   error ! Error flag
+  
+  ! NEW STARTS HERE
+  INTEGER(HID_T) :: fapl = -1, fapl2 = -1
+  INTEGER(HID_T) :: fcpl = -1, fcpl2 = -1
+  INTEGER(HID_T) :: my_fapl, my_fcpl
+  LOGICAL, DIMENSION(1:2) :: new_format = (/.TRUE.,.FALSE./)
+  LOGICAL, DIMENSION(1:2) :: use_shared = (/.TRUE.,.FALSE./)
+
+
+! ********************
+! test_attr equivelent
+! ********************
+
+  WRITE(*,*) "TESTING ATTRIBUTES"
+  
+  CALL H5Pcreate_f(H5P_FILE_ACCESS_F,fapl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+  CALL h5pcopy_f(fapl, fapl2, error)
+  CALL check("h5pcopy_f",error,total_error)
+
+  CALL H5Pcreate_f(H5P_FILE_CREATE_F,fcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+  
+  CALL h5pcopy_f(fcpl, fcpl2, error)
+  CALL check("h5pcopy_f",error,total_error)
+
+  CALL H5Pset_shared_mesg_nindexes_f(fcpl2,1,error)
+  CALL check("H5Pset_shared_mesg_nindexes_f",error, total_error)
+
+  CALL H5Pset_shared_mesg_index_f(fcpl2, 0, H5O_SHMESG_ATTR_FLAG_F, 1, error)
+  CALL check(" H5Pset_shared_mesg_index_f",error, total_error)
+
+  DO i = 1, 2
+     IF (new_format(i)) THEN
+        WRITE(*,*) "     - Testing with new file format"
+        my_fapl = fapl2
+     ELSE
+        WRITE(*,*) "     - Testing with old file format"
+        my_fapl = fapl
+     END IF
+     CALL test_attr_basic_write(my_fapl, total_error)
+!!$        CALL test_attr_basic_read(my_fapl)
+!!$        CALL test_attr_flush(my_fapl)
+!!$        CALL test_attr_plist(my_fapl) ! this is next
+!!$        CALL test_attr_compound_write(my_fapl)
+!!$        CALL test_attr_compound_read(my_fapl)
+!!$        CALL test_attr_scalar_write(my_fapl)
+!!$        CALL test_attr_scalar_read(my_fapl)
+!!$        CALL test_attr_mult_write(my_fapl)
+!!$        CALL test_attr_mult_read(my_fapl)
+!!$        CALL test_attr_iterate(my_fapl)
+!!$        CALL test_attr_delete(my_fapl)
+!!$        CALL test_attr_dtype_shared(my_fapl)
+     IF(new_format(i)) THEN
+        DO j = 1, 2
+           IF (use_shared(j)) THEN
+              WRITE(*,*) "     - Testing with shared attributes"
+              my_fcpl = fcpl2
+           ELSE
+              WRITE(*,*) "     - Testing without shared attributes"
+              my_fcpl = fcpl
+           END IF
+!!$              CALL test_attr_dense_create(my_fcpl, my_fapl)
+           CALL test_attr_dense_open(my_fcpl, my_fapl, total_error)
+!!$              CALL test_attr_dense_delete(my_fcpl, my_fapl)
+!!$              CALL test_attr_dense_rename(my_fcpl, my_fapl)
+!!$              CALL test_attr_dense_unlink(my_fcpl, my_fapl)
+!!$              CALL test_attr_dense_limits(my_fcpl, my_fapl)
+!!$              CALL test_attr_big(my_fcpl, my_fapl)
+           CALL test_attr_null_space(my_fcpl, my_fapl, total_error)
+!!$              CALL test_attr_deprec(fcpl, my_fapl)
+           CALL test_attr_many(new_format(i), my_fcpl, my_fapl, total_error)
+           CALL test_attr_corder_create_basic(my_fcpl, my_fapl, total_error)
+           CALL test_attr_corder_create_compact(my_fcpl, my_fapl, total_error)
+!!$              CALL test_attr_corder_create_dense(my_fcpl, my_fapl)
+!!$              CALL test_attr_corder_create_reopen(my_fcpl, my_fapl)
+!!$              CALL test_attr_corder_transition(my_fcpl, my_fapl)
+!!$              CALL test_attr_corder_delete(my_fcpl, my_fapl)
+           CALL test_attr_info_by_idx(new_format, my_fcpl, my_fapl, total_error)
+           CALL test_attr_delete_by_idx(new_format, my_fcpl, my_fapl, total_error)
+!!$              CALL test_attr_iterate2(new_format, my_fcpl, my_fapl)
+!!$              CALL test_attr_open_by_idx(new_format, my_fcpl, my_fapl)
+!!$              CALL test_attr_open_by_name(new_format, my_fcpl, my_fapl)
+           CALL test_attr_create_by_name(new_format(i), my_fcpl, my_fapl, total_error)
+             ! /* More complex tests with both "new format" and "shared" attributes */
+           IF( use_shared(j) ) THEN
+!!$                 CALL test_attr_shared_write(my_fcpl, my_fapl)
+              CALL test_attr_shared_rename(my_fcpl, my_fapl, total_error)
+              CALL test_attr_shared_delete(my_fcpl, my_fapl, total_error)
+!!$                 CALL test_attr_shared_unlink(my_fcpl, my_fapl)
+           END IF
+!!$              CALL test_attr_bug1(my_fcpl, my_fapl)
+        END DO
+!!$        ELSE
+!!$           CALL test_attr_big(fcpl, my_fapl)
+!!$           CALL test_attr_null_space(fcpl, my_fapl)
+!!$           CALL test_attr_deprec(fcpl, my_fapl)
+!!$           CALL test_attr_many(new_format, fcpl, my_fapl)
+!!$           CALL test_attr_info_by_idx(new_format, fcpl, my_fapl)
+!!$           CALL test_attr_delete_by_idx(new_format, fcpl, my_fapl)
+!!$           CALL test_attr_iterate2(new_format, fcpl, my_fapl)
+!!$           CALL test_attr_open_by_idx(new_format, fcpl, my_fapl)
+!!$           CALL test_attr_open_by_name(new_format, fcpl, my_fapl)
+!!$           CALL test_attr_create_by_name(new_format, fcpl, my_fapl)
+!!$           CALL test_attr_bug1(fcpl, my_fapl)
+
+     END IF
+  END DO
+
+  CALL H5Pclose_f(fcpl, error)
+  CALL CHECK("H5Pclose", error,total_error)
+  CALL H5Pclose_f(fcpl2, error)
+  CALL CHECK("H5Pclose", error,total_error)
+
+  IF(cleanup) CALL h5_cleanup_f("tattr", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+
+  RETURN
+END SUBROUTINE attribute_test_1_8
+
+SUBROUTINE test_attr_corder_create_compact(fcpl,fapl, total_error)
+
+! Needed for get_info_by_name
+
+  USE HDF5 ! This module contains all necessary modules
+
+  IMPLICIT NONE
+! - - - arg types - - -
+
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid
+
+  INTEGER :: error
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
+  CHARACTER(LEN=8) :: DSET3_NAME = "Dataset3"
+  INTEGER, PARAMETER :: NUM_DSETS = 3
+
+  INTEGER :: curr_dset
+!!$
+!!$! - - - local declarations - - -
+!!$
+!!$  INTEGER :: max_compact,min_dense,curr_dset,u
+!!$  CHARACTER (LEN=NAME_BUF_SIZE) :: attrname
+!!$
+  INTEGER(HID_T) :: dset1, dset2, dset3
+  INTEGER(HID_T) :: my_dataset
+
+  INTEGER :: u
+  
+  INTEGER :: max_compact ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=7) :: attrname
+  CHARACTER(LEN=2) :: chr2
+  INTEGER(HID_T) :: attr        !String Attribute identifier 
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute 
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
+
+  data_dims = 0
+
+!!$  INTEGER :: sid
+!!$  INTEGER :: attr
+!!$  INTEGER :: dcpl
+!!$  INTEGER ::is_empty
+!!$  INTEGER ::is_dense
+!!$
+  WRITE(*,*) "     - Testing Compact Storage of Attributes with Creation Order Info"
+  ! /* Create file */
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+  CALL check("h5fcreate_f",error,total_error)
+  ! /* Create dataset creation property list */
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  CALL H5Pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, H5P_CRT_ORDER_INDEXED_F), error)
+  CALL check("H5Pset_attr_creation_order",error,total_error)
+! ret = H5Pset_attr_creation_order(dcpl, (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED));
+
+  ! /* Query the attribute creation properties */
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+! FIX: need to check optional parameters i.e. h5dcreate1/2_f
+
+  CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error, dcpl_id=dcpl )
+  CALL check("h5dcreate_f",error,total_error)
+
+  CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error, dcpl )
+  CALL check("h5dcreate_f",error,total_error)
+
+  CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error, dcpl_id=dcpl )
+  CALL check("h5dcreate_f",error,total_error)
+
+!!$  dset1 = H5Dcreate2(fid, DSET1_NAME, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)
+!!$  dset2 = H5Dcreate2(fid, DSET2_NAME, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)
+!!$  dset3 = H5Dcreate2(fid, DSET3_NAME, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)
+
+  DO curr_dset = 0,NUM_DSETS-1
+     SELECT CASE (curr_dset)
+     CASE (0)
+        my_dataset = dset1
+     CASE (1)
+        my_dataset = dset2
+     CASE (2)
+        my_dataset = dset3
+!     CASE DEFAULT
+!        CALL HDassert(0.AND."Toomanydatasets!")
+     END SELECT
+!!$    is_empty = H5O_is_attr_empty_test(my_dataset)
+!!$    CALL VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test")
+!!$    is_dense = H5O_is_attr_dense_test(my_dataset)
+!!$    CALL VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test")
+    DO u = 0, max_compact - 1
+       ! /* Create attribute */
+       WRITE(chr2,'(I2.2)') u
+       attrname = 'attr '//chr2
+       
+           ! attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
+           ! check with the optional information create2 specs.
+       CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error)
+       CALL check("h5acreate_f",error,total_error)
+
+       data_dims(1) = 1 
+       CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
+       CALL check("h5awrite_f",error,total_error)
+
+       CALL h5aclose_f(attr, error)
+       CALL check("h5aclose_f",error,total_error)
+
+!!$      ret = H5O_num_attrs_test(my_dataset, nattrs)
+!!$      CALL CHECK(ret, FAIL, "H5O_num_attrs_test")
+!!$      CALL VERIFY(nattrs, (u + 1))
+!!$      is_empty = H5O_is_attr_empty_test(my_dataset)
+!!$      CALL VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test")
+!!$      is_dense = H5O_is_attr_dense_test(my_dataset)
+!!$      CALL VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test")
+    END DO
+  END DO
+
+  !  /* Close Datasets */
+  CALL h5dclose_f(dset1, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5dclose_f(dset2, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5dclose_f(dset3, error)
+  CALL check("h5dclose_f",error,total_error)
+  
+  !   /* Close file */
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  ! /* Close dataspace */
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+  ! /* Close property list */
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f",error,total_error)
+
+  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
+  CALL check("h5open_f",error,total_error)
+
+!!$  fid = H5Fopen(FILENAME, H5F_ACC_RDWR, fapl)
+!!$  CALL CHECK(fid, FAIL, "H5Fopen")
+
+  CALL h5dopen_f(fid, DSET1_NAME, dset1, error)
+  CALL check("h5dopen_f",error,total_error)
+  CALL h5dopen_f(fid, DSET2_NAME, dset2, error)
+  CALL check("h5dopen_f",error,total_error)
+  CALL h5dopen_f(fid, DSET3_NAME, dset3, error)
+  CALL check("h5dopen_f",error,total_error)
+  DO curr_dset = 0,NUM_DSETS-1
+     SELECT CASE (curr_dset)
+     CASE (0)
+        my_dataset = dset1
+     CASE (1)
+        my_dataset = dset2
+     CASE (2)
+        my_dataset = dset3
+     CASE DEFAULT
+        WRITE(*,*) " WARNING: To many data sets! "
+     END SELECT
+!!$    ret = H5O_num_attrs_test(my_dataset, nattrs)
+!!$    CALL CHECK(ret, FAIL, "H5O_num_attrs_test")
+!!$    CALL VERIFY(nattrs, max_compact, "H5O_num_attrs_test")
+!!$    is_empty = H5O_is_attr_empty_test(my_dataset)
+!!$    CALL VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test")
+!!$    is_dense = H5O_is_attr_dense_test(my_dataset)
+!!$    CALL VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test")
+
+     DO u = 0,max_compact-1
+        WRITE(chr2,'(I2.2)') u
+        attrname = 'attr '//chr2
+        ! /* Retrieve information for attribute */
+
+        CALL H5Aget_info_by_name_f(my_dataset, ".", attrname, &
+             f_corder_valid, corder, cset, data_size, error, lapl_id = H5P_DEFAULT_F ) !with optional
+
+        CALL check("H5Aget_info_by_name_f", error, total_error)
+        
+        ! /* Verify creation order of attribute */
+
+        CALL verifyLogical("H5Aget_info_by_name_f", f_corder_valid, .TRUE., total_error)
+        CALL verify("H5Aget_info_by_name_f", corder, u, total_error)
+
+
+        ! /* Retrieve information for attribute */
+
+        CALL H5Aget_info_by_name_f(my_dataset, ".", attrname, &
+             f_corder_valid, corder, cset, data_size, error) ! without optional
+
+        CALL check("H5Aget_info_by_name_f", error, total_error)
+        
+        ! /* Verify creation order of attribute */
+
+        CALL verifyLogical("H5Aget_info_by_name_f", f_corder_valid, .TRUE., total_error)
+        CALL verify("H5Aget_info_by_name_f", corder, u, total_error)
+
+     END DO
+  END DO
+  !  /* Close Datasets */
+  CALL h5dclose_f(dset1, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5dclose_f(dset2, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5dclose_f(dset3, error)
+  CALL check("h5dclose_f",error,total_error)
+  
+  !   /* Close file */
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+END SUBROUTINE test_attr_corder_create_compact
+
+SUBROUTINE test_attr_null_space(fcpl, fapl, total_error)
+! --------------------------------------------------
+  USE HDF5
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: sid, null_sid
+  INTEGER(HID_T) :: dataset
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  INTEGER, PARAMETER :: NUM_DSETS = 3
+
+
+  INTEGER :: error
+  
+  INTEGER :: value_scalar
+  INTEGER, DIMENSION(1) :: value
+  INTEGER(HID_T) :: attr        !String Attribute identifier 
+  INTEGER(HID_T) :: attr_sid
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+  INTEGER(HSIZE_T) :: storage_size   ! attributes storage requirements .MSB.
+
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute 
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
+  
+  LOGICAL :: equal
+
+  ! test: H5Sextent_equal_f
+  
+
+  data_dims = 0
+
+!  CHARACTER (LEN=NAME_BUF_SIZE) :: attrname
+
+! /* Output message about test being performed */
+  WRITE(*,*) "     - Testing Storing Attributes with 'null' dataspace"
+  ! /* Create file */
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+  CALL check("h5fcreate_f",error,total_error)
+! /* Close file */
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+!!$  empty_filesize = h5_get_file_size(FILENAME)
+!!$  IF (empty_filesize < 0) CALL TestErrPrintf("Line %d: file size wrong!\n"C, __LINE__)
+  ! /* Re-open file */
+  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error)
+  CALL check("h5open_f",error,total_error)
+  ! /* Create dataspace for dataset attributes */
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+  ! /* Create "null" dataspace for attribute */
+  CALL h5screate_f(H5S_NULL_F, null_sid, error)
+  CALL check("h5screate_f",error,total_error)
+  ! /* Create a dataset */
+  CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error)
+  CALL check("h5dcreate_f",error,total_error)
+!!$  dataset = H5Dcreate2(fid, DSET1_NAME, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)
+!!$  CALL CHECK(dataset, FAIL, "H5Dcreate2")
+  ! /* Add attribute with 'null' dataspace */
+
+  ! /* Create attribute */
+  CALL h5acreate_f(dataset, "null attr", H5T_NATIVE_INTEGER, null_sid, attr, error)
+  CALL check("h5acreate_f",error,total_error)
+
+!!$  CALL HDstrcpy(attrname, "null attr")
+!!$  attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, null_sid, H5P_DEFAULT, H5P_DEFAULT)
+  ! /* Try to read data from the attribute */
+  ! /* (shouldn't fail, but should leave buffer alone) */
+  value(1) = 103
+  CALL h5aread_f(attr, H5T_NATIVE_INTEGER, value, data_dims, error)
+  CALL check("h5aread_f",error,total_error)
+  CALL verify("h5aread_f",value(1),103,total_error)
+
+! /* Try to read data from the attribute again but*/
+! /* for a scalar */
+
+  value_scalar = 104
+  data_dims(1) = 1
+  CALL h5aread_f(attr, H5T_NATIVE_INTEGER, value_scalar, data_dims, error)
+  CALL check("h5aread_f",error,total_error)
+  CALL verify("h5aread_f",value_scalar,104,total_error)
+
+  CALL h5aget_space_f(attr, attr_sid, error)
+  CALL check("h5aget_space_f",error,total_error)
+
+  CALL H5Sextent_equal_f(attr_sid, null_sid, equal, error)
+  CALL check("H5Sextent_equal_f",error,total_error)
+  CALL Verifylogical("H5Sextent_equal_f",equal,.TRUE.,total_error)
+  
+
+!!$  ret = H5Sclose(attr_sid)
+!!$  CALL CHECK(ret, FAIL, "H5Sclose")
+
+  CALL h5aget_storage_size_f(attr, storage_size, error)
+  CALL check("h5aget_storage_size_f",error,total_error)
+  CALL VERIFY("h5aget_storage_size_f",INT(storage_size),0,total_error)
+
+  CALL h5aget_info_f(attr, f_corder_valid, corder, cset, data_size,  error)
+  CALL VERIFY("h5aget_info_f",INT(data_size),INT(storage_size),total_error)
+
+
+  CALL h5aclose_f(attr,error)
+  CALL check("h5aclose_f",error,total_error)
+  
+
+!!$  CALL HDstrcpy(attrname, "null attr #2")
+!!$  attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, null_sid, H5P_DEFAULT, H5P_DEFAULT)
+!!$  CALL CHECK(attr, FAIL, "H5Acreate2")
+!!$  value = 23
+!!$  ret = H5Awrite(attr, H5T_NATIVE_UINT, value)
+!!$  CALL CHECK(ret, FAIL, "H5Awrite")
+!!$  CALL VERIFY(value, 23, "H5Awrite")
+!!$  ret = H5Aclose(attr)
+!!$  CALL CHECK(ret, FAIL, "H5Aclose")
+!!$  ret = H5Dclose(dataset)
+!!$  CALL CHECK(ret, FAIL, "H5Dclose")
+!!$  ret = H5Fclose(fid)
+!!$  CALL CHECK(ret, FAIL, "H5Fclose")
+!!$  fid = H5Fopen(FILENAME, H5F_ACC_RDWR, fapl)
+!!$  CALL CHECK(fid, FAIL, "H5Fopen")
+!!$  dataset = H5Dopen2(fid, DSET1_NAME, H5P_DEFAULT)
+!!$  CALL CHECK(dataset, FAIL, "H5Dopen2")
+!!$  CALL HDstrcpy(attrname, "null attr #2")
+!!$  attr = H5Aopen(dataset, attrname, H5P_DEFAULT)
+!!$  CALL CHECK(attr, FAIL, "H5Aopen")
+!!$  value = 23
+!!$  ret = H5Aread(attr, H5T_NATIVE_UINT, value)
+!!$  CALL CHECK(ret, FAIL, "H5Aread")
+!!$  CALL VERIFY(value, 23, "H5Aread")
+!!$  attr_sid = H5Aget_space(attr)
+!!$  CALL CHECK(attr_sid, FAIL, "H5Aget_space")
+!!$  cmp = H5Sextent_equal(attr_sid, null_sid)
+!!$  CALL CHECK(cmp, FAIL, "H5Sextent_equal")
+!!$  CALL VERIFY(cmp, TRUE, "H5Sextent_equal")
+
+  
+  CALL H5Sclose_f(attr_sid, error)
+  CALL check("H5Sclose_f",error,total_error)
+  
+
+!!$  ret = H5Sclose(attr_sid)
+!!$  CALL CHECK(ret, FAIL, "H5Sclose")
+!!$  storage_size = H5Aget_storage_size(attr)
+!!$  CALL VERIFY(storage_size, 0, "H5Aget_storage_size")
+!!$  ret = H5Aget_info(attr, ainfo)
+!!$  CALL CHECK(ret, FAIL, "H5Aget_info")
+!!$  CALL VERIFY(ainfo%data_size, storage_size, "H5Aget_info")
+!!$  ret = H5Aclose(attr)
+!!$  CALL CHECK(ret, FAIL, "H5Aclose")
+!!$  CALL HDstrcpy(attrname, "null attr")
+!!$  attr = H5Aopen(dataset, attrname, H5P_DEFAULT)
+!!$  CALL CHECK(attr, FAIL, "H5Aopen")
+!!$  value = 23
+!!$  ret = H5Awrite(attr, H5T_NATIVE_UINT, value)
+!!$  CALL CHECK(ret, FAIL, "H5Awrite")
+!!$  CALL VERIFY(value, 23, "H5Awrite")
+
+
+!!$  CALL H5Aclose_f(attr, error)
+!!$  CALL check("H5Aclose_f", error,total_error)
+!!$  CALL H5Ddelete_f(fid, DSET1_NAME, H5P_DEFAULT_F, error)
+!!$  CALL check("H5Aclose_f", error,total_error)
+
+  CALL H5Dclose_f(dataset, error)
+  CALL check("H5Dclose_f", error,total_error)
+
+!!$  ret = H5delete(fid, DSET1_NAME, H5P_DEFAULT)
+!!$  CALL CHECK(ret, FAIL, "H5Ldelete")
+
+! TESTING1
+
+  CALL H5Fclose_f(fid, error)
+  CALL check("H5Fclose_f", error,total_error)
+
+  CALL H5Sclose_f(sid, error)
+  CALL check("H5Sclose_f", error,total_error)
+
+  CALL H5Sclose_f(null_sid, error)
+  CALL check("H5Sclose_f", error,total_error)
+
+!!$  filesize = h5_get_file_size(FILENAME)
+!!$  CALL VERIFY(filesize, empty_filesize, "h5_get_file_size")
+
+END SUBROUTINE test_attr_null_space
+
+
+SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error)
+
+  USE HDF5
+
+  IMPLICIT NONE
+
+  INTEGER(SIZE_T), PARAMETER :: NAME_BUF_SIZE = 7
+  LOGICAL :: new_format 
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER :: max_compact,min_dense,u
+  CHARACTER (LEN=NAME_BUF_SIZE) :: attrname
+  CHARACTER(LEN=8) :: dsetname
+
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
+  CHARACTER(LEN=8) :: DSET3_NAME = "Dataset3"
+  INTEGER, PARAMETER :: NUM_DSETS = 3
+
+  INTEGER :: curr_dset
+
+  INTEGER(HID_T) :: dset1, dset2, dset3
+  INTEGER(HID_T) :: my_dataset
+  INTEGER :: error
+
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+
+  CHARACTER(LEN=2) :: chr2
+  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./) 
+  INTEGER :: Input1
+  INTEGER :: i
+
+  data_dims = 0
+
+
+  ! /* Create dataspace for dataset & attributes */
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  ! /* Create dataset creation property list */
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  ! /* Query the attribute creation properties */
+
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+  ! /* Loop over using index for creation order value */
+  DO i = 1, 2
+     ! /* Print appropriate test message */
+     IF(use_index(i))THEN
+        WRITE(*,*) "       - Testing Creating Attributes By Name w/Creation Order Index"
+     ELSE
+        WRITE(*,*) "       - Testing Creating Attributes By Name w/o Creation Order Index"
+     ENDIF
+     ! /* Create file */
+     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+     CALL check("h5fcreate_f",error,total_error)
+
+     ! /* Set attribute creation order tracking & indexing for object */
+     IF(new_format)THEN
+
+        IF(use_index(i))THEN
+           Input1 = H5P_CRT_ORDER_INDEXED_F
+        ELSE
+           Input1 = 0
+        ENDIF
+
+        CALL H5Pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
+        CALL check("H5Pset_attr_creation_order",error,total_error)
+
+     ENDIF
+
+     ! /* Create datasets */
+
+     CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f2",error,total_error)
+     
+     CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f3",error,total_error)
+     
+     CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f4",error,total_error)
+
+
+     ! /* Work on all the datasets */
+
+     DO curr_dset = 0,NUM_DSETS-1
+        SELECT CASE (curr_dset)
+        CASE (0)
+           my_dataset = dset1
+           dsetname = DSET1_NAME
+        CASE (1)
+           my_dataset = dset2
+           dsetname = DSET2_NAME
+        CASE (2)
+           my_dataset = dset3
+           dsetname = DSET3_NAME
+           !     CASE DEFAULT
+           !        CALL HDassert(0.AND."Toomanydatasets!")
+        END SELECT
+
+        ! /* Check on dataset's attribute storage status */
+!!$            is_empty = H5O_is_attr_empty_test(my_dataset);
+!!$            VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
+!!$            is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+
+        !/* Create attributes, up to limit of compact form */
+
+        DO u = 0, max_compact - 1
+           ! /* Create attribute */
+           WRITE(chr2,'(I2.2)') u
+           attrname = 'attr '//chr2
+           CALL H5Acreate_by_name_f(fid, dsetname, attrname, H5T_NATIVE_INTEGER, sid, &
+                attr, error, lapl_id=H5P_DEFAULT_F, acpl_id=H5P_DEFAULT_F, aapl_id=H5P_DEFAULT_F) 
+           CALL check("H5Acreate_by_name_f",error,total_error)
+           
+           ! /* Write data into the attribute */
+
+           data_dims(1) = 1 
+           CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+
+           ! /* Close attribute */
+           CALL h5aclose_f(attr, error)
+           CALL check("h5aclose_f",error,total_error)
+
+           ! /* Verify information for NEW attribute */
+           CALL attr_info_by_idx_check(my_dataset, attrname, INT(u,HSIZE_T), use_index, total_error)
+         !   CALL check("FAILED IN attr_info_by_idx_check",total_error)
+        ENDDO
+
+        ! /* Verify state of object */
+!!$            ret = H5O_num_attrs_test(my_dataset, &nattrs);
+!!$            CHECK(ret, FAIL, "H5O_num_attrs_test");
+!!$            VERIFY(nattrs, max_compact, "H5O_num_attrs_test");
+!!$            is_empty = H5O_is_attr_empty_test(my_dataset);
+!!$            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
+!!$            is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+
+        ! /* Test opening attributes stored compactly */
+
+        CALL attr_open_check(fid, dsetname, my_dataset, u, total_error)
+
+        !    CHECK(ret, FAIL, "attr_open_check");
+     ENDDO
+
+
+     ! /* Work on all the datasets */
+     DO curr_dset = 0,NUM_DSETS-1
+        SELECT CASE (curr_dset)
+        CASE (0)
+           my_dataset = dset1
+           dsetname = DSET1_NAME
+        CASE (1)
+           my_dataset = dset2
+           dsetname = DSET2_NAME
+        CASE (2)
+           my_dataset = dset3
+           dsetname = DSET3_NAME
+!     CASE DEFAULT
+!        CALL HDassert(0.AND."Toomanydatasets!")
+        END SELECT
+        
+        ! /* Create more attributes, to push into dense form */
+        DO u = max_compact, max_compact* 2 - 1
+
+           WRITE(chr2,'(I2.2)') u
+           attrname = 'attr '//chr2
+
+           CALL H5Acreate_by_name_f(fid, dsetname, attrname, H5T_NATIVE_INTEGER, sid, &
+                attr, error, lapl_id=H5P_DEFAULT_F)
+           CALL check("H5Acreate_by_name",error,total_error)
+
+           ! /* Write data into the attribute */
+           data_dims(1) = 1 
+           CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+
+           ! /* Close attribute */
+           CALL h5aclose_f(attr, error)
+           CALL check("h5aclose_f",error,total_error)
+
+           ! /* Verify state of object */
+!!$                if(u >= max_compact) {
+!!$                    is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$                    VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+!!$                } /* end if */
+!!$
+!!$                /* Verify information for new attribute */
+!!$                ret = attr_info_by_idx_check(my_dataset, attrname, (hsize_t)u, use_index);
+!!$                CHECK(ret, FAIL, "attr_info_by_idx_check");
+        ENDDO
+
+        ! /* Verify state of object */
+!!$            ret = H5O_num_attrs_test(my_dataset, &nattrs);
+!!$            CHECK(ret, FAIL, "H5O_num_attrs_test");
+!!$            VERIFY(nattrs, (max_compact * 2), "H5O_num_attrs_test");
+!!$            is_empty = H5O_is_attr_empty_test(my_dataset);
+!!$            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
+!!$            is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+
+!!$            if(new_format) {
+!!$                /* Retrieve & verify # of records in the name & creation order indices */
+!!$                ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
+!!$                CHECK(ret, FAIL, "H5O_attr_dense_info_test");
+!!$                if(use_index)
+!!$                    VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
+!!$                VERIFY(name_count, (max_compact * 2), "H5O_attr_dense_info_test");
+!!$            } /* end if */
+
+!!$            /* Test opening attributes stored compactly */
+!!$            ret = attr_open_check(fid, dsetname, my_dataset, u);
+!!$            CHECK(ret, FAIL, "attr_open_check");
+
+     ENDDO
+
+     ! /* Close Datasets */
+     CALL h5dclose_f(dset1, error)
+     CALL check("h5dclose_f",error,total_error)
+     CALL h5dclose_f(dset2, error)
+     CALL check("h5dclose_f",error,total_error)
+     CALL h5dclose_f(dset3, error)
+     CALL check("h5dclose_f",error,total_error)
+
+
+     ! /* Close file */
+     CALL h5fclose_f(fid, error)
+     CALL check("h5fclose_f",error,total_error)
+  ENDDO
+
+  ! /* Close property list */
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f",error,total_error)
+
+  ! /* Close dataspace */
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+END SUBROUTINE test_attr_create_by_name
+
+
+SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
+
+  USE HDF5
+
+  IMPLICIT NONE
+
+  LOGICAL :: new_format
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
+  CHARACTER(LEN=8) :: DSET3_NAME = "Dataset3"
+  INTEGER, PARAMETER :: NUM_DSETS = 3
+
+  INTEGER :: curr_dset
+
+  INTEGER(HID_T) :: dset1, dset2, dset3
+  INTEGER(HID_T) :: my_dataset
+  INTEGER :: error
+
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute 
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
+  INTEGER(HSIZE_T) :: n
+  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./)
+
+  INTEGER :: max_compact ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=2) :: chr2
+
+  INTEGER :: i, j
+
+  INTEGER, DIMENSION(1) ::  attr_integer_data
+  CHARACTER(LEN=7) :: attrname
+
+  INTEGER(SIZE_T) :: size
+  CHARACTER(LEN=80) :: tmpname
+
+  INTEGER :: Input1
+
+  data_dims = 0
+!!$    htri_t	is_empty;	/* Are there any attributes? */
+!!$    htri_t	is_dense;	/* Are attributes stored densely? */
+!!$    hsize_t     nattrs;         /* Number of attributes on object */
+!!$    hsize_t     name_count;     /* # of records in name index */
+!!$    hsize_t     corder_count;   /* # of records in creation order index */
+!!$    hbool_t     use_index;      /* Use index on creation order values */
+!!$    char	attrname[NAME_BUF_SIZE];    /* Name of attribute */
+!!$    char        tmpname[NAME_BUF_SIZE];     /* Temporary attribute name */
+!!$    unsigned    curr_dset;      /* Current dataset to work on */
+!!$    unsigned    u;              /* Local index variable */
+!!$    herr_t	ret;		/* Generic return value		*/
+
+  ! /* Create dataspace for dataset & attributes */
+  
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+
+  ! /* Create dataset creation property list */
+
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+
+  ! /* Query the attribute creation properties */
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+  !  /* Loop over using index for creation order value */
+    
+  DO i = 1, 2
+
+     ! /* Output message about test being performed */
+     IF(use_index(i))THEN
+        WRITE(*,'(A72)') "       - Testing Querying Attribute Info By Index w/Creation Order Index"
+     ELSE
+        WRITE(*,'(A74)') "       - Testing Querying Attribute Info By Index w/o Creation Order Index"
+     ENDIF
+
+     ! /* Create file */
+     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+     CALL check("h5fcreate_f",error,total_error)
+
+     ! /* Set attribute creation order tracking & indexing for object */
+     IF(new_format)THEN
+        IF(use_index(i))THEN
+           Input1 = H5P_CRT_ORDER_INDEXED_F
+        ELSE
+           Input1 = 0
+        ENDIF
+        CALL H5Pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
+        CALL check("H5Pset_attr_creation_order",error,total_error)
+     ENDIF
+
+     ! /* Create datasets */
+     
+     CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error )
+     CALL check("h5dcreate_f",error,total_error)
+     
+     CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error )
+     CALL check("h5dcreate_f",error,total_error)
+     
+     CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error )
+     CALL check("h5dcreate_f",error,total_error)
+
+     ! /* Work on all the datasets */
+     
+     DO curr_dset = 0,NUM_DSETS-1
+
+        SELECT CASE (curr_dset)
+        CASE (0)
+           my_dataset = dset1
+        CASE (1)
+           my_dataset = dset2
+        CASE (2)
+           my_dataset = dset3
+           !     CASE DEFAULT
+           !        CALL HDassert(0.AND."Toomanydatasets!")
+        END SELECT
+
+        !/* Check on dataset's attribute storage status */
+!!$            is_empty = H5O_is_attr_empty_test(my_dataset);
+!!$            VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
+!!$            is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+
+        ! /* Check for query on non-existant attribute */
+
+        n = 0
+        CALL h5aget_info_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, 0_HSIZE_T, &
+             f_corder_valid, corder, cset, data_size, error, lapl_id=H5P_DEFAULT_F)
+        CALL VERIFY("h5aget_info_by_idx_f",error,-1,total_error)
+        
+        size = 0
+        CALL h5aget_name_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, &
+             0_HSIZE_T, tmpname, size,  error, lapl_id=H5P_DEFAULT_F)
+        CALL VERIFY("h5aget_name_by_idx_f",error,-1,total_error)
+
+
+        ! /* Create attributes, up to limit of compact form */
+
+        DO j = 0, max_compact-1
+           ! /* Create attribute */
+           WRITE(chr2,'(I2.2)') j
+           attrname = 'attr '//chr2
+
+           ! attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
+           ! check with the optional information create2 specs.
+           CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+           
+           ! /* Write data into the attribute */
+
+           attr_integer_data(1) = j
+           data_dims(1) = 1
+           CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+
+           ! /* Close attribute */
+
+           CALL h5aclose_f(attr, error)
+           CALL check("h5aclose_f",error,total_error)
+
+           ! /* Verify information for new attribute */
+              
+           CALL attr_info_by_idx_check(my_dataset, attrname, INT(j,HSIZE_T), use_index(i), total_error )
+          
+           CALL check("attr_info_by_idx_check",error,total_error)
+
+           !CHECK(ret, FAIL, "attr_info_by_idx_check");
+        ENDDO
+
+            ! /* Verify state of object */
+!!$            ret = H5O_num_attrs_test(my_dataset, &nattrs);
+!!$            CHECK(ret, FAIL, "H5O_num_attrs_test");
+!!$            VERIFY(nattrs, max_compact, "H5O_num_attrs_test");
+!!$            is_empty = H5O_is_attr_empty_test(my_dataset);
+!!$            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
+!!$            is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+
+            ! /* Check for out of bound offset queries */
+!!$            ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &ainfo, H5P_DEFAULT);
+!!$            VERIFY(ret, FAIL, "H5Aget_info_by_idx");
+!!$            ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &ainfo, H5P_DEFAULT);
+!!$            VERIFY(ret, FAIL, "H5Aget_info_by_idx");
+!!$            ret = H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
+!!$            VERIFY(ret, FAIL, "H5Aget_name_by_idx");
+!!$
+!!$            /* Create more attributes, to push into dense form */
+!!$            for(; u < (max_compact * 2); u++) {
+!!$                /* Create attribute */
+!!$                sprintf(attrname, "attr %02u", u);
+!!$                attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
+!!$                CHECK(attr, FAIL, "H5Acreate2");
+!!$
+!!$                /* Write data into the attribute */
+!!$                ret = H5Awrite(attr, H5T_NATIVE_UINT, &u);
+!!$                CHECK(ret, FAIL, "H5Awrite");
+!!$
+!!$                /* Close attribute */
+!!$                ret = H5Aclose(attr);
+!!$                CHECK(ret, FAIL, "H5Aclose");
+!!$
+!!$                /* Verify state of object */
+!!$                is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$                VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+!!$
+!!$                /* Verify information for new attribute */
+!!$                ret = attr_info_by_idx_check(my_dataset, attrname, (hsize_t)u, use_index);
+!!$                CHECK(ret, FAIL, "attr_info_by_idx_check");
+!!$            } /* end for */
+!!$
+!!$            /* Verify state of object */
+!!$            ret = H5O_num_attrs_test(my_dataset, &nattrs);
+!!$            CHECK(ret, FAIL, "H5O_num_attrs_test");
+!!$            VERIFY(nattrs, (max_compact * 2), "H5O_num_attrs_test");
+!!$            is_empty = H5O_is_attr_empty_test(my_dataset);
+!!$            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
+!!$            is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+!!$
+!!$            if(new_format) {
+!!$                /* Retrieve & verify # of records in the name & creation order indices */
+!!$                ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
+!!$                CHECK(ret, FAIL, "H5O_attr_dense_info_test");
+!!$                if(use_index)
+!!$                    VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
+!!$                VERIFY(name_count, (max_compact * 2), "H5O_attr_dense_info_test");
+!!$            } /* end if */
+!!$
+!!$            /* Check for out of bound offset queries */
+!!$            ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &ainfo, H5P_DEFAULT);
+!!$            VERIFY(ret, FAIL, "H5Aget_info_by_idx");
+!!$            ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &ainfo, H5P_DEFAULT);
+!!$            VERIFY(ret, FAIL, "H5Aget_info_by_idx");
+!!$            ret = H5Aget_name_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
+!!$            VERIFY(ret, FAIL, "H5Aget_name_by_idx");
+!!$        } /* end for */
+!!$
+
+!!$    } /* end for */
+!!$
+
+     ENDDO
+
+
+     !  /* Close Datasets */
+     CALL h5dclose_f(dset1, error)
+     CALL check("h5dclose_f",error,total_error)
+     CALL h5dclose_f(dset2, error)
+     CALL check("h5dclose_f",error,total_error)
+     CALL h5dclose_f(dset3, error)
+     CALL check("h5dclose_f",error,total_error)
+
+     !   /* Close file */
+     CALL h5fclose_f(fid, error)
+     CALL check("h5fclose_f",error,total_error)
+    
+  END DO
+
+  ! /* Close property list */
+  CALL h5pclose_f(dcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+
+  ! /* Close dataspace */
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+END SUBROUTINE test_attr_info_by_idx
+
+
+SUBROUTINE attr_info_by_idx_check(obj_id, attrname, n, use_index, total_error )
+
+  USE HDF5
+
+  IMPLICIT NONE
+
+  INTEGER :: error, total_error
+
+  INTEGER :: obj_id
+  CHARACTER(LEN=*) :: attrname
+  INTEGER(HSIZE_T) :: n
+  LOGICAL :: use_index
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute 
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
+
+  INTEGER(SIZE_T) :: NAME_BUF_SIZE = 7
+  CHARACTER(LEN=7) :: tmpname
+
+!!$
+!!$  INTEGER :: const
+!!$  INTEGER :: har
+!!$  INTEGER :: attrname
+!!$  INTEGER :: hsize_t
+!!$  INTEGER :: hbool_t
+!!$  INTEGER :: se_index
+!!$  INTEGER :: old_nerrs
+!!$  CHARACTER (LEN=NAME_BUF_SIZE) :: tmpname
+!!$    ainfo
+!!$    ret
+!!$    old_nerrs = GetTestNumErrs()
+
+  ! /* Verify the information for first attribute, in increasing creation order */
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(0,HSIZE_T), &
+       f_corder_valid, corder, cset, data_size, error)
+  
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL verify("h5aget_info_by_idx_f",corder,0,total_error)
+
+  ! /* Verify the information for new attribute, in increasing creation order */
+
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, n, &
+       f_corder_valid, corder, cset, data_size, error)
+
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
+
+  ! /* Verify the name for new link, in increasing creation order */
+
+!!$    CALL HDmemset(tmpname, 0, (size_t))
+
+  CALL h5aget_name_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, &
+       n, tmpname, NAME_BUF_SIZE, error)
+  CALL check("h5aget_name_by_idx_f",error,total_error)
+
+  IF(TRIM(attrname).NE.TRIM(tmpname))THEN
+     error = -1
+  ENDIF
+  CALL VERIFY("h5aget_name_by_idx_f",error,0,total_error)
+  
+  !  /* Don't test "native" order if there is no creation order index, since
+  !   *  there's not a good way to easily predict the attribute's order in the name
+  !   *  index.
+  !   */
+  IF (use_index) THEN
+     !  CALL HDmemset(ainfo, 0, SIZEOF(ainfo)
+     ! /* Verify the information for first attribute, in native creation order */
+     CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_NATIVE_F, INT(0,HSIZE_T), &
+          f_corder_valid, corder, cset, data_size, error)
+     CALL check("h5aget_info_by_idx_f",error,total_error)
+     CALL VERIFY("h5aget_info_by_idx_f",corder,0,total_error)
+
+     ! CALL HDmemset(ainfo, 0, SIZEOF(ainfo)
+
+     ! /* Verify the information for new attribute, in native creation order */
+     CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_NATIVE_F, n, &
+          f_corder_valid, corder, cset, data_size, error)
+     CALL check("h5aget_info_by_idx_f",error,total_error)
+     CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
+
+   ! /* Verify the name for new link, in increasing native order */
+   ! CALL HDmemset(tmpname, 0, (size_t))
+     CALL h5aget_name_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_NATIVE_F, &
+          n, tmpname, NAME_BUF_SIZE, error)
+     CALL check("h5aget_name_by_idx_f",error,total_error)
+     IF(TRIM(attrname).NE.TRIM(tmpname))THEN
+        WRITE(*,*) "ERROR: attribute name size wrong!"
+        error = -1
+     ENDIF
+     CALL VERIFY("h5aget_name_by_idx_f",error,0,total_error)
+  END IF
+
+
+  ! CALL HDmemset(ainfo, 0, SIZEOF(ainfo)
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, n, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL VERIFY("h5aget_info_by_idx_f",corder,0,total_error)
+  
+  ! CALL HDmemset(ainfo, 0, SIZEOF(ainfo)
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, 0_HSIZE_T, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
+!!$    CALL HDmemset(tmpname, 0, (size_t))
+!!$    ret = H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT)
+!!$    CALL CHECK(ret, FAIL, "H5Aget_name_by_idx")
+!!$    IF (HDstrcmp(attrname, tmpname)) CALL TestErrPrintf("Line %d: attribute name size wrong!\n"C, __LINE__)
+!!$    CALL HDmemset(ainfo, 0, SIZEOF(ainfo)
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_INC_F, 0_HSIZE_T, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL VERIFY("h5aget_info_by_idx_f",corder,0,total_error)
+!!$    CALL HDmemset(ainfo, 0, SIZEOF(ainfo)
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_INC_F, n, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
+!!$    CALL HDmemset(tmpname, 0, (size_t))
+!!$    ret = H5Aget_name_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT)
+!!$    CALL CHECK(ret, FAIL, "H5Aget_name_by_idx")
+!!$    IF (HDstrcmp(attrname, tmpname)) CALL TestErrPrintf("Line %d: attribute name size wrong!\n"C, __LINE__)
+!!$    CALL HDmemset(ainfo, 0, SIZEOF(ainfo)
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_DEC_F, n, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL VERIFY("h5aget_info_by_idx_f",corder,0,total_error)
+!!$    CALL HDmemset(ainfo, 0, SIZEOF(ainfo)
+  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_NAME_F, H5_ITER_DEC_F, 0_HSIZE_T, &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("h5aget_info_by_idx_f",error,total_error)
+  CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
+!!$    CALL HDmemset(tmpname, 0, (size_t))
+!!$    ret = H5Aget_name_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT)
+!!$    CALL CHECK(ret, FAIL, "H5Aget_name_by_idx")
+!!$    IF (HDstrcmp(attrname, tmpname)) CALL TestErrPrintf("Line %d: attribute name size wrong!\n"C, __LINE__)
+
+END SUBROUTINE attr_info_by_idx_check
+
+
+SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
+
+!/****************************************************************
+!**
+!**  test_attr_shared_rename(): Test basic H5A (attribute) code.
+!**      Tests renaming shared attributes in "compact" & "dense" storage
+!**
+!****************************************************************/
+
+  USE HDF5
+
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+
+    CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid, big_sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
+  INTEGER, PARAMETER :: NUM_DSETS = 3
+
+
+  INTEGER(HID_T) :: dataset, dataset2
+
+  INTEGER :: error
+
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HID_T) :: attr_tid
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+
+  INTEGER :: max_compact ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=2) :: chr2
+
+
+  INTEGER, DIMENSION(1) ::  attr_integer_data
+  CHARACTER(LEN=7) :: attrname
+  CHARACTER(LEN=11) :: attrname2
+
+  CHARACTER(LEN=1), PARAMETER :: chr1 = '.'
+ 
+  INTEGER :: u
+  INTEGER, PARAMETER :: SPACE1_RANK = 3
+  INTEGER, PARAMETER :: NX = 20
+  INTEGER, PARAMETER :: NY = 5
+  INTEGER, PARAMETER :: NZ = 10
+  INTEGER(HID_T) :: my_fcpl
+
+  CHARACTER(LEN=5), PARAMETER :: TYPE1_NAME = "/Type"
+
+  INTEGER, PARAMETER :: SPACE1_DIM1 = 4
+  INTEGER, PARAMETER :: SPACE1_DIM2 = 8
+  INTEGER, PARAMETER :: SPACE1_DIM3 = 10
+
+
+  INTEGER :: test_shared
+  INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
+  INTEGER     ::   arank = 1                      ! Attribure rank
+
+  ! /* Output message about test being performed */
+  WRITE(*,*) "     - Testing Renaming Shared & Unshared Attributes in Compact & Dense Storage"
+!!$ /* Initialize "big" attribute data */
+!!$  CALL HDmemset(big_value, 1, SIZEOF(big_value)
+
+  ! /* Create dataspace for dataset */
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  ! /* Create "big" dataspace for "large" attributes */
+
+  CALL h5screate_simple_f(arank, adims2, big_sid, error)
+  CALL check("h5screate_simple_f",error,total_error)
+
+  ! /* Loop over type of shared components */
+  DO test_shared = 0, 2
+     ! /* Make copy of file creation property list */
+     CALL H5Pcopy_f(fcpl, my_fcpl, error)
+     CALL check("H5Pcopy",error,total_error)
+
+     ! /* Set up datatype for attributes */
+
+     CALL H5Tcopy_f(H5T_NATIVE_INTEGER, attr_tid, error)
+     CALL check("H5Tcopy",error,total_error)
+
+     ! /* Special setup for each type of shared components */
+
+     IF( test_shared .EQ. 0) THEN
+        ! /* Make attributes > 500 bytes shared */
+        CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,1,error)
+        CALL check("H5Pset_shared_mesg_nindexes_f",error, total_error)
+!!$     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
+        CALL check(" H5Pset_shared_mesg_index_f",error, total_error)
+
+!!$     CHECK_I(ret, "H5Pset_shared_mesg_index");
+     ELSE
+        ! /* Set up copy of file creation property list */
+        CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,3,error)
+!!$
+!!$     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
+!!$ 
+        ! /* Make attributes > 500 bytes shared */
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
+!!$     CHECK_I(ret, "H5Pset_shared_mesg_index");
+!!$ 
+        ! /* Make datatypes & dataspaces > 1 byte shared (i.e. all of them :-) */
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 1, H5O_SHMESG_DTYPE_FLAG_F, 1,error)
+!!$            CHECK_I(ret, "H5Pset_shared_mesg_index");
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 2,  H5O_SHMESG_SDSPACE_FLAG_F, 1,error)
+!!$            CHECK_I(ret, "H5Pset_shared_mesg_index");
+     ENDIF
+
+     ! /* Create file */
+     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, my_fcpl, fapl)
+     CALL check("h5fcreate_f",error,total_error)
+
+     ! /* Close FCPL copy */
+     CALL h5pclose_f(my_fcpl, error)
+     CALL check("h5pclose_f", error, total_error)
+     ! /* Close file */
+     CALL h5fclose_f(fid, error)
+     CALL check("h5fclose_f",error,total_error)
+
+!!$
+!!$        /* Get size of file */
+!!$        empty_filesize = h5_get_file_size(FILENAME);
+!!$        if(empty_filesize < 0)
+!!$            TestErrPrintf("Line %d: file size wrong!\n", __LINE__);
+
+     ! /* Re-open file */
+     CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error,fapl)
+     CALL check("h5open_f",error,total_error)
+     
+     ! /* Commit datatype to file */
+     IF(test_shared.EQ.2) THEN
+        CALL H5Tcommit_f(fid, TYPE1_NAME, attr_tid, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F,error)
+        CALL check("H5Tcommit",error,total_error)
+     ENDIF
+
+     ! /* Set up to query the object creation properties */
+     CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+     CALL check("h5Pcreate_f",error,total_error)
+
+     ! /* Create datasets */
+     CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f",error,total_error)
+     CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dataset2, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f",error,total_error)
+
+     ! /* Check on dataset's message storage status */
+!!$        if(test_shared != 0) {
+!!$            /* Datasets' datatypes can be shared */
+!!$            ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+!!$            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$            VERIFY(mesg_count, 1, "H5F_get_sohm_mesg_count_test");
+!!$
+!!$            /* Datasets' dataspace can be shared */
+!!$            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+!!$            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$            VERIFY(mesg_count, 1, "H5F_get_sohm_mesg_count_test");
+!!$        } /* end if */
+
+     ! /* Retrieve limits for compact/dense attribute storage */
+     CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+     CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+     ! /* Close property list */
+     CALL h5pclose_f(dcpl,error)
+     CALL check("h5pclose_f", error, total_error)
+!!$
+!!$
+!!$        /* Check on datasets' attribute storage status */
+!!$        is_dense = H5O_is_attr_dense_test(dataset);
+!!$        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+!!$        is_dense = H5O_is_attr_dense_test(dataset2);
+!!$        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+     ! /* Add attributes to each dataset, until after converting to dense storage */
+     
+
+     DO u = 0, (max_compact * 2) - 1
+
+        ! /* Create attribute name */
+        WRITE(chr2,'(I2.2)') u
+        attrname = 'attr '//chr2
+        
+        ! /* Alternate between creating "small" & "big" attributes */
+ 
+        IF(MOD(u+1,2).EQ.0)THEN
+           ! /* Create "small" attribute on first dataset */
+
+           CALL h5acreate_f(dataset, attrname, attr_tid, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+
+!!$                /* Check that attribute is not shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, FALSE, "H5A_is_shared_test");
+
+           ! /* Write data into the attribute */
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+        ELSE
+           !  Create "big" attribute on first dataset */
+
+           CALL h5acreate_f(dataset, attrname, attr_tid, big_sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+!!$
+           !  Check that attribute is shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, TRUE, "H5A_is_shared_test");
+
+           !  Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 1, "H5A_get_shared_rc_test");
+!!$
+           !  Write data into the attribute */
+
+           data_dims(1) = 1
+           attr_integer_data(1) = u + 1
+           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+           
+           !  Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 1, "H5A_get_shared_rc_test");
+        ENDIF
+  
+        ! /* Close attribute */
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+        ! /* Check on dataset's attribute storage status */
+!!$            is_dense = H5O_is_attr_dense_test(dataset);
+!!$            if(u < max_compact)
+!!$                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+!!$            else
+!!$                VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+!!$
+!!$
+        ! /* Alternate between creating "small" & "big" attributes */
+        IF(MOD(u+1,2).EQ.0)THEN
+
+           !  /* Create "small" attribute on second dataset */
+
+           CALL h5acreate_f(dataset2, attrname, attr_tid, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+
+           !  /* Check that attribute is not shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, FALSE, "H5A_is_shared_test");
+!!$
+           ! /* Write data into the attribute */
+           
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+        ELSE
+
+           ! /* Create "big" attribute on second dataset */
+           
+           CALL h5acreate_f(dataset2, attrname, attr_tid, big_sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+
+! /* Check that attribute is shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, TRUE, "H5A_is_shared_test");
+!!$
+! /* Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 1, "H5A_get_shared_rc_test");
+!!$
+! /* Write data into the attribute */
+
+           
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+!           CALL h5awrite_f(attr,  attr_tid, attr_integer_data, data_dims, error)
+!           CALL check("h5awrite_f",error,total_error)
+
+
+! /* Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 2, "H5A_get_shared_rc_test");
+
+        ENDIF
+        ! /* Close attribute */
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+        !    /* Check on dataset's attribute storage status */
+!!$            is_dense = H5O_is_attr_dense_test(dataset2);
+!!$            if(u < max_compact)
+!!$                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+!!$            else
+!!$                VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+
+
+        ! /* Create new attribute name */
+        
+        WRITE(chr2,'(I2.2)') u
+        attrname2 = 'new attr '//chr2
+
+
+        ! /* Change second dataset's attribute's name */
+
+        CALL H5Arename_by_name_f(fid, DSET2_NAME, attrname, attrname2, error, lapl_id=H5P_DEFAULT_F)
+        CALL check("H5Arename_by_name_f",error,total_error)
+
+        ! /* Check refcount on attributes now */
+
+        ! /* Check refcount on renamed attribute */
+
+        CALL H5Aopen_f(dataset2, attrname2, attr, error, aapl_id=H5P_DEFAULT_F)
+        CALL check("H5Aopen_f",error,total_error)
+
+!!$
+!!$        IF(MOD(u+1,2).EQ.0)THEN
+!!$           ! /* Check that attribute is not shared */
+!!$           is_shared = H5A_is_shared_test(attr);
+!!$           CALL VERIFY("H5A_is_shared_test", error, -1)
+!!$        ELSE
+!!$                ! /* Check that attribute is shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, TRUE, "H5A_is_shared_test");
+!!$
+!!$                /* Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 1, "H5A_get_shared_rc_test")
+!!$             ENDIF
+
+        ! /* Close attribute */
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+        ! /* Check refcount on original attribute */
+        CALL H5Aopen_f(dataset, attrname, attr, error)
+        CALL check("H5Aopen",error,total_error)
+
+!!$            if(u % 2) {
+!!$                /* Check that attribute is not shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, FALSE, "H5A_is_shared_test");
+!!$            } /* end if */
+!!$            else {
+!!$                /* Check that attribute is shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, TRUE, "H5A_is_shared_test");
+!!$
+!!$                /* Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 1, "H5A_get_shared_rc_test");
+!!$            } /* end else */
+
+        ! /* Close attribute */
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+
+        ! /* Change second dataset's attribute's name back to original */
+        
+        CALL H5Arename_by_name_f(fid, DSET2_NAME, attrname2, attrname, error)
+        CALL check("H5Arename_by_name_f",error,total_error)
+
+        ! /* Check refcount on attributes now */
+
+        ! /* Check refcount on renamed attribute */
+        CALL H5Aopen_f(dataset2, attrname, attr, error)
+        CALL check("H5Aopen",error,total_error)
+!!$
+!!$            if(u % 2) {
+!!$                /* Check that attribute is not shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, FALSE, "H5A_is_shared_test");
+!!$            } /* end if */
+!!$            else {
+!!$                /* Check that attribute is shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, TRUE, "H5A_is_shared_test");
+!!$
+!!$                /* Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 2, "H5A_get_shared_rc_test");
+!!$            } /* end else */
+
+        ! /* Close attribute */
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+        ! /* Check refcount on original attribute */
+
+        ! /* Check refcount on renamed attribute */
+        CALL H5Aopen_f(dataset, attrname, attr, error)
+        CALL check("H5Aopen",error,total_error)
+
+!!$            if(u % 2) {
+!!$                /* Check that attribute is not shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, FALSE, "H5A_is_shared_test");
+!!$            } /* end if */
+!!$            else {
+!!$                /* Check that attribute is shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, TRUE, "H5A_is_shared_test");
+!!$
+!!$                /* Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 2, "H5A_get_shared_rc_test");
+!!$            } /* end else */
+
+        ! /* Close attribute */
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+     
+     ENDDO
+
+     ! /* Close attribute's datatype */
+     CALL h5tclose_f(attr_tid, error)
+     CALL check("h5tclose_f",error,total_error)
+
+     ! /* Close attribute's datatype */
+     CALL h5dclose_f(dataset, error)
+     CALL check("h5dclose_f",error,total_error)
+     CALL h5dclose_f(dataset2, error)
+     CALL check("h5dclose_f",error,total_error)
+
+!!$        /* Check on shared message status now */
+!!$        if(test_shared != 0) {
+!!$            if(test_shared == 1) {
+!!$                /* Check on datatype storage status */
+!!$                ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+!!$                CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$                VERIFY(mesg_count, 2, "H5F_get_sohm_mesg_count_test");
+!!$            } /* end if */
+!!$
+!!$            /* Check on dataspace storage status */
+!!$            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+!!$            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$            VERIFY(mesg_count, 2, "H5F_get_sohm_mesg_count_test");
+!!$        } /* end if */
+
+     ! /* Unlink datasets with attributes */
+     CALL H5Ldelete_f(fid, DSET1_NAME, error, H5P_DEFAULT_F)
+     CALL check("HLdelete",error,total_error)
+     CALL H5Ldelete_f(fid, DSET2_NAME, error)
+     CALL check("HLdelete",error,total_error)
+
+     !/* Unlink committed datatype */
+     IF(test_shared == 2)THEN
+        CALL H5Ldelete_f(fid, TYPE1_NAME, error)
+        CALL check("HLdelete_f",error,total_error)
+     ENDIF
+
+     ! /* Check on attribute storage status */
+!!$        ret = H5F_get_sohm_mesg_count_test(fid, H5O_ATTR_ID, &mesg_count);
+!!$        CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$        VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+!!$
+!!$        if(test_shared != 0) {
+!!$            /* Check on datatype storage status */
+!!$            ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+!!$            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$            VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+!!$
+!!$            /* Check on dataspace storage status */
+!!$            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+!!$            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$            VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+!!$        } /* end if */
+
+     ! /* Close file */
+     CALL h5fclose_f(fid, error)
+     CALL check("h5fclose_f",error,total_error)
+
+     ! /* Check size of file */
+     !filesize = h5_get_file_size(FILENAME);
+     !VERIFY(filesize, empty_filesize, "h5_get_file_size");
+  ENDDO
+
+  ! /* Close dataspaces */
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+  CALL h5sclose_f(big_sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+END SUBROUTINE test_attr_shared_rename
+
+
+SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
+
+  USE HDF5
+  
+  IMPLICIT NONE
+
+  LOGICAL, INTENT(IN) :: new_format
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
+  CHARACTER(LEN=8) :: DSET3_NAME = "Dataset3"
+  INTEGER, PARAMETER :: NUM_DSETS = 3
+
+  INTEGER :: curr_dset
+
+  INTEGER(HID_T) :: dset1, dset2, dset3
+  INTEGER(HID_T) :: my_dataset
+
+  INTEGER :: error
+
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute 
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
+  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./)
+
+  INTEGER :: max_compact ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=2) :: chr2
+
+  INTEGER :: i
+
+  INTEGER, DIMENSION(1) ::  attr_integer_data
+  CHARACTER(LEN=7) :: attrname
+
+  INTEGER(SIZE_T) :: size
+  CHARACTER(LEN=8) :: tmpname
+  CHARACTER(LEN=1), PARAMETER :: chr1 = '.'
+  
+  INTEGER :: idx_type
+  INTEGER :: order
+  INTEGER :: u 
+  INTEGER :: Input1
+  
+  data_dims = 0
+
+!!$test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
+!!${
+!!$    hid_t	fid;		/* HDF5 File ID			*/
+!!$    hid_t	dset1, dset2, dset3;	/* Dataset IDs			*/
+!!$    hid_t	my_dataset;	/* Current dataset ID		*/
+!!$    hid_t	sid;	        /* Dataspace ID			*/
+!!$    hid_t	attr;	        /* Attribute ID			*/
+!!$    hid_t	dcpl;	        /* Dataset creation property list ID */
+!!$    H5A_info_t  ainfo;          /* Attribute information */
+!!$    unsigned    max_compact;    /* Maximum # of links to store in group compactly */
+!!$    unsigned    min_dense;      /* Minimum # of links to store in group "densely" */
+!!$    htri_t	is_empty;	/* Are there any attributes? */
+!!$    htri_t	is_dense;	/* Are attributes stored densely? */
+!!$    hsize_t     nattrs;         /* Number of attributes on object */
+!!$    hsize_t     name_count;     /* # of records in name index */
+!!$    hsize_t     corder_count;   /* # of records in creation order index */
+!!$    H5_index_t idx_type;        /* Type of index to operate on */
+!!$    H5_iter_order_t order;      /* Order within in the index */
+!!$    hbool_t     use_index;      /* Use index on creation order values */
+!!$    char	attrname[NAME_BUF_SIZE];    /* Name of attribute */
+!!$    char        tmpname[NAME_BUF_SIZE];     /* Temporary attribute name */
+!!$    unsigned    curr_dset;      /* Current dataset to work on */
+!!$    unsigned    u;              /* Local index variable */
+!!$    herr_t	ret;		/* Generic return value		*/
+!!$
+
+  ! /* Create dataspace for dataset & attributes */
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  !    /* Create dataset creation property list */
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  ! /* Query the attribute creation properties */
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+
+  !/* Loop over operating on different indices on link fields */
+  DO idx_type = H5_INDEX_NAME_F, H5_INDEX_CRT_ORDER_F
+
+     ! /* Loop over operating in different orders */
+     DO order = H5_ITER_INC_F, H5_ITER_DEC_F
+        
+        ! /* Loop over using index for creation order value */
+        DO i = 1, 2
+           
+           ! /* Print appropriate test message */
+           IF(idx_type .EQ. H5_INDEX_CRT_ORDER_F)THEN
+              IF(order .EQ. H5_ITER_INC_F) THEN
+                 IF(use_index(i))THEN
+                    WRITE(*,'(A102)') &
+                         "       - Testing Deleting Attribute By Creation Order Index in Increasing Order w/Creation Order Index"
+                 ELSE
+                    WRITE(*,'(A104)') &
+                         "       - Testing Deleting Attribute By Creation Order Index in Increasing Order w/o Creation Order Index"
+                 ENDIF
+              ELSE
+                 IF(use_index(i))THEN
+                    WRITE(*,'(A102)') &
+                         "       - Testing Deleting Attribute By Creation Order Index in Decreasing Order w/Creation Order Index"
+                 ELSE
+                    WRITE(*,'(A104)') &
+                         "       - Testing Deleting Attribute By Creation Order Index in Decreasing Order w/o Creation Order Index"
+                 ENDIF
+              ENDIF
+           ELSE
+              IF(order .EQ. H5_ITER_INC_F)THEN
+                 IF(use_index(i))THEN
+                    WRITE(*,'(7X,A86)')"- Testing Deleting Attribute By Name Index in Increasing Order w/Creation Order Index"
+                 ELSE
+                    WRITE(*,'(7X,A88)')"- Testing Deleting Attribute By Name Index in Increasing Order w/o Creation Order Index"
+                 ENDIF
+              ELSE
+                 IF(use_index(i))THEN
+                    WRITE(*,'(7X,A86)') "- Testing Deleting Attribute By Name Index in Decreasing Order w/Creation Order Index"
+                 ELSE
+                    WRITE(*,'(7X,A88)') "- Testing Deleting Attribute By Name Index in Decreasing Order w/o Creation Order Index"
+                 ENDIF
+              ENDIF
+           ENDIF
+
+           ! /* Create file */
+           CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+           CALL check("h5fcreate_f",error,total_error)
+
+           !  /* Set attribute creation order tracking & indexing for object */
+           IF(new_format)THEN
+
+              IF(use_index(i))THEN
+                 Input1 = H5P_CRT_ORDER_INDEXED_F
+              ELSE
+                 Input1 = 0
+              ENDIF
+
+              CALL H5Pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
+              CALL check("H5Pset_attr_creation_order",error,total_error)
+
+           ENDIF
+
+           ! /* Create datasets */
+           
+           CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error, dcpl )
+           CALL check("h5dcreate_f2",error,total_error)
+           
+           CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error, dcpl )
+           CALL check("h5dcreate_f3",error,total_error)
+           
+           CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error, dcpl )
+           CALL check("h5dcreate_f4",error,total_error)
+           
+           !   /* Work on all the datasets */
+           
+           DO curr_dset = 0,NUM_DSETS-1
+              SELECT CASE (curr_dset)
+              CASE (0)
+                 my_dataset = dset1
+              CASE (1)
+                 my_dataset = dset2
+              CASE (2)
+                 my_dataset = dset3
+                 !     CASE DEFAULT
+                 !        CALL HDassert(0.AND."Toomanydatasets!")
+              END SELECT
+              
+              ! /* Check on dataset's attribute storage status */
+!!$                is_empty = H5O_is_attr_empty_test(my_dataset);
+!!$                VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
+!!$                is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+              
+              ! /* Check for deleting non-existant attribute */
+              CALL H5Adelete_by_idx_f(my_dataset, '.', idx_type, order, 0_HSIZE_T,error, lapl_id=H5P_DEFAULT_F)
+              CALL VERIFY("H5Adelete_by_idx_f",error,-1,total_error)
+              
+              !    /* Create attributes, up to limit of compact form */
+              DO u = 0, max_compact - 1
+                 ! /* Create attribute */
+                 WRITE(chr2,'(I2.2)') u
+                 attrname = 'attr '//chr2
+                 
+                 CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+                 CALL check("h5acreate_f",error,total_error)
+                 
+                 ! /* Write data into the attribute */
+                 attr_integer_data(1) = u
+                 data_dims(1) = 1
+                 CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_integer_data, data_dims, error)
+                 CALL check("h5awrite_f",error,total_error)
+                 
+                 ! /* Close attribute */
+                 CALL h5aclose_f(attr, error)
+                 CALL check("h5aclose_f",error,total_error)
+
+                 ! /* Verify information for new attribute */
+                 CALL attr_info_by_idx_check(my_dataset, attrname, INT(u,HSIZE_T), use_index(i), total_error )
+                 
+              ENDDO
+
+
+              
+              !  /* Verify state of object */
+
+!!$                ret = H5O_num_attrs_test(my_dataset, &nattrs);
+!!$                CHECK(ret, FAIL, "H5O_num_attrs_test");
+!!$                VERIFY(nattrs, max_compact, "H5O_num_attrs_test");
+!!$                is_empty = H5O_is_attr_empty_test(my_dataset);
+!!$                VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
+!!$                is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+
+              !/* Check for out of bound deletions */
+              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(u,HSIZE_T), error, lapl_id=H5P_DEFAULT_F)
+              CALL VERIFY("H5Adelete_by_idx_f",error,-1,total_error)
+               
+           ENDDO
+
+
+           DO curr_dset = 0, NUM_DSETS-1
+              SELECT CASE (curr_dset)
+              CASE (0)
+                 my_dataset = dset1
+              CASE (1)
+                 my_dataset = dset2
+              CASE (2)
+                 my_dataset = dset3
+                 !     CASE DEFAULT
+                 !        CALL HDassert(0.AND."Toomanydatasets!")
+              END SELECT
+              
+              ! /* Delete attributes from compact storage */
+              
+              DO u = 0, max_compact - 2
+                 
+                 ! /* Delete first attribute in appropriate order */
+                 
+                 
+                 CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, 0_HSIZE_T, error)
+                 CALL check("H5Adelete_by_idx_f",error,total_error)
+                 
+
+                 ! /* Verify the attribute information for first attribute in appropriate order */
+                 ! HDmemset(&ainfo, 0, sizeof(ainfo));
+
+                 CALL h5aget_info_by_idx_f(my_dataset, ".", idx_type, order, 0_HSIZE_T, &
+                      f_corder_valid, corder, cset, data_size, error)
+                 
+                 IF(new_format)THEN
+                    IF(order.EQ.H5_ITER_INC_F)THEN
+                       CALL VERIFY("H5Aget_info_by_idx_f",corder,u + 1,total_error)
+                    ENDIF
+                 ELSE
+                    CALL VERIFY("H5Aget_info_by_idx_f",corder, max_compact-(u + 2),total_error)
+                 ENDIF
+                 
+                   ! /* Verify the name for first attribute in appropriate order */
+                   ! HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+
+                 size = 7 ! *CHECK* IF NOT THE SAME SIZE
+                 CALL h5aget_name_by_idx_f(my_dataset, ".", idx_type, order,INT(0,hsize_t), &
+                      tmpname, size, error, lapl_id=H5P_DEFAULT_F)
+                 CALL check('h5aget_name_by_idx_f',error,total_error)
+                 IF(order .EQ. H5_ITER_INC_F)THEN
+                    WRITE(chr2,'(I2.2)') u + 1
+                    attrname = 'attr '//chr2
+                 ELSE
+                    WRITE(chr2,'(I2.2)') max_compact - (u + 2)
+                    attrname = 'attr '//chr2
+                 ENDIF
+                 IF(TRIM(attrname).NE.TRIM(tmpname)) error = -1
+                 CALL VERIFY("h5aget_name_by_idx_f",error,0,total_error)
+              ENDDO
+
+              ! /* Delete last attribute */
+
+              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, 0_HSIZE_T, error)
+              CALL check("H5Adelete_by_idx_f",error,total_error)
+
+                
+              ! /* Verify state of attribute storage (empty) */
+!!$                is_empty = H5O_is_attr_empty_test(my_dataset);
+!!$                VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
+           ENDDO
+
+!   /* Work on all the datasets */
+           
+           DO curr_dset = 0,NUM_DSETS-1
+              SELECT CASE (curr_dset)
+              CASE (0)
+                 my_dataset = dset1
+              CASE (1)
+                 my_dataset = dset2
+              CASE (2)
+                 my_dataset = dset3
+                 !     CASE DEFAULT
+                 !        CALL HDassert(0.AND."Toomanydatasets!")
+              END SELECT
+
+              ! /* Create more attributes, to push into dense form */
+
+              DO u = 0, (max_compact * 2) - 1
+
+                 ! /* Create attribute */
+                 WRITE(chr2,'(I2.2)') u
+                 attrname = 'attr '//chr2
+                 
+                 CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+                 CALL check("h5acreate_f",error,total_error)
+
+
+                 ! /* Write data into the attribute */
+                 attr_integer_data(1) = u
+                 data_dims(1) = 1
+                 CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_integer_data, data_dims, error)
+                 CALL check("h5awrite_f",error,total_error)
+
+                 ! /* Close attribute */
+                 CALL h5aclose_f(attr, error)
+                 CALL check("h5aclose_f",error,total_error)
+
+                 ! /* Verify state of object */
+                 IF(u .GE. max_compact)THEN
+!!$                  is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$                  VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+                 ENDIF
+
+                 ! /* Verify information for new attribute */
+!!$              CALL check("attr_info_by_idx_check",error,total_error)
+              ENDDO
+
+              ! /* Verify state of object */
+!!$                    ret = H5O_num_attrs_test(my_dataset, &nattrs);
+!!$                    CHECK(ret, FAIL, "H5O_num_attrs_test");
+!!$                    VERIFY(nattrs, (max_compact * 2), "H5O_num_attrs_test");
+!!$                    is_empty = H5O_is_attr_empty_test(my_dataset);
+!!$                    VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
+!!$                    is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$                    VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+!!$
+              IF(new_format)THEN
+!!$                 ! /* Retrieve & verify # of records in the name & creation order indices */
+!!$                 ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
+!!$                 CHECK(ret, FAIL, "H5O_attr_dense_info_test");
+!!$                 IF(use_index)
+!!$                 VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
+!!$                 VERIFY(name_count, (max_compact * 2), "H5O_attr_dense_info_test");
+              ENDIF
+
+              ! /* Check for out of bound deletion */
+              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(u,HSIZE_T), error)
+              CALL VERIFY("H5Adelete_by_idx_f",error,-1,total_error)
+           ENDDO
+
+           ! /* Work on all the datasets */
+
+           DO curr_dset = 0,NUM_DSETS-1
+              SELECT CASE (curr_dset)
+              CASE (0)
+                 my_dataset = dset1
+              CASE (1)
+                 my_dataset = dset2
+              CASE (2)
+                 my_dataset = dset3
+                 !     CASE DEFAULT
+                 !        CALL HDassert(0.AND."Toomanydatasets!")
+              END SELECT
+
+              ! /* Delete attributes from dense storage */
+
+              DO u = 0, (max_compact * 2) - 1 - 1
+
+                 ! /* Delete first attribute in appropriate order */
+
+                 CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), error)
+                 CALL check("H5Adelete_by_idx_f",error,total_error)
+
+
+                 ! /* Verify the attribute information for first attribute in appropriate order */
+!!$                        HDmemset(&ainfo, 0, sizeof(ainfo));
+
+                 
+                 CALL h5aget_info_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), &
+                      f_corder_valid, corder, cset, data_size, error)
+
+                                  
+                 IF(new_format)THEN
+                    IF(order.EQ.H5_ITER_INC_F)THEN
+                       CALL VERIFY("H5Aget_info_by_idx_f",corder,u + 1,total_error)
+                    ENDIF
+                 ELSE
+                    CALL VERIFY("H5Aget_info_by_idx_f",corder, ((max_compact * 2) - (u + 2)), total_error)
+                 ENDIF
+
+
+                 ! /* Verify the name for first attribute in appropriate order */
+                 ! HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+
+                 size = 7 ! *CHECK* if not the correct size 
+                 CALL h5aget_name_by_idx_f(my_dataset, ".", idx_type, order,INT(0,hsize_t), &
+                      tmpname, size, error)
+
+                 IF(order .EQ. H5_ITER_INC_F)THEN
+                    WRITE(chr2,'(I2.2)') u + 1
+                    attrname = 'attr '//chr2
+                 ELSE
+                    WRITE(chr2,'(I2.2)') max_compact * 2 - (u + 2) 
+                    attrname = 'attr '//chr2
+                 ENDIF
+                 IF(TRIM(attrname).NE.TRIM(tmpname)) error = -1
+                 CALL VERIFY("h5aget_name_by_idx_f",error,0,total_error)
+                 
+
+              ENDDO
+              ! /* Delete last attribute */
+
+              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), error, lapl_id=H5P_DEFAULT_F)
+              CALL check("H5Adelete_by_idx_f",error,total_error)
+              ! /* Verify state of attribute storage (empty) */
+!!$                    is_empty = H5O_is_attr_empty_test(my_dataset);
+!!$                    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
+
+              !/* Check for deletion on empty attribute storage again */
+              CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), error)
+              CALL VERIFY("H5Adelete_by_idx_f",error,-1,total_error)
+           ENDDO
+
+           
+!!$
+!!$
+!!$                    /* Delete attributes in middle */
+!!$
+!!$
+!!$                /* Work on all the datasets */
+!!$                for(curr_dset = 0; curr_dset < NUM_DSETS; curr_dset++) {
+!!$                    switch(curr_dset) {
+!!$                        case 0:
+!!$                            my_dataset = dset1;
+!!$                            break;
+!!$
+!!$                        case 1:
+!!$                            my_dataset = dset2;
+!!$                            break;
+!!$
+!!$                        case 2:
+!!$                            my_dataset = dset3;
+!!$                            break;
+!!$
+!!$                        default:
+!!$                            HDassert(0 && "Too many datasets!");
+!!$                    } /* end switch */
+!!$
+!!$                    /* Create attributes, to push into dense form */
+!!$                    for(u = 0; u < (max_compact * 2); u++) {
+!!$                        /* Create attribute */
+!!$                        sprintf(attrname, "attr %02u", u);
+!!$                        attr = H5Acreate2(my_dataset, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
+!!$                        CHECK(attr, FAIL, "H5Acreate2");
+!!$
+!!$                        /* Write data into the attribute */
+!!$                        ret = H5Awrite(attr, H5T_NATIVE_UINT, &u);
+!!$                        CHECK(ret, FAIL, "H5Awrite");
+!!$
+!!$                        /* Close attribute */
+!!$                        ret = H5Aclose(attr);
+!!$                        CHECK(ret, FAIL, "H5Aclose");
+!!$
+!!$                        /* Verify state of object */
+!!$                        if(u >= max_compact) {
+!!$                            is_dense = H5O_is_attr_dense_test(my_dataset);
+!!$                            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+!!$                        } /* end if */
+!!$
+!!$                        /* Verify information for new attribute */
+!!$                        ret = attr_info_by_idx_check(my_dataset, attrname, (hsize_t)u, use_index);
+!!$                        CHECK(ret, FAIL, "attr_info_by_idx_check");
+!!$                    } /* end for */
+!!$                } /* end for */
+!!$
+!!$                /* Work on all the datasets */
+!!$                for(curr_dset = 0; curr_dset < NUM_DSETS; curr_dset++) {
+!!$                    switch(curr_dset) {
+!!$                        case 0:
+!!$                            my_dataset = dset1;
+!!$                            break;
+!!$
+!!$                        case 1:
+!!$                            my_dataset = dset2;
+!!$                            break;
+!!$
+!!$                        case 2:
+!!$                            my_dataset = dset3;
+!!$                            break;
+!!$
+!!$                        default:
+!!$                            HDassert(0 && "Too many datasets!");
+!!$                    } /* end switch */
+!!$
+!!$                    /* Delete every other attribute from dense storage, in appropriate order */
+!!$                    for(u = 0; u < max_compact; u++) {
+!!$                        /* Delete attribute */
+!!$                        ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
+!!$                        CHECK(ret, FAIL, "H5Adelete_by_idx");
+!!$
+!!$                        /* Verify the attribute information for first attribute in appropriate order */
+!!$                        HDmemset(&ainfo, 0, sizeof(ainfo));
+!!$                        ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, &ainfo, H5P_DEFAULT);
+!!$                        if(new_format) {
+!!$                            if(order == H5_ITER_INC) {
+!!$                                VERIFY(ainfo.corder, ((u * 2) + 1), "H5Aget_info_by_idx");
+!!$                            } /* end if */
+!!$                            else {
+!!$                                VERIFY(ainfo.corder, ((max_compact * 2) - ((u * 2) + 2)), "H5Aget_info_by_idx");
+!!$                            } /* end else */
+!!$                        } /* end if */
+!!$
+!!$                        /* Verify the name for first attribute in appropriate order */
+!!$                        HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+!!$                        ret = H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
+!!$                        if(order == H5_ITER_INC)
+!!$                            sprintf(attrname, "attr %02u", ((u * 2) + 1));
+!!$                        else
+!!$                            sprintf(attrname, "attr %02u", ((max_compact * 2) - ((u * 2) + 2)));
+!!$                        ret = HDstrcmp(attrname, tmpname);
+!!$                        VERIFY(ret, 0, "H5Aget_name_by_idx");
+!!$                    } /* end for */
+!!$                } /* end for */
+!!$
+!!$                /* Work on all the datasets */
+!!$                for(curr_dset = 0; curr_dset < NUM_DSETS; curr_dset++) {
+!!$                    switch(curr_dset) {
+!!$                        case 0:
+!!$                            my_dataset = dset1;
+!!$                            break;
+!!$
+!!$                        case 1:
+!!$                            my_dataset = dset2;
+!!$                            break;
+!!$
+!!$                        case 2:
+!!$                            my_dataset = dset3;
+!!$                            break;
+!!$
+!!$                        default:
+!!$                            HDassert(0 && "Too many datasets!");
+!!$                    } /* end switch */
+!!$
+!!$                    /* Delete remaining attributes from dense storage, in appropriate order */
+!!$                    for(u = 0; u < (max_compact - 1); u++) {
+!!$                        /* Delete attribute */
+!!$                        ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
+!!$                        CHECK(ret, FAIL, "H5Adelete_by_idx");
+!!$
+!!$                        /* Verify the attribute information for first attribute in appropriate order */
+!!$                        HDmemset(&ainfo, 0, sizeof(ainfo));
+!!$                        ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT);
+!!$                        if(new_format) {
+!!$                            if(order == H5_ITER_INC) {
+!!$                                VERIFY(ainfo.corder, ((u * 2) + 3), "H5Aget_info_by_idx");
+!!$                            } /* end if */
+!!$                            else {
+!!$                                VERIFY(ainfo.corder, ((max_compact * 2) - ((u * 2) + 4)), "H5Aget_info_by_idx");
+!!$                            } /* end else */
+!!$                        } /* end if */
+!!$
+!!$                        /* Verify the name for first attribute in appropriate order */
+!!$                        HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+!!$                        ret = H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
+!!$                        if(order == H5_ITER_INC)
+!!$                            sprintf(attrname, "attr %02u", ((u * 2) + 3));
+!!$                        else
+!!$                            sprintf(attrname, "attr %02u", ((max_compact * 2) - ((u * 2) + 4)));
+!!$                        ret = HDstrcmp(attrname, tmpname);
+!!$                        VERIFY(ret, 0, "H5Aget_name_by_idx");
+!!$                    } /* end for */
+!!$
+!!$                    /* Delete last attribute */
+!!$                    ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
+!!$                    CHECK(ret, FAIL, "H5Adelete_by_idx");
+!!$
+!!$                    /* Verify state of attribute storage (empty) */
+!!$                    is_empty = H5O_is_attr_empty_test(my_dataset);
+!!$                    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
+!!$
+!!$                    /* Check for deletion on empty attribute storage again */
+!!$                    ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
+!!$                    VERIFY(ret, FAIL, "H5Adelete_by_idx");
+!!$                } /* end for */
+
+           !  /* Close Datasets */
+           CALL h5dclose_f(dset1, error)
+           CALL check("h5dclose_f",error,total_error)
+           CALL h5dclose_f(dset2, error)
+           CALL check("h5dclose_f",error,total_error)
+           CALL h5dclose_f(dset3, error)
+           CALL check("h5dclose_f",error,total_error)
+           
+           !   /* Close file */
+           CALL h5fclose_f(fid, error)
+           CALL check("h5fclose_f",error,total_error)
+        ENDDO
+     ENDDO
+  ENDDO
+
+  ! /* Close property list */
+  CALL h5pclose_f(dcpl,error)
+  CALL check("h5pclose_f", error, total_error)
+
+  ! /* Close dataspace */
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+END SUBROUTINE test_attr_delete_by_idx
+
+SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
+
+!/****************************************************************
+!**
+!**  test_attr_shared_delete(): Test basic H5A (attribute) code.
+!**      Tests deleting shared attributes in "compact" & "dense" storage
+!**
+!****************************************************************/
+
+  USE HDF5
+  
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid, big_sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+  CHARACTER(LEN=8) :: DSET2_NAME = "Dataset2"
+  INTEGER, PARAMETER :: NUM_DSETS = 3
+
+
+  INTEGER(HID_T) :: dataset, dataset2
+
+  INTEGER :: error
+
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HID_T) :: attr_tid
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+
+  INTEGER :: max_compact ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=2) :: chr2
+
+  INTEGER, DIMENSION(1) ::  attr_integer_data
+  CHARACTER(LEN=7) :: attrname
+
+  CHARACTER(LEN=1), PARAMETER :: chr1 = '.'
+  
+  INTEGER :: u
+  INTEGER, PARAMETER :: SPACE1_RANK = 3
+  INTEGER, PARAMETER :: NX = 20
+  INTEGER, PARAMETER :: NY = 5
+  INTEGER, PARAMETER :: NZ = 10
+  INTEGER(HID_T) :: my_fcpl
+
+  CHARACTER(LEN=5), PARAMETER :: TYPE1_NAME = "/Type"
+
+  INTEGER :: test_shared
+  INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
+  INTEGER     ::   arank = 1                      ! Attribure rank
+
+  ! /* Output message about test being performed */
+  WRITE(*,*) "     - Testing Deleting Shared & Unshared Attributes in Compact & Dense Storage"
+
+  ! /* Initialize "big" attribute DATA */
+!!$    HDmemset(big_value, 1, sizeof(big_value));
+!!$
+  !    /* Create dataspace for dataset */
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  !/* Create "big" dataspace for "large" attributes */
+
+  CALL h5screate_simple_f(arank, adims2, big_sid, error)
+  CALL check("h5screate_simple_f",error,total_error)
+
+  ! /* Loop over type of shared components */
+
+  DO test_shared = 0, 2
+     
+     ! /* Make copy of file creation property list */
+
+     CALL H5Pcopy_f(fcpl, my_fcpl, error)
+     CALL check("H5Pcopy",error,total_error)
+
+     ! /* Set up datatype for attributes */
+
+     CALL H5Tcopy_f(H5T_NATIVE_INTEGER, attr_tid, error)
+     CALL check("H5Tcopy",error,total_error)
+
+     ! /* Special setup for each type of shared components */
+     IF( test_shared .EQ. 0) THEN
+        ! /* Make attributes > 500 bytes shared */
+        CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,1,error)
+        CALL check("H5Pset_shared_mesg_nindexes_f",error, total_error)
+!!$     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
+        CALL check(" H5Pset_shared_mesg_index_f",error, total_error)
+
+!!$     CHECK_I(ret, "H5Pset_shared_mesg_index");
+     ELSE
+        ! /* Set up copy of file creation property list */
+        CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,3,error)
+!!$
+!!$     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
+!!$ 
+        ! /* Make attributes > 500 bytes shared */
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
+!!$     CHECK_I(ret, "H5Pset_shared_mesg_index");
+!!$ 
+        ! /* Make datatypes & dataspaces > 1 byte shared (i.e. all of them :-) */
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 1, H5O_SHMESG_DTYPE_FLAG_F, 1,error)
+!!$            CHECK_I(ret, "H5Pset_shared_mesg_index");
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 2,  H5O_SHMESG_SDSPACE_FLAG_F, 1,error)
+!!$            CHECK_I(ret, "H5Pset_shared_mesg_index");
+     ENDIF
+
+     ! /* Create file */
+     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, my_fcpl, fapl)
+     CALL check("h5fcreate_f",error,total_error)
+
+     ! /* Close FCPL copy */
+     CALL h5pclose_f(my_fcpl, error)
+     CALL check("h5pclose_f", error, total_error)
+     ! /* Close file */
+     CALL h5fclose_f(fid, error)
+     CALL check("h5fclose_f",error,total_error)
+!!$
+!!$        /* Get size of file */
+!!$        empty_filesize = h5_get_file_size(FILENAME);
+!!$        if(empty_filesize < 0)
+!!$            TestErrPrintf("Line %d: file size wrong!\n", __LINE__);
+
+     ! /* Re-open file */
+     CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error,fapl)
+     CALL check("h5open_f",error,total_error)
+
+     ! /* Commit datatype to file */
+
+     IF(test_shared.EQ.2) THEN
+        CALL H5Tcommit_f(fid, TYPE1_NAME, attr_tid, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F,error)
+        CALL check("H5Tcommit",error,total_error)
+     ENDIF
+
+     ! /* Set up to query the object creation properties */
+     CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+     CALL check("h5Pcreate_f",error,total_error)
+
+     ! /* Create datasets */
+
+     CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f",error,total_error)
+           
+     CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dataset2, error, dcpl_id=dcpl )
+     CALL check("h5dcreate_f",error,total_error)
+
+     ! /* Check on dataset's message storage status */
+!!$        if(test_shared != 0) {
+!!$            /* Datasets' datatypes can be shared */
+!!$            ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+!!$            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$            VERIFY(mesg_count, 1, "H5F_get_sohm_mesg_count_test");
+!!$
+!!$            /* Datasets' dataspace can be shared */
+!!$            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+!!$            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$            VERIFY(mesg_count, 1, "H5F_get_sohm_mesg_count_test");
+!!$        } /* end if */
+!!$
+     ! /* Retrieve limits for compact/dense attribute storage */
+     CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+     CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+     ! /* Close property list */
+     CALL h5pclose_f(dcpl,error)
+     CALL check("h5pclose_f", error, total_error)
+!!$
+!!$        /* Check on datasets' attribute storage status */
+!!$        is_dense = H5O_is_attr_dense_test(dataset);
+!!$        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+!!$        is_dense = H5O_is_attr_dense_test(dataset2);
+!!$        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+!!$
+     ! /* Add attributes to each dataset, until after converting to dense storage */
+     
+     DO u = 0, (max_compact * 2) - 1
+
+        ! /* Create attribute name */
+        WRITE(chr2,'(I2.2)') u
+        attrname = 'attr '//chr2
+        
+        ! /* Alternate between creating "small" & "big" attributes */
+
+        IF(MOD(u+1,2).EQ.0)THEN
+           ! /* Create "small" attribute on first dataset */
+
+           CALL h5acreate_f(dataset, attrname, attr_tid, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+
+!!$                /* Check that attribute is not shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, FALSE, "H5A_is_shared_test");
+
+           ! /* Write data into the attribute */
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+        ELSE
+           !  Create "big" attribute on first dataset */
+
+           CALL h5acreate_f(dataset, attrname, attr_tid, big_sid, attr, error)
+           CALL check("h5acreate_f",error,total_error)
+!!$
+           !  Check that attribute is shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, TRUE, "H5A_is_shared_test");
+
+           !  Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 1, "H5A_get_shared_rc_test");
+!!$
+           !  Write data into the attribute */
+
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+           CALL h5awrite_f(attr,  attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+
+           !  Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 1, "H5A_get_shared_rc_test");
+        ENDIF
+
+        ! /* Close attribute */
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+        ! /* Check on dataset's attribute storage status */
+!!$            is_dense = H5O_is_attr_dense_test(dataset);
+!!$            if(u < max_compact)
+!!$                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+!!$            else
+!!$                VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+!!$
+!!$
+        ! /* Alternate between creating "small" & "big" attributes */
+        IF(MOD(u+1,2).EQ.0)THEN
+
+           !  /* Create "small" attribute on second dataset */
+
+           CALL h5acreate_f(dataset2, attrname, attr_tid, sid, attr, error)
+           CALL check("h5acreate_f",error,total_error)
+
+           !  /* Check that attribute is not shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, FALSE, "H5A_is_shared_test");
+!!$
+           ! /* Write data into the attribute */
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+           CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+        ELSE
+
+           ! /* Create "big" attribute on second dataset */
+           
+           CALL h5acreate_f(dataset2, attrname, attr_tid, big_sid, attr, error, acpl_id=H5P_DEFAULT_F, aapl_id=H5P_DEFAULT_F)
+           CALL check("h5acreate_f",error,total_error)
+
+! /* Check that attribute is shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, TRUE, "H5A_is_shared_test");
+!!$
+! /* Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 1, "H5A_get_shared_rc_test");
+!!$
+! /* Write data into the attribute */
+
+           
+           attr_integer_data(1) = u + 1
+           data_dims(1) = 1
+           CALL h5awrite_f(attr,  attr_tid, attr_integer_data, data_dims, error)
+           CALL check("h5awrite_f",error,total_error)
+
+
+! /* Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 2, "H5A_get_shared_rc_test");
+
+        ENDIF
+        ! /* Close attribute */
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+
+        ! /* Check on dataset's attribute storage status */
+!!$            is_dense = H5O_is_attr_dense_test(dataset2);
+!!$            if(u < max_compact)
+!!$                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+!!$            else
+!!$                VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+     ENDDO
+
+     ! /* Delete attributes from second dataset */
+
+     DO u = 0, max_compact*2-1
+
+        ! /* Create attribute name */
+        WRITE(chr2,'(I2.2)') u
+        attrname = 'attr '//chr2
+
+        ! /* Delete second dataset's attribute */
+        CALL H5Adelete_by_name_f(fid, DSET2_NAME, attrname,error,lapl_id=H5P_DEFAULT_F)
+        CALL check("H5Adelete_by_name", error, total_error)
+
+!!$            /* Check refcount on attributes now */
+!!$
+!!$            /* Check refcount on first dataset's attribute */
+
+        CALL h5aopen_f(dataset, attrname, attr, error, aapl_id=H5P_DEFAULT_F)
+        CALL check("h5aopen_f",error,total_error)
+
+!!$
+!!$            if(u % 2) {
+! /* Check that attribute is not shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, FALSE, "H5A_is_shared_test");
+!!$            } /* end if */
+!!$            else {
+!/*  Check that attribute is shared */
+!!$                is_shared = H5A_is_shared_test(attr);
+!!$                VERIFY(is_shared, TRUE, "H5A_is_shared_test");
+!!$
+!/*  Check refcount for attribute */
+!!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
+!!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
+!!$                VERIFY(shared_refcount, 1, "H5A_get_shared_rc_test");
+!!$            } /* end else */
+
+        ! /* Close attribute */
+        CALL h5aclose_f(attr, error)
+        CALL check("h5aclose_f",error,total_error)
+     ENDDO
+
+     ! /* Close attribute's datatype */
+     
+     CALL h5tclose_f(attr_tid, error)
+     CALL check("h5tclose_f",error,total_error)
+
+     ! /* Close Datasets */
+
+     CALL h5dclose_f(dataset, error)
+     CALL check("h5dclose_f",error,total_error)
+     CALL h5dclose_f(dataset2, error)
+     CALL check("h5dclose_f",error,total_error)
+
+     ! /* Check on shared message status now */
+!!$        if(test_shared != 0) {
+!!$            if(test_shared == 1) {
+     ! /*  Check on datatype storage status */
+!!$                ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+!!$                CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$                VERIFY(mesg_count, 2, "H5F_get_sohm_mesg_count_test");
+!!$            } /* end if */
+!!$
+!!$            /* Check on dataspace storage status */
+!!$            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+!!$            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$            VERIFY(mesg_count, 2, "H5F_get_sohm_mesg_count_test");
+!!$        } /* end if */
+!!$
+     ! /* Unlink datasets WITH attributes */
+
+     CALL h5ldelete_f(fid, DSET1_NAME, error, H5P_DEFAULT_F)
+     CALL check("H5Ldelete_f", error, total_error)
+     CALL h5ldelete_f(fid, DSET2_NAME, error)
+     CALL check("H5Ldelete_f", error, total_error)
+
+     ! /* Unlink committed datatype */
+
+     IF( test_shared == 2) THEN
+        CALL h5ldelete_f(fid, TYPE1_NAME, error)
+        CALL check("H5Ldelete_f", error, total_error)
+     ENDIF
+
+     ! /* Check on attribute storage status */
+!!$        ret = H5F_get_sohm_mesg_count_test(fid, H5O_ATTR_ID, &mesg_count);
+!!$        CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$        VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+!!$
+!!$        if(test_shared != 0) {
+!!$            /* Check on datatype storage status */
+!!$            ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+!!$            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$            VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+!!$
+!!$            /* Check on dataspace storage status */
+!!$            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+!!$            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
+!!$            VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+!!$        } /* end if */
+!!$
+
+     ! /* Close file */
+     CALL h5fclose_f(fid, error)
+     CALL check("h5fclose_f",error,total_error)
+!!$
+!!$        /* Check size of file */
+!!$        filesize = h5_get_file_size(FILENAME);
+!!$        VERIFY(filesize, empty_filesize, "h5_get_file_size");
+  ENDDO
+
+  ! /* Close dataspaces */
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+  CALL h5sclose_f(big_sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+END SUBROUTINE test_attr_shared_delete
+
+
+
+SUBROUTINE test_attr_dense_open( fcpl, fapl, total_error)
+
+!/****************************************************************
+!**
+!**  test_attr_dense_open(): Test basic H5A (attribute) code.
+!**      Tests opening attributes in "dense" storage
+!**
+!****************************************************************/
+
+  USE HDF5
+  
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(IN) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+
+  INTEGER :: error
+  INTEGER(HID_T) :: attr        !String Attribute identifier
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+
+  INTEGER :: max_compact ! Maximum # of links to store in group compactly
+  INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
+
+  CHARACTER(LEN=2) :: chr2
+
+
+  CHARACTER(LEN=7) :: attrname
+
+  INTEGER(HID_T) :: dataset
+  INTEGER :: u
+
+  data_dims = 0
+
+  ! /* Output message about test being performed */
+  WRITE(*,*) "     - Testing Opening Attributes in Dense Storage"
+
+  ! /* Create file */
+
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+  CALL check("h5fcreate_f",error,total_error)
+
+  ! /* Close file */
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+
+  ! /* Get size of file */
+!!$    empty_filesize = h5_get_file_size(FILENAME);
+!!$    if(empty_filesize < 0)
+!!$        TestErrPrintf("Line %d: file size wrong!\n", __LINE__);
+
+  ! /* Re-open file */
+  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
+  CALL check("h5open_f",error,total_error)
+
+  ! /* Create dataspace for dataset */
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  ! /* Query the group creation properties */
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  ! /* Enable creation order tracking on attributes, so creation order tests work */
+  CALL H5Pset_attr_creation_order_f(dcpl, H5P_CRT_ORDER_TRACKED_F, error)
+  CALL check("H5Pset_attr_creation_order",error,total_error)
+
+  ! /* Create a dataset */
+     
+  CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, &
+       lcpl_id=H5P_DEFAULT_F, dcpl_id=dcpl, dapl_id=H5P_DEFAULT_F)
+  CALL check("h5dcreate_f",error,total_error)
+
+  ! /* Retrieve limits for compact/dense attribute storage */
+  CALL H5Pget_attr_phase_change_f(dcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_attr_phase_change_f",error,total_error)
+
+  ! /* Close property list */
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f",error,total_error)
+
+  ! /* Check on dataset's attribute storage status */
+  !  is_dense = H5O_is_attr_dense_test(dataset);
+  !  VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+
+  ! /* Add attributes, until just before converting to dense storage */
+
+  DO u = 0, max_compact - 1
+     ! /* Create attribute */
+     WRITE(chr2,'(I2.2)') u
+     attrname = 'attr '//chr2
+
+     CALL h5acreate_f(dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, aapl_id=H5P_DEFAULT_F)
+     CALL check("h5acreate_f",error,total_error)
+
+     ! /* Write data into the attribute */
+
+     data_dims(1) = 1 
+     CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
+     CALL check("h5awrite_f",error,total_error)
+
+     ! /* Close attribute */
+     CALL h5aclose_f(attr, error)
+     CALL check("h5aclose_f",error,total_error)
+
+     ! /* Verify attributes written so far */
+     CALL test_attr_dense_verify(dataset, u, total_error)
+!!$        CHECK(ret, FAIL, "test_attr_dense_verify");
+  ENDDO
+
+  ! /* Check on dataset's attribute storage status */
+!!$    is_dense = H5O_is_attr_dense_test(dataset);
+!!$    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+
+!    /* Add one more attribute, to push into "dense" storage */
+!    /* Create attribute */
+  
+  WRITE(chr2,'(I2.2)') u
+  attrname = 'attr '//chr2
+
+  CALL h5acreate_f(dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, aapl_id=H5P_DEFAULT_F)
+  CALL check("h5acreate_f",error,total_error)
+
+  ! /* Check on dataset's attribute storage status */
+!!$    is_dense = H5O_is_attr_dense_test(dataset);
+!!$    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+
+  
+  ! /* Write data into the attribute */
+  data_dims(1) = 1 
+  CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
+  CALL check("h5awrite_f",error,total_error)
+
+  ! /* Close attribute */
+  CALL h5aclose_f(attr, error)
+  CALL check("h5aclose_f",error,total_error)
+
+
+  ! /* Close dataspace */
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+  ! /* Verify all the attributes written */
+  !  ret = test_attr_dense_verify(dataset, (u + 1));
+  !  CHECK(ret, FAIL, "test_attr_dense_verify");
+
+  ! /* CLOSE Dataset */
+  CALL h5dclose_f(dataset, error)
+  CALL check("h5dclose_f",error,total_error)
+
+  ! /* Unlink dataset with attributes */
+  CALL h5ldelete_f(fid, DSET1_NAME, error, H5P_DEFAULT_F)
+  CALL check("H5Ldelete_f", error, total_error)
+
+  ! /* Close file */
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  ! /* Check size of file */
+  !  filesize = h5_get_file_size(FILENAME);
+  !  VERIFY(filesize, empty_filesize, "h5_get_file_size")
+
+END SUBROUTINE test_attr_dense_open
+
+!/****************************************************************
+!**
+!**  test_attr_dense_verify(): Test basic H5A (attribute) code.
+!**      Verify attributes on object
+!**
+!****************************************************************/
+
+SUBROUTINE test_attr_dense_verify(loc_id, max_attr, total_error)
+
+  USE HDF5
+  
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: loc_id
+  INTEGER, INTENT(IN) :: max_attr
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER(SIZE_T), PARAMETER :: ATTR_NAME_LEN = 8 ! FIX, why if 7 does not work?
+
+  INTEGER :: u
+  CHARACTER(LEN=2) :: chr2
+  CHARACTER(LEN=ATTR_NAME_LEN) :: attrname
+  CHARACTER(LEN=ATTR_NAME_LEN) :: check_name
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+  INTEGER(HID_T) :: attr        !String Attribute identifier 
+  INTEGER :: error
+  INTEGER :: value
+
+  data_dims = 0
+  
+
+    ! /* Retrieve the current # of reported errors */
+    ! old_nerrs = GetTestNumErrs();
+
+    ! /* Re-open all the attributes by name and verify the data */
+
+  DO u = 0, max_attr -1
+
+     ! /* Open attribute */
+     WRITE(chr2,'(I2.2)') u
+     attrname = 'attr '//chr2
+
+     CALL h5aopen_f(loc_id, attrname, attr, error)
+     CALL check("h5aopen_f",error,total_error)
+
+     ! /* Read data from the attribute */
+
+!     value = 103
+     data_dims(1) = 1
+     CALL h5aread_f(attr, H5T_NATIVE_INTEGER, value, data_dims, error)
+
+     CALL CHECK("H5Aread_F", error, total_error)
+     CALL VERIFY("H5Aread_F", value, u, total_error)
+
+     ! /* Close attribute */
+     CALL h5aclose_f(attr, error)
+     CALL check("h5aclose_f",error,total_error)
+  ENDDO
+
+  ! /* Re-open all the attributes by index and verify the data */
+
+  DO u=0, max_attr-1
+
+!     size_t name_len;                /* Length of attribute name */
+!     char check_name[ATTR_NAME_LEN]; /* Buffer for checking attribute names */
+
+     ! /* Open attribute */
+
+     CALL H5Aopen_by_idx_f(loc_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(u,HSIZE_T), &
+          attr, error, aapl_id=H5P_DEFAULT_F)
+
+     ! /* Verify Name */
+     
+     WRITE(chr2,'(I2.2)') u
+     attrname = 'attr '//chr2
+
+     CALL H5Aget_name_f(attr, ATTR_NAME_LEN, check_name, error)
+     CALL check('H5Aget_name',error,total_error)
+     IF(check_name.NE.attrname) THEN
+        WRITE(*,*) 'ERROR: attribute name different: attr_name = ',check_name, ', should be ', attrname
+        total_error = total_error + 1
+     ENDIF
+     ! /* Read data from the attribute */
+     data_dims(1) = 1
+     CALL h5aread_f(attr, H5T_NATIVE_INTEGER, value, data_dims, error)
+     CALL CHECK("H5Aread_f", error, total_error)
+     CALL VERIFY("H5Aread_f", value, u, total_error)
+
+
+     ! /* Close attribute */
+     CALL h5aclose_f(attr, error)
+     CALL check("h5aclose_f",error,total_error)
+  ENDDO
+
+END SUBROUTINE test_attr_dense_verify
+
+!/****************************************************************
+!**
+!**  test_attr_corder_create_empty(): Test basic H5A (attribute) code.
+!**      Tests basic code to create objects with attribute creation order info
+!**
+!****************************************************************/
+
+SUBROUTINE test_attr_corder_create_basic( fcpl, fapl, total_error )
+
+  USE HDF5
+  
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(IN) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: dcpl
+  INTEGER(HID_T) :: sid
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+
+  INTEGER(HID_T) :: dataset
+
+  INTEGER :: error
+
+  INTEGER :: crt_order_flags
+
+  ! /* Output message about test being performed */
+  WRITE(*,*) "     - Testing Basic Code for Attributes with Creation Order Info"
+
+  ! /* Create file */
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+  CALL check("h5fcreate_f",error,total_error)
+
+  ! /* Create dataset creation property list */
+  CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+  
+  ! /* Get creation order indexing on object */
+  CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
+  CALL check("H5Pget_attr_creation_order_f",error,total_error)
+  CALL VERIFY("H5Pget_attr_creation_order_f",crt_order_flags , 0, total_error)
+
+  ! /* Setting invalid combination of a attribute order creation order indexing on should fail */
+  CALL H5Pset_attr_creation_order_f(dcpl, H5P_CRT_ORDER_INDEXED_F, error)
+  CALL VERIFY("H5Pset_attr_creation_order_f",error , -1, total_error)
+  CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
+  CALL check("H5Pget_attr_creation_order_f",error,total_error)
+  CALL VERIFY("H5Pget_attr_creation_order_f",crt_order_flags , 0, total_error)
+
+  ! /* Set attribute creation order tracking & indexing for object */
+  CALL h5pset_attr_creation_order_f(dcpl, IOR(H5P_CRT_ORDER_TRACKED_F, H5P_CRT_ORDER_INDEXED_F), error)
+  CALL check("H5Pset_attr_creation_order_f",error,total_error)
+
+  CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
+  CALL check("H5Pget_attr_creation_order_f",error,total_error)
+  CALL VERIFY("H5Pget_attr_creation_order_f",crt_order_flags , &
+       IOR(H5P_CRT_ORDER_TRACKED_F, H5P_CRT_ORDER_INDEXED_F), total_error)
+
+  ! /* Create dataspace for dataset */
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  ! /* Create a dataset */
+  CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, &
+       lcpl_id=H5P_DEFAULT_F, dapl_id=H5P_DEFAULT_F, dcpl_id=dcpl)
+  CALL check("h5dcreate_f",error,total_error)
+
+  ! /* Close dataspace */
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+  ! /* Check on dataset's attribute storage status */
+!!$    is_empty = H5O_is_attr_empty_test(dataset);
+!!$    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
+!!$    is_dense = H5O_is_attr_dense_test(dataset);
+!!$    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+
+  ! /* Close Dataset */
+  CALL h5dclose_f(dataset, error)
+  CALL check("h5dclose_f",error,total_error)
+
+  ! /* Close property list */
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f",error,total_error)
+
+  ! /* Close file */
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  ! /* Re-open file */
+  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
+  CALL check("h5open_f",error,total_error)
+
+  ! /* Open dataset created */
+  CALL h5dopen_f(fid, DSET1_NAME, dataset, error, H5P_DEFAULT_F )
+  CALL check("h5dopen_f",error,total_error)
+
+  ! /* Check on dataset's attribute storage status */
+!!$    is_empty = H5O_is_attr_empty_test(dataset);
+!!$    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
+!!$    is_dense = H5O_is_attr_dense_test(dataset);
+!!$    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+
+  ! /* Retrieve dataset creation property list for group */
+  CALL H5Dget_create_plist_f(dataset, dcpl, error)
+  CALL check("H5Dget_create_plist_f",error,total_error)
+
+  ! /* Query the attribute creation properties */
+  CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
+  CALL check("H5Pget_attr_creation_order_f",error,total_error)
+  CALL VERIFY("H5Pget_attr_creation_order_f",crt_order_flags , &
+       IOR(H5P_CRT_ORDER_TRACKED_F, H5P_CRT_ORDER_INDEXED_F), total_error )
+
+  ! /* Close property list */
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f",error,total_error)
+  
+  ! /* Close Dataset */
+  CALL h5dclose_f(dataset, error)
+  CALL check("h5dclose_f",error,total_error)
+  
+  ! /* Close file */
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+
+END SUBROUTINE test_attr_corder_create_basic
+
+!/****************************************************************
+!**
+!**  test_attr_basic_write(): Test basic H5A (attribute) code.
+!**      Tests integer attributes on both datasets and groups
+!**
+!****************************************************************/
+
+SUBROUTINE test_attr_basic_write(fapl, total_error)
+
+  USE HDF5
+  
+  IMPLICIT NONE
+
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid1
+  INTEGER(HID_T) :: sid1, sid2
+
+  CHARACTER(LEN=8) :: DSET1_NAME = "Dataset1"
+
+  INTEGER(HID_T) :: dataset
+  INTEGER :: i
+  INTEGER :: error
+
+  INTEGER(HID_T) :: attr,attr2        !String Attribute identifier
+  INTEGER(HID_T) :: group
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+
+  CHARACTER(LEN=25) :: check_name
+  CHARACTER(LEN=18) :: chr_exact_size
+
+  INTEGER, PARAMETER :: SPACE1_RANK = 3
+  INTEGER, PARAMETER :: NX = 20
+  INTEGER, PARAMETER :: NY = 5
+  INTEGER, PARAMETER :: NZ = 10
+!  INTEGER(HSIZE_T), DIMENSION(3) :: dims1 = (/NX,NY,NZ/)
+
+  CHARACTER(LEN=5), PARAMETER ::  ATTR1_NAME="Attr1"
+  INTEGER, PARAMETER :: ATTR1_RANK = 1
+  INTEGER, PARAMETER ::  ATTR1_DIM1 = 3
+  CHARACTER(LEN=7), PARAMETER :: ATTR1A_NAME ="Attr1_a"
+  CHARACTER(LEN=18), PARAMETER :: ATTR_TMP_NAME = "Attr1_a-1234567890"
+! int attr_data1a[ATTR1_DIM1]={256,11945,-22107};
+  INTEGER, DIMENSION(ATTR1_DIM1) :: attr_data1
+  INTEGER, DIMENSION(ATTR1_DIM1) :: attr_data1a
+  INTEGER, DIMENSION(ATTR1_DIM1) :: read_data1
+  INTEGER(HSIZE_T) :: attr_size   ! attributes storage requirements .MSB.
+!  INTEGER :: attr_data1
+  INTEGER(HSIZE_T), DIMENSION(2) :: dims2 = (/4,6/) ! Dataset dimensions
+
+!!!! start
+  INTEGER     ::   rank1 = 2               ! Dataspace1 rank
+  INTEGER(HSIZE_T), DIMENSION(2) :: dims1 = (/4,6/) ! Dataset dimensions
+  INTEGER(HSIZE_T), DIMENSION(2) :: maxdims1 = (/4,6/) ! maximum dimensions
+
+  INTEGER(SIZE_T) :: size
+
+  attr_data1(1) = 258
+  attr_data1(2) = 9987
+  attr_data1(3) = -99890
+  attr_data1a(1) = 258
+  attr_data1a(2) = 1087
+  attr_data1a(3) = -99890
+
+  ! /* Output message about test being performed */
+  WRITE(*,*) "     - Testing Basic Scalar Attribute Writing Functions"
+
+  ! /* Create file */
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid1, error, H5P_DEFAULT_F, fapl)
+  CALL check("h5fcreate_f",error,total_error)
+
+  ! /* Create dataspace for dataset */
+  CALL h5screate_simple_f(rank1, dims1, sid1, error, maxdims1)
+!  CALL h5screate_simple_f(SPACE1_RANK, dims1, sid1, error)
+  CALL check("h5screate_simple_f",error,total_error)
+
+  ! /* Create a dataset */
+!  sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
+  CALL h5dcreate_f(fid1, DSET1_NAME, H5T_NATIVE_CHARACTER, sid1, dataset, error, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F )
+  CALL check("h5dcreate_f",error,total_error)
+
+  ! /* Create dataspace for attribute */
+  CALL h5screate_simple_f(ATTR1_RANK, dims2, sid2, error)
+  CALL check("h5screate_simple_f",error,total_error)
+
+  ! /* Try to create an attribute on the file (should create an attribute on root group) */
+  CALL h5acreate_f(fid1, ATTR1_NAME, H5T_NATIVE_INTEGER, sid2, attr, error, aapl_id=H5P_DEFAULT_F, acpl_id=H5P_DEFAULT_F)
+  CALL check("h5acreate_f",error,total_error)
+
+  !  /* Close attribute */
+  CALL h5aclose_f(attr, error)
+  CALL check("h5aclose_f",error,total_error)
+
+  ! /* Open the root group */
+  CALL H5Gopen_f(fid1, "/", group, error, H5P_DEFAULT_F)
+  CALL check("H5Gopen_f",error,total_error)
+
+  ! /* Open attribute again */  
+  CALL h5aopen_f(group,  ATTR1_NAME, attr, error)
+  CALL check("h5aopen_f",error,total_error)
+
+  ! /* Close attribute */
+  CALL h5aclose_f(attr, error)
+  CALL check("h5aclose_f",error,total_error)
+
+  ! /* Close root group */
+  CALL  H5Gclose_f(group, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  ! /* Create an attribute for the dataset */
+  CALL h5acreate_f(dataset, ATTR1_NAME, H5T_NATIVE_INTEGER, sid2, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+  CALL check("h5acreate_f",error,total_error)
+
+  ! /* Write attribute information */
+  data_dims(1) = 3
+  
+  CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_data1, data_dims, error)
+  CALL check("h5awrite_f",error,total_error)
+
+  ! /* Create an another attribute for the dataset */
+  CALL h5acreate_f(dataset, ATTR1A_NAME, H5T_NATIVE_INTEGER, sid2, attr2, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+  CALL check("h5acreate_f",error,total_error)
+
+  ! /* Write attribute information */
+  CALL h5awrite_f(attr2, H5T_NATIVE_INTEGER, attr_data1a, data_dims, error)
+  CALL check("h5awrite_f",error,total_error)
+
+  ! /* Check storage size for attribute */
+
+  CALL h5aget_storage_size_f(attr, attr_size, error)
+  CALL check("h5aget_storage_size_f",error,total_error)
+  CALL VERIFY("h5aget_storage_size_f", INT(attr_size), 2*HSIZE_T, total_error)
+
+!  attr_size = H5Aget_storage_size(attr);
+!  VERIFY(attr_size, (ATTR1_DIM1 * sizeof(int)), "H5A_get_storage_size");
+
+  ! /* Read attribute information immediately, without closing attribute */
+  CALL h5aread_f(attr, H5T_NATIVE_INTEGER, read_data1, data_dims, error)
+  CALL check("h5aread_f",error,total_error)
+
+
+
+  ! /* Verify values read in */
+  DO i = 1, ATTR1_DIM1
+     CALL VERIFY('h5aread_f',attr_data1(i),read_data1(i), total_error)
+  ENDDO
+
+  ! /* CLOSE attribute */
+  CALL h5aclose_f(attr, error)
+  CALL check("h5aclose_f",error,total_error)
+
+  ! /* Close attribute */
+  CALL h5aclose_f(attr2, error)
+  CALL check("h5aclose_f",error,total_error)
+
+  ! /* change attribute name */
+  CALL H5Arename_f(dataset, ATTR1_NAME, ATTR_TMP_NAME, error)
+  CALL check("H5Arename_f", error, total_error)
+
+  ! /* Open attribute again */
+
+  CALL h5aopen_f(dataset,  ATTR_TMP_NAME, attr, error)
+  CALL check("h5aopen_f",error,total_error)
+
+  ! /* Verify new attribute name */
+  ! Set a deliberately small size
+
+  check_name = '                         ' ! need to initialize or does not pass test
+
+  size = 1
+  CALL H5Aget_name_f(attr, size, check_name, error)
+  CALL check('H5Aget_name',error,total_error)
+
+  ! Now enter with the corrected size
+  IF(error.NE.size)THEN
+     size = error
+     CALL H5Aget_name_f(attr, size, check_name, error)
+     CALL check('H5Aget_name',error,total_error)
+  ENDIF
+
+  IF(TRIM(ADJUSTL(check_name)).NE.TRIM(ADJUSTL(ATTR_TMP_NAME))) THEN
+     PRINT*,'.'//TRIM(check_name)//'.',LEN_TRIM(check_name)
+     PRINT*,'.'//TRIM(ATTR_TMP_NAME)//'.',LEN_TRIM(ATTR_TMP_NAME)
+     WRITE(*,*) 'ERROR: attribute name different: attr_name ='//TRIM(check_name)//'.'
+     WRITE(*,*) '                                 should be ='//TRIM(ATTR_TMP_NAME)//'.'
+     total_error = total_error + 1
+     stop
+  ENDIF
+
+  ! Try with a string buffer that is exactly the correct size
+  size = 18
+  CALL H5Aget_name_f(attr, size, chr_exact_size, error)
+  CALL check('H5Aget_name_f',error,total_error)
+  CALL VerifyString('H5Aget_name_f',chr_exact_size,ATTR_TMP_NAME, total_error)
+
+  ! /* Close attribute */
+  CALL h5aclose_f(attr, error)
+  CALL check("h5aclose_f",error,total_error)
+!!$
+!!$    /* Open the second attribute again */
+!!$    attr2=H5Aopen(dataset, ATTR1A_NAME, H5P_DEFAULT);
+!!$    CHECK(attr, FAIL, "H5Aopen");
+!!$
+!!$    /* Verify new attribute name */
+!!$    attr_name_size = H5Aget_name(attr2, (size_t)0, NULL);
+!!$    CHECK(attr_name_size, FAIL, "H5Aget_name");
+!!$
+!!$    if(attr_name_size>0)
+!!$        attr_name = (char*)HDcalloc((size_t)(attr_name_size+1), sizeof(char));
+!!$
+!!$    ret=(herr_t)H5Aget_name(attr2, (size_t)(attr_name_size+1), attr_name);
+!!$    CHECK(ret, FAIL, "H5Aget_name");
+!!$    ret=HDstrcmp(attr_name, ATTR1A_NAME);
+!!$    VERIFY(ret, 0, "HDstrcmp");
+!!$
+!!$    if(attr_name)
+!!$        HDfree(attr_name);
+!!$
+!!$    /* Read attribute information immediately, without closing attribute */
+!!$    ret=H5Aread(attr2,H5T_NATIVE_INT,read_data1);
+!!$    CHECK(ret, FAIL, "H5Aread");
+!!$
+!!$    /* Verify values read in */
+!!$    for(i=0; i<ATTR1_DIM1; i++)
+!!$        if(attr_data1a[i]!=read_data1[i])
+!!$            TestErrPrintf("%d: attribute data different: attr_data1a[%d]=%d, read_data1[%d]=%d\n",__LINE__,i,attr_data1a[i],i,read_data1[i]);
+!!$
+!!$    /* Close attribute */
+!!$    ret=H5Aclose(attr2);
+!!$    CHECK(ret, FAIL, "H5Aclose");
+
+  CALL h5sclose_f(sid1, error)
+  CALL check("h5sclose_f",error,total_error)
+  CALL h5sclose_f(sid2, error)
+  CALL check("h5sclose_f",error,total_error)
+
+  !/* Close Dataset */
+  CALL h5dclose_f(dataset, error)
+  CALL check("h5dclose_f",error,total_error)
+
+!!$    /* Create group */
+!!$    group = H5Gcreate2(fid1, GROUP1_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+!!$    CHECK(group, FAIL, "H5Gcreate2");
+!!$
+!!$    /* Create dataspace for attribute */
+!!$    sid2 = H5Screate_simple(ATTR2_RANK, dims3, NULL);
+!!$    CHECK(sid2, FAIL, "H5Screate_simple");
+!!$
+!!$    /* Create an attribute for the group */
+!!$    attr = H5Acreate2(group, ATTR2_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT);
+!!$    CHECK(attr, FAIL, "H5Acreate2");
+!!$
+!!$    /* Check storage size for attribute */
+!!$    attr_size = H5Aget_storage_size(attr);
+!!$    VERIFY(attr_size, (ATTR2_DIM1 * ATTR2_DIM2 * sizeof(int)), "H5Aget_storage_size");
+!!$
+!!$    /* Try to create the same attribute again (should fail) */
+!!$    ret = H5Acreate2(group, ATTR2_NAME, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT);
+!!$    VERIFY(ret, FAIL, "H5Acreate2");
+!!$
+!!$    /* Write attribute information */
+!!$    ret = H5Awrite(attr, H5T_NATIVE_INT, attr_data2);
+!!$    CHECK(ret, FAIL, "H5Awrite");
+!!$
+!!$    /* Check storage size for attribute */
+!!$    attr_size = H5Aget_storage_size(attr);
+!!$    VERIFY(attr_size, (ATTR2_DIM1 * ATTR2_DIM2 * sizeof(int)), "H5A_get_storage_size");
+!!$
+!!$    /* Close attribute */
+!!$    ret = H5Aclose(attr);
+!!$    CHECK(ret, FAIL, "H5Aclose");
+!!$
+!!$    /* Close Attribute dataspace */
+!!$    ret = H5Sclose(sid2);
+!!$    CHECK(ret, FAIL, "H5Sclose");
+
+!!$    !/* Close Group */
+!!$    ret = H5Gclose(group);
+!!$    CHECK(ret, FAIL, "H5Gclose");
+
+  ! /* Close file */
+  CALL h5fclose_f(fid1, error)
+  CALL check("h5fclose_f",error,total_error)
+
+END SUBROUTINE test_attr_basic_write
+
+!/****************************************************************
+!**
+!**  test_attr_many(): Test basic H5A (attribute) code.
+!**      Tests storing lots of attributes
+!**
+!****************************************************************/
+
+SUBROUTINE test_attr_many(new_format, fcpl, fapl, total_error)
+
+  USE HDF5
+  
+  IMPLICIT NONE
+
+  LOGICAL, INTENT(IN) :: new_format
+  INTEGER(HID_T), INTENT(IN) :: fcpl
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(IN) :: total_error
+  CHARACTER(LEN=8) :: FileName = "tattr.h5"
+  INTEGER(HID_T) :: fid
+  INTEGER(HID_T) :: sid
+  INTEGER(HID_T) :: gid
+  INTEGER(HID_T) :: aid
+
+
+
+  INTEGER :: error
+
+  INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
+  CHARACTER(LEN=5) :: chr5
+
+
+  CHARACTER(LEN=11) :: attrname
+  CHARACTER(LEN=8), PARAMETER :: GROUP1_NAME="/Group1"
+
+  INTEGER :: u
+  INTEGER :: nattr
+  LOGICAL :: exists
+  INTEGER, DIMENSION(1) ::  attr_data1
+
+  data_dims = 0
+
+  ! /* Output message about test being performed */
+  WRITE(*,*) "     - Testing Storing Many Attributes"
+
+  !/* Create file */
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, fcpl, fapl)
+  CALL check("h5fcreate_f",error,total_error)
+
+  ! /* Create dataspace for attribute */
+  CALL h5screate_f(H5S_SCALAR_F, sid, error)
+  CALL check("h5screate_f",error,total_error)
+
+  ! /* Create group for attributes */
+
+  CALL H5Gcreate_f(fid, GROUP1_NAME, gid, error) 
+  CALL check("H5Gcreate_f", error, total_error)
+
+  ! /* Create many attributes */
+
+  IF(new_format)THEN
+     nattr = 250
+  ELSE
+     nattr = 2
+  ENDIF
+
+  DO u = 0, nattr - 1
+
+     WRITE(chr5,'(I5.5)') u
+     attrname = 'attr '//chr5
+     CALL H5Aexists_f( gid, attrname, exists, error)
+     CALL VerifyLogical("H5Aexists",exists,.FALSE.,total_error )
+
+     CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname,  exists, error, lapl_id = H5P_DEFAULT_F)
+     CALL VerifyLogical("H5Aexists_by_name_f",exists,.FALSE.,total_error )
+
+     CALL h5acreate_f(gid, attrname, H5T_NATIVE_INTEGER, sid, aid, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+     CALL check("h5acreate_f",error,total_error)
+
+     CALL H5Aexists_f(gid, attrname, exists, error)
+     CALL VerifyLogical("H5Aexists",exists,.TRUE.,total_error )
+
+     CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname, exists, error)
+     CALL VerifyLogical("H5Aexists_by_name_f",exists,.TRUE.,total_error )
+
+     attr_data1(1) = u
+     data_dims(1) = 1
+
+     CALL h5awrite_f(aid, H5T_NATIVE_INTEGER, attr_data1, data_dims, error)
+     CALL check("h5awrite_f",error,total_error)
+
+     CALL h5aclose_f(aid, error)
+     CALL check("h5aclose_f",error,total_error)
+
+     CALL H5Aexists_f(gid, attrname, exists, error)
+     CALL VerifyLogical("H5Aexists",exists,.TRUE.,total_error )
+
+     CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname, exists, error)
+     CALL VerifyLogical("H5Aexists_by_name_f",exists,.TRUE.,total_error )
+
+  ENDDO
+
+  ! /* Close group */
+  CALL  H5Gclose_f(gid, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  ! /* Close file */
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+!!$    /* Re-open the file and check on the attributes */
+!!$
+!!$    /* Re-open file */
+!!$    fid = H5Fopen(FILENAME, H5F_ACC_RDONLY, fapl);
+!!$    CHECK(fid, FAIL, "H5Fopen");
+!!$
+!!$    /* Re-open group */
+!!$    gid = H5Gopen2(fid, GROUP1_NAME, H5P_DEFAULT);
+!!$    CHECK(gid, FAIL, "H5Gopen2");
+!!$
+!!$    /* Verify attributes */
+!!$    for(u = 0; u < nattr; u++) {
+!!$        unsigned    value;          /* Attribute value */
+!!$
+!!$        sprintf(attrname, "a-%06u", u);
+!!$
+!!$        exists = H5Aexists(gid, attrname);
+!!$        VERIFY(exists, TRUE, "H5Aexists");
+!!$
+!!$        exists = H5Aexists_by_name(fid, GROUP1_NAME, attrname, H5P_DEFAULT);
+!!$        VERIFY(exists, TRUE, "H5Aexists_by_name");
+!!$
+!!$        aid = H5Aopen(gid, attrname, H5P_DEFAULT);
+!!$        CHECK(aid, FAIL, "H5Aopen");
+!!$
+!!$        exists = H5Aexists(gid, attrname);
+!!$        VERIFY(exists, TRUE, "H5Aexists");
+!!$
+!!$        exists = H5Aexists_by_name(fid, GROUP1_NAME, attrname, H5P_DEFAULT);
+!!$        VERIFY(exists, TRUE, "H5Aexists_by_name");
+!!$
+!!$        ret = H5Aread(aid, H5T_NATIVE_UINT, &value);
+!!$        CHECK(ret, FAIL, "H5Aread");
+!!$        VERIFY(value, u, "H5Aread");
+!!$
+!!$        ret = H5Aclose(aid);
+!!$        CHECK(ret, FAIL, "H5Aclose");
+!!$    } /* end for */
+!!$
+  ! /* Close group */
+!!$  CALL  H5Gclose_f(gid, error)
+!!$  CALL check("h5gclose_f",error,total_error)
+
+  ! /* Close file */
+!!$  CALL h5fclose_f(fid, error)
+!!$  CALL check("h5fclose_f",error,total_error)
+
+!    /* Close dataspaces */
+  CALL h5sclose_f(sid, error)
+  CALL check("h5sclose_f",error,total_error)
+
+END SUBROUTINE test_attr_many
+
+!/*-------------------------------------------------------------------------
+! * Function:    attr_open_check
+! *
+! * Purpose:     Check opening attribute on an object
+! *
+! * Return:      Success:        0
+! *              Failure:        -1
+! *
+! * Programmer:  Quincey Koziol
+! *              Wednesday, February 21, 2007
+! *
+! *-------------------------------------------------------------------------
+! */
+
+SUBROUTINE attr_open_check(fid, dsetname, obj_id, max_attrs, total_error )
+
+  USE HDF5
+  
+  IMPLICIT NONE
+  INTEGER(HID_T), INTENT(IN) :: fid
+  CHARACTER(LEN=*), INTENT(IN) :: dsetname
+  INTEGER(HID_T), INTENT(IN) :: obj_id
+  INTEGER, INTENT(IN) :: max_attrs
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER :: u
+  CHARACTER (LEN=8) :: attrname
+  INTEGER, PARAMETER :: NUM_DSETS = 3
+  INTEGER :: error
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute 
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
+
+  CHARACTER(LEN=2) :: chr2
+  INTEGER(HID_T) attr_id
+  ! /* Open each attribute on object by index and check that it's the correct one */
+
+  DO u = 0, max_attrs-1
+     ! /* Open the attribute */
+
+     WRITE(chr2,'(I2.2)') u
+     attrname = 'attr '//chr2
+     
+     
+     CALL h5aopen_f(obj_id, attrname, attr_id, error)
+     CALL check("h5aopen_f",error,total_error)
+
+
+     ! /* Get the attribute's information */
+     
+     CALL h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  error)
+     CALL check("h5aget_info_f",error,total_error)
+     ! /* Check that the object is the correct one */
+     CALL VERIFY("h5aget_info_f",corder,u,total_error)
+
+     ! /* Close attribute */
+     CALL h5aclose_f(attr_id, error)
+     CALL check("h5aclose_f",error,total_error)
+
+     ! /* Open the attribute */
+
+     CALL H5Aopen_by_name_f(obj_id, ".", attrname, attr_id, error, lapl_id=H5P_DEFAULT_F, aapl_id=H5P_DEFAULT_F)
+     CALL check("H5Aopen_by_name_f", error, total_error)
+
+     CALL h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  error)
+     CALL check("h5aget_info_f",error,total_error)
+     ! /* Get the attribute's information */
+     CALL VERIFY("h5aget_info_f",corder,u,total_error)
+
+
+     ! /* Close attribute */
+     CALL h5aclose_f(attr_id, error)
+     CALL check("h5aclose_f",error,total_error)
+
+
+     ! /* Open the attribute */
+     CALL H5Aopen_by_name_f(fid, dsetname, attrname, attr_id, error)
+     CALL check("H5Aopen_by_name_f", error, total_error)
+
+
+     ! /* Get the attribute's information */
+     CALL h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  error)
+     CALL check("h5aget_info_f",error,total_error)
+
+     ! /* Check that the object is the correct one */
+     CALL VERIFY("h5aget_info_f",corder,u,total_error)
+
+     ! /* Close attribute */
+     CALL h5aclose_f(attr_id, error)
+     CALL check("h5aclose_f",error,total_error)
+  ENDDO
+
+END SUBROUTINE attr_open_check
diff --git a/fortran/test/tH5F.f90 b/fortran/test/tH5F.f90
index 77c5fe8..859d66e 100644
--- a/fortran/test/tH5F.f90
+++ b/fortran/test/tH5F.f90
@@ -697,8 +697,6 @@
           LOGICAL, INTENT(IN) :: cleanup
           INTEGER, INTENT(OUT) :: total_error 
           INTEGER              :: error
-          INTEGER flag 
-          INTEGER :: free_space_out
      
           !
           CHARACTER(LEN=10), PARAMETER :: filename = "file_space"
diff --git a/fortran/test/tH5G.f90 b/fortran/test/tH5G.f90
index 437970f..e0270a9 100644
--- a/fortran/test/tH5G.f90
+++ b/fortran/test/tH5G.f90
@@ -58,7 +58,6 @@
      CHARACTER(LEN=100) :: name !name to put symbolic object
      CHARACTER(LEN=100) :: commentout !comment to the file
      INTEGER     ::   nmembers
-     INTEGER     :: obj_type
      INTEGER(HSIZE_T), DIMENSION(2) :: data_dims 
      !
      ! Create the file.
@@ -82,7 +81,6 @@
      !
      CALL h5gcreate_f(file_id, groupname2, group2_id, error)
      CALL check("h5gcreate_f",error,total_error)
-
      !
      !Create data space for the dataset. 
      !
@@ -135,7 +133,6 @@
      !
      CALL h5glink_f(file_id, H5G_LINK_SOFT_F, dsetname2, linkname4, error)   
      CALL check("h5glink_f",error,total_error)
-
      !
      !close group1
      !
@@ -165,8 +162,6 @@
          write(*,*)  "got nmembers ", nmembers, " is wrong"
          total_error = total_error +1
      end if
-
-
      !
      !Get the name of a symbolic name
      !
diff --git a/fortran/test/tH5G_1_8.f90 b/fortran/test/tH5G_1_8.f90
new file mode 100644
index 0000000..6eee5c2
--- /dev/null
+++ b/fortran/test/tH5G_1_8.f90
@@ -0,0 +1,2823 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!   Copyright by The HDF Group.                                               *
+!   Copyright by the Board of Trustees of the University of Illinois.         *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
+!   of the source code distribution tree; Copyright.html can be found at the  *
+!   root level of an installed copy of the electronic HDF5 document set and   *
+!   is linked from the top-level documents page.  It can also be found at     *
+!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+!   access to either file, you may request a copy from help@hdfgroup.org.     *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!
+SUBROUTINE group_test(cleanup, total_error)
+  USE HDF5 ! This module contains all necessary modules 
+  
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(OUT) :: total_error
+
+  INTEGER(HID_T) :: fapl, fapl2, my_fapl ! /* File access property lists */
+  
+  INTEGER :: error
+
+  CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL check("H5Pcreate_f",error, total_error)
+
+  ! /* Copy the file access property list */
+  CALL H5Pcopy_f(fapl, fapl2, error)
+  CALL check("H5Pcopy_f",error, total_error)
+
+  ! /* Set the "use the latest version of the format" bounds for creating objects in the file */
+  CALL H5Pset_libver_bounds_f(fapl2, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
+  CALL check("H5Pset_libver_bounds_f",error, total_error)
+
+  ! /* Check for FAPL to USE */
+  my_fapl = fapl2
+
+  
+  CALL mklinks(fapl2, total_error)
+  CALL cklinks(fapl2, total_error)
+
+  CALL group_info(cleanup, fapl2,total_error)
+! CALL ud_hard_links(fapl2,total_error)
+  CALL timestamps(cleanup, fapl2, total_error)
+  CALL test_move_preserves(fapl2, total_error)
+  CALL delete_by_idx(cleanup,fapl2, total_error)
+  CALL test_lcpl(cleanup, fapl, total_error)
+
+  CALL objcopy(fapl, total_error)
+
+  CALL lifecycle(cleanup, fapl2, total_error)
+
+  IF(cleanup) CALL h5_cleanup_f("TestLinks", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+
+END SUBROUTINE group_test
+
+!/*-------------------------------------------------------------------------
+! * Function:    group_info
+! *
+! * Purpose:     Create a group with creation order indices and test querying
+! *              group info.
+! *
+! * Return:      Success:        0
+! *              Failure:        -1
+! *
+! * Programmer:  Adapted from C test routines by
+! *              M.S. Breitenfeld
+! *              February 18, 2008
+! *
+! *-------------------------------------------------------------------------
+! */
+
+SUBROUTINE group_info(cleanup, fapl, total_error)
+
+  USE HDF5 ! This module contains all necessary modules 
+  
+  IMPLICIT NONE
+  INTEGER, INTENT(OUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: fapl
+
+  INTEGER(HID_T) :: gcpl_id ! /* Group creation property list ID */
+
+  INTEGER :: max_compact ! /* Maximum # of links to store in group compactly */ 
+  INTEGER :: min_dense ! /* Minimum # of links to store in group "densely" */
+
+  INTEGER :: idx_type ! /* Type of index to operate on */
+  INTEGER :: order, iorder   ! /* Order within in the index */
+  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./) ! /* Use index on creation order values */
+  CHARACTER(LEN=6), PARAMETER :: prefix = 'links0'
+  CHARACTER(LEN=9), PARAMETER :: filename = prefix//'.h5'  ! /* File name */
+  INTEGER :: Input1
+  INTEGER(HID_T) :: group_id ! /* Group ID */
+  INTEGER(HID_T) :: soft_group_id ! /* Group ID for soft links */
+
+  INTEGER :: i ! /* Local index variables */
+  INTEGER :: storage_type ! Type of storage for links in group:
+                                          ! H5G_STORAGE_TYPE_COMPACT: Compact storage
+                                          ! H5G_STORAGE_TYPE_DENSE: Indexed storage
+                                          ! H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
+  INTEGER :: nlinks ! Number of links in group
+  INTEGER :: max_corder ! Current maximum creation order value for group 
+
+  INTEGER :: u,v  ! /* Local index variables */
+  CHARACTER(LEN=2) :: chr2
+  INTEGER(HID_T) :: group_id2, group_id3 ! /* Group IDs */
+  CHARACTER(LEN=7) :: objname ! /* Object name */
+  CHARACTER(LEN=7) :: objname2 ! /* Object name */
+  CHARACTER(LEN=19) :: valname !  /* Link value */
+  CHARACTER(LEN=12), PARAMETER :: CORDER_GROUP_NAME = "corder_group"
+  CHARACTER(LEN=17), PARAMETER :: CORDER_SOFT_GROUP_NAME =  "corder_soft_group"
+  INTEGER(HID_T) :: file_id ! /* File ID */
+  INTEGER :: error ! /* Generic return value */
+
+  LOGICAL :: cleanup
+
+  ! /* Create group creation property list */
+  CALL H5Pcreate_f(H5P_GROUP_CREATE_F, gcpl_id, error )
+  CALL check("H5Pcreate_f", error, total_error)
+
+  ! /* Query the group creation properties */
+  CALL H5Pget_link_phase_change_f(gcpl_id, max_compact, min_dense, error)
+  CALL check("H5Pget_link_phase_change_f", error, total_error)
+
+  ! /* Loop over operating on different indices on link fields */
+  DO idx_type = H5_INDEX_NAME_F, H5_INDEX_CRT_ORDER_F
+     ! /* Loop over operating in different orders */
+     DO iorder = H5_ITER_INC_F,  H5_ITER_NATIVE_F
+        ! /* Loop over using index for creation order value */
+        DO i = 1, 2
+           ! /* Print appropriate test message */
+           IF(idx_type == H5_INDEX_CRT_ORDER_F)THEN
+              IF(iorder == H5_ITER_INC_F)THEN
+                 order = H5_ITER_INC_F
+                 IF(use_index(i))THEN
+                    WRITE(*,'(5x,A)')"query group info by creation order index in increasing order w/creation order index"
+                 ELSE
+                    WRITE(*,'(5x,A)')"query group info by creation order index in increasing order w/o creation order index"
+                 ENDIF
+              ELSE IF (iorder == H5_ITER_DEC_F) THEN
+                 order = H5_ITER_DEC_F
+                 IF(use_index(i))THEN
+                    WRITE(*,'(5x,A)')"query group info by creation order index in decreasing order w/creation order index"
+                 ELSE
+                    WRITE(*,'(5x,A)')"query group info by creation order index in decreasing order w/o creation order index"
+                 ENDIF
+              ELSE
+                 order = H5_ITER_NATIVE_F
+                 IF(use_index(i))THEN
+                    WRITE(*,'(5x,A)')"query group info by creation order index in native order w/creation order index"
+                 ELSE
+                    WRITE(*,'(5x,A)')"query group info by creation order index in native order w/o creation order index"
+                 ENDIF
+              ENDIF
+           ELSE
+              IF(iorder == H5_ITER_INC_F)THEN
+                 order = H5_ITER_INC_F
+                 IF(use_index(i))THEN
+                    WRITE(*,'(5x,A)')"query group info by creation order index in increasing order w/creation order index"
+                 ELSE
+                    WRITE(*,'(5x,A)')"query group info by creation order index in increasing order w/o creation order index"
+                 ENDIF
+              ELSE IF (iorder == H5_ITER_DEC_F) THEN
+                 order = H5_ITER_DEC_F
+                 IF(use_index(i))THEN
+                    WRITE(*,'(5x,A)')"query group info by creation order index in decreasing order w/creation order index"
+                 ELSE
+                    WRITE(*,'(5x,A)')"query group info by creation order index in decreasing order w/o creation order index"
+                 ENDIF
+              ELSE
+                 order = H5_ITER_NATIVE_F
+                 IF(use_index(i))THEN
+                    WRITE(*,'(5x,A)')"query group info by creation order index in native order w/creation order index"
+                 ELSE
+                    WRITE(*,'(5x,A)')"query group info by creation order index in native order w/o creation order index"
+                 ENDIF
+              ENDIF
+           END IF
+
+           ! /* Create file */
+           CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
+           CALL check("H5Fcreate_f", error, total_error)
+
+           ! /* Set creation order tracking & indexing on group */
+           IF(use_index(i))THEN
+              Input1 = H5P_CRT_ORDER_INDEXED_F
+           ELSE
+              Input1 = 0
+           ENDIF
+           CALL H5Pset_link_creation_order_f(gcpl_id, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
+           CALL check("H5Pset_link_creation_order_f", error, total_error)
+
+           ! /* Create group with creation order tracking on */
+           CALL H5Gcreate_f(file_id, CORDER_GROUP_NAME, group_id, error, gcpl_id=gcpl_id)
+           CALL check("H5Gcreate_f", error, total_error)
+
+           ! /* Create group with creation order tracking on for soft links */
+           CALL H5Gcreate_f(file_id, CORDER_SOFT_GROUP_NAME, soft_group_id, error, &
+                OBJECT_NAMELEN_DEFAULT_F, H5P_DEFAULT_F, gcpl_id)
+           CALL check("H5Gcreate_f", error, total_error)
+
+           ! /* Check for out of bound query by index on empty group, should fail */
+           CALL H5Gget_info_by_idx_f(group_id, ".", H5_INDEX_NAME_F, order, INT(0,HSIZE_T), &
+                storage_type, nlinks, max_corder, error)
+           CALL VERIFY("H5Gget_info_by_idx", error, -1, total_error)
+
+           ! /* Create several links, up to limit of compact form */
+           DO u = 0, max_compact-1
+
+              ! /* Make name for link */
+              WRITE(chr2,'(I2.2)') u
+              objname = 'fill '//chr2
+
+              ! /* Create hard link, with group object */
+              CALL H5Gcreate_f(group_id, objname, group_id2, error, OBJECT_NAMELEN_DEFAULT_F, H5P_DEFAULT_F, gcpl_id)
+              CALL check("H5Gcreate_f", error, total_error)
+
+              ! /* Retrieve group's information */
+              CALL H5Gget_info_f(group_id2, storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_f", error, total_error)
+
+              ! /* Check (new/empty) group's information */
+              CALL VERIFY("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL VERIFY("H5Gget_info_f", max_corder, 0, total_error)
+              CALL VERIFY("H5Gget_info_f", nlinks, 0, total_error)
+
+              ! /* Retrieve group's information */
+              CALL H5Gget_info_by_name_f(group_id, objname, storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_by_name", error, total_error)
+
+              ! /* Check (new/empty) group's information */
+              CALL VERIFY("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL VERIFY("H5Gget_info_f", max_corder, 0, total_error)
+              CALL VERIFY("H5Gget_info_f", nlinks, 0, total_error)
+
+              ! /* Retrieve group's information */
+              CALL H5Gget_info_by_name_f(group_id2, ".", storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_by_name", error, total_error)
+
+              ! /* Check (new/empty) group's information */
+              CALL VERIFY("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL VERIFY("H5Gget_info_f", max_corder, 0, total_error)
+              CALL VERIFY("H5Gget_info_f", nlinks, 0, total_error)
+
+              ! /* Create objects in new group created */
+              DO v = 0, u
+                 ! /* Make name for link */
+                 WRITE(chr2,'(I2.2)') v
+                 objname2 = 'fill '//chr2
+
+                 ! /* Create hard link, with group object */
+                 CALL H5Gcreate_f(group_id2, objname2, group_id3, error )
+                 CALL check("H5Gcreate_f", error, total_error)
+
+                 ! /* Close group created */
+                 CALL H5Gclose_f(group_id3, error)
+                 CALL check("H5Gclose_f", error, total_error)
+              ENDDO
+
+              ! /* Retrieve group's information */
+              CALL H5Gget_info_f(group_id2, storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_f", error, total_error)
+
+              ! /* Check (new) group's information */
+              CALL VERIFY("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL VERIFY("H5Gget_info_f", max_corder, u+1, total_error)
+              CALL VERIFY("H5Gget_info_f", nlinks, u+1, total_error)
+
+              ! /* Retrieve group's information */
+              CALL H5Gget_info_by_name_f(group_id, objname, storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_by_name_f", error, total_error)
+
+              ! /* Check (new) group's information */
+              CALL VERIFY("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL VERIFY("H5Gget_info_by_name_f",max_corder, u+1, total_error)
+              CALL VERIFY("H5Gget_info_by_name_f", nlinks, u+1, total_error)
+
+              ! /* Retrieve group's information */
+              CALL H5Gget_info_by_name_f(group_id2, ".", storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_by_name_f", error, total_error)
+
+              ! /* Check (new) group's information */
+              CALL VERIFY("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL VERIFY("H5Gget_info_by_name_f2", max_corder, u+1, total_error)
+              CALL VERIFY("H5Gget_info_by_name_f", nlinks, u+1, total_error)
+
+              ! /* Retrieve group's information */
+              IF(order.NE.H5_ITER_NATIVE_F)THEN
+                 IF(order.EQ.H5_ITER_INC_F) THEN
+                    CALL H5Gget_info_by_idx_f(group_id, ".", idx_type, order, INT(u,HSIZE_T), &
+                         storage_type, nlinks, max_corder, error,lapl_id=H5P_DEFAULT_F)
+                    CALL check("H5Gget_info_by_idx_f", error, total_error)
+                 ELSE
+                    CALL H5Gget_info_by_idx_f(group_id, ".", idx_type, order, INT(0,HSIZE_T), &
+                         storage_type, nlinks, max_corder, error)
+                    CALL check("H5Gget_info_by_idx_f", error, total_error)
+                 ENDIF
+              ! /* Check (new) group's information */
+                 CALL VERIFY("H5Gget_info_by_idx_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+                 CALL VERIFY("H5Gget_info_by_idx_f33", max_corder, u+1, total_error)
+                 CALL VERIFY("H5Gget_info_by_idx_f", nlinks, u+1, total_error)
+              ENDIF
+              ! /* Close group created */
+              CALL H5Gclose_f(group_id2, error)
+              CALL check("H5Gclose_f", error, total_error)
+              
+              ! /* Retrieve main group's information */
+              CALL H5Gget_info_f(group_id, storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_f", error, total_error)
+
+              ! /* Check main group's information */
+              CALL VERIFY("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL VERIFY("H5Gget_info_f2", max_corder, u+1, total_error)
+              CALL VERIFY("H5Gget_info_f", nlinks, u+1, total_error)
+              
+              ! /* Retrieve main group's information, by name */
+              CALL H5Gget_info_by_name_f(file_id, CORDER_GROUP_NAME, storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_by_name_f", error, total_error)
+              
+              ! /* Check main group's information */
+              CALL VERIFY("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL VERIFY("H5Gget_info_by_name_f", max_corder, u+1, total_error)
+              CALL VERIFY("H5Gget_info_by_name_f", nlinks, u+1, total_error)
+
+              ! /* Retrieve main group's information, by name */
+              CALL H5Gget_info_by_name_f(group_id, ".", storage_type, nlinks, max_corder, error, H5P_DEFAULT_F)
+              CALL check("H5Gget_info_by_name_f", error, total_error)
+
+              ! /* Check main group's information */
+              CALL VERIFY("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL VERIFY("H5Gget_info_by_name_f", max_corder, u+1, total_error)
+              CALL VERIFY("H5Gget_info_by_name_f", nlinks, u+1, total_error)
+
+              ! /* Create soft link in another group, to objects in main group */
+              valname = CORDER_GROUP_NAME//objname
+
+              CALL H5Lcreate_soft_f(valname, soft_group_id, objname, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
+              
+              ! /* Retrieve soft link group's information, by name */
+              CALL H5Gget_info_f(soft_group_id, storage_type, nlinks, max_corder, error)
+              CALL check("H5Gget_info_f", error, total_error)
+
+              ! /* Check soft link group's information */
+              CALL VERIFY("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
+              CALL VERIFY("H5Gget_info_f", max_corder, u+1, total_error)
+              CALL VERIFY("H5Gget_info_f", nlinks, u+1, total_error)
+           ENDDO
+
+           ! /* Verify state of group (compact) */
+           ! if(H5G_has_links_test(group_id, NULL) != TRUE) TEST_ERROR
+
+           !/* Check for out of bound query by index */
+           !     H5E_BEGIN_TRY {
+           !         ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &grp_info, H5P_DEFAULT);
+           !     } H5E_END_TRY;
+           !     if(ret >= 0) TEST_ERROR
+
+           ! /* Create more links, to push group into dense form */
+!!$                for(; u < (max_compact * 2); u++) {
+!!$                    hid_t group_id2, group_id3;	        /* Group IDs */
+!!$
+!!$                    /* Make name for link */
+!!$                    sprintf(objname, "filler %02u", u);
+!!$
+!!$                    /* Create hard link, with group object */
+!!$                    if((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR
+!!$
+!!$
+!!$                    /* Retrieve group's information */
+!!$                    if(H5Gget_info(group_id2, &grp_info) < 0) TEST_ERROR
+!!$
+!!$                    /* Check (new/empty) group's information */
+!!$                    if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
+!!$                    if(grp_info.max_corder != 0) TEST_ERROR
+!!$                    if(grp_info.nlinks != 0) TEST_ERROR
+!!$
+!!$                    /* Retrieve group's information, by name */
+!!$                    if(H5Gget_info_by_name(group_id, objname, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                    /* Check (new/empty) group's information */
+!!$                    if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
+!!$                    if(grp_info.max_corder != 0) TEST_ERROR
+!!$                    if(grp_info.nlinks != 0) TEST_ERROR
+!!$
+!!$                    /* Retrieve group's information, by name */
+!!$                    if(H5Gget_info_by_name(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                    /* Check (new/empty) group's information */
+!!$                    if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
+!!$                    if(grp_info.max_corder != 0) TEST_ERROR
+!!$                    if(grp_info.nlinks != 0) TEST_ERROR
+!!$
+!!$
+!!$                    /* Create objects in new group created */
+!!$                    for(v = 0; v <= u; v++) {
+!!$                        /* Make name for link */
+!!$                        sprintf(objname2, "filler %02u", v);
+!!$
+!!$                        /* Create hard link, with group object */
+!!$                        if((group_id3 = H5Gcreate2(group_id2, objname2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+!!$
+!!$                        /* Close group created */
+!!$                        if(H5Gclose(group_id3) < 0) TEST_ERROR
+!!$                    } /* end for */
+!!$
+!!$
+!!$                    /* Retrieve group's information */
+!!$                    if(H5Gget_info(group_id2, &grp_info) < 0) TEST_ERROR
+!!$
+!!$                    /* Check (new) group's information */
+!!$                    if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
+!!$                    if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+!!$                    if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+!!$
+!!$                    /* Retrieve group's information, by name */
+!!$                    if(H5Gget_info_by_name(group_id, objname, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                    /* Check (new) group's information */
+!!$                    if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
+!!$                    if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+!!$                    if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+!!$
+!!$                    /* Retrieve group's information, by name */
+!!$                    if(H5Gget_info_by_name(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                    /* Check (new) group's information */
+!!$                    if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
+!!$                    if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+!!$                    if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+!!$
+!!$
+!!$                    /* Retrieve group's information */
+!!$                    if(order != H5_ITER_NATIVE) {
+!!$                        if(order == H5_ITER_INC) {
+!!$                            if(H5Gget_info_by_idx(group_id, ".", idx_type, order, (hsize_t)u, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+!!$                        } /* end if */
+!!$                        else {
+!!$                            if(H5Gget_info_by_idx(group_id, ".", idx_type, order, (hsize_t)0, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+!!$                        } /* end else */
+!!$
+!!$                        /* Check (new) group's information */
+!!$                        if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
+!!$                        if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+!!$                        if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+!!$                    } /* end if */
+!!$
+!!$                    /* Close group created */
+!!$                    if(H5Gclose(group_id2) < 0) TEST_ERROR
+!!$
+!!$
+!!$                    /* Retrieve main group's information */
+!!$                    if(H5Gget_info(group_id, &grp_info) < 0) TEST_ERROR
+!!$
+!!$                    /* Check main group's information */
+!!$                    if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
+!!$                    if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+!!$                    if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+!!$
+!!$                    /* Retrieve main group's information, by name */
+!!$                    if(H5Gget_info_by_name(file_id, CORDER_GROUP_NAME, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                    /* Check main group's information */
+!!$                    if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
+!!$                    if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+!!$                    if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+!!$
+!!$                    /* Retrieve main group's information, by name */
+!!$                    if(H5Gget_info_by_name(group_id, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                    /* Check main group's information */
+!!$                    if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
+!!$                    if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+!!$                    if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+!!$
+!!$
+!!$                    /* Create soft link in another group, to objects in main group */
+!!$                    sprintf(valname, "/%s/%s", CORDER_GROUP_NAME, objname);
+!!$                    if(H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                    /* Retrieve soft link group's information, by name */
+!!$                    if(H5Gget_info(soft_group_id, &grp_info) < 0) TEST_ERROR
+!!$
+!!$                    /* Check soft link group's information */
+!!$                    if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
+!!$                    if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+!!$                    if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+!!$                } /* end for */
+!!$
+!!$                /* Verify state of group (dense) */
+!!$                if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+!!$
+!!$                /* Check for out of bound query by index */
+!!$                H5E_BEGIN_TRY {
+!!$                    ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &grp_info, H5P_DEFAULT);
+!!$                } H5E_END_TRY;
+!!$                if(ret >= 0) TEST_ERROR
+
+
+           ! /* Close the groups */
+
+              CALL H5Gclose_f(group_id, error)
+              CALL check("H5Gclose_f", error, total_error)
+              CALL H5Gclose_f(soft_group_id, error)
+              CALL check("H5Gclose_f", error, total_error)
+           
+              ! /* Close the file */
+              CALL H5Fclose_f(file_id, error)
+              CALL check("H5Fclose_f", error, total_error)
+           ENDDO
+        ENDDO
+     ENDDO
+
+     ! /* Free resources */
+     CALL H5Pclose_f(gcpl_id, error)
+     CALL check("H5Pclose_f", error, total_error)
+
+     IF(cleanup) CALL h5_cleanup_f(prefix, H5P_DEFAULT_F, error)
+     CALL check("h5_cleanup_f", error, total_error)
+
+
+   END SUBROUTINE group_info
+
+!/*-------------------------------------------------------------------------
+! * Function:    timestamps
+! *
+! * Purpose:     Verify that disabling tracking timestamps for an object
+! *              works correctly
+! *
+! *
+! * Programmer:  M.S. Breitenfeld
+! *              February 20, 2008
+! *
+! *-------------------------------------------------------------------------
+! */
+
+   SUBROUTINE timestamps(cleanup, fapl, total_error)
+
+     USE HDF5 ! This module contains all necessary modules 
+     
+     IMPLICIT NONE
+     INTEGER, INTENT(OUT) :: total_error
+     INTEGER(HID_T), INTENT(IN) :: fapl
+
+     INTEGER(HID_T) :: file_id !/* File ID */
+     INTEGER(HID_T) :: group_id !/* Group ID */
+     INTEGER(HID_T) :: group_id2 !/* Group ID */
+     INTEGER(HID_T) :: gcpl_id !/* Group creation property list ID */
+     INTEGER(HID_T) :: gcpl_id2 !/* Group creation property list ID */
+     
+     CHARACTER(LEN=6), PARAMETER :: prefix = 'links9'
+     CHARACTER(LEN=9), PARAMETER :: filename = prefix//'.h5'  ! /* File name */
+     ! /* Timestamp macros */
+     CHARACTER(LEN=10), PARAMETER :: TIMESTAMP_GROUP_1="timestamp1"
+     CHARACTER(LEN=10), PARAMETER :: TIMESTAMP_GROUP_2="timestamp2"
+     LOGICAL :: track_times
+     LOGICAL :: cleanup
+
+     INTEGER :: error
+
+     ! /* Print test message */
+     WRITE(*,*) "timestamps on objects"
+
+     ! /* Create group creation property list */
+     CALL H5Pcreate_f(H5P_GROUP_CREATE_F, gcpl_id, error )
+     CALL check("H5Pcreate_f", error, total_error)
+
+     ! /* Query the object timestamp setting */
+     CALL H5Pget_obj_track_times_f(gcpl_id, track_times, error)
+     CALL check("H5Pget_obj_track_times_f", error, total_error)
+
+     !/* Check default timestamp information */
+     CALL VerifyLogical("H5Pget_obj_track_times",track_times,.TRUE.,total_error)
+
+     ! /* Set a non-default object timestamp setting */
+     CALL H5Pset_obj_track_times_f(gcpl_id, .FALSE., error)
+     CALL check("H5Pset_obj_track_times_f", error, total_error)
+
+     ! /* Query the object timestamp setting */
+     CALL H5Pget_obj_track_times_f(gcpl_id, track_times, error)
+     CALL check("H5Pget_obj_track_times_f", error, total_error)
+
+     ! /* Check default timestamp information */
+     CALL VerifyLogical("H5Pget_obj_track_times",track_times,.FALSE.,total_error)
+
+     ! /* Create file */
+     !h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
+     
+     CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
+     CALL check("h5fcreate_f",error,total_error)
+
+    ! /* Create group with non-default object timestamp setting */
+     CALL h5gcreate_f(file_id, TIMESTAMP_GROUP_1, group_id, error, &
+          OBJECT_NAMELEN_DEFAULT_F, H5P_DEFAULT_F, gcpl_id, H5P_DEFAULT_F)
+     CALL check("h5fcreate_f",error,total_error)
+
+    ! /* Close the group creation property list */
+     CALL H5Pclose_f(gcpl_id, error)
+     CALL check("H5Pclose_f", error, total_error)
+
+    ! /* Create group with default object timestamp setting */
+     CALL h5gcreate_f(file_id, TIMESTAMP_GROUP_2, group_id2, error, &
+          OBJECT_NAMELEN_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F)
+     CALL check("h5fcreate_f",error,total_error)
+
+    ! /* Retrieve the new groups' creation properties */
+     CALL H5Gget_create_plist_f(group_id, gcpl_id, error)
+     CALL check("H5Gget_create_plist", error, total_error)
+     CALL H5Gget_create_plist_f(group_id2, gcpl_id2, error)
+     CALL check("H5Gget_create_plist", error, total_error)
+
+    ! /* Query & verify the object timestamp settings */
+     CALL H5Pget_obj_track_times_f(gcpl_id, track_times, error)
+     CALL check("H5Pget_obj_track_times_f", error, total_error)
+     CALL VerifyLogical("H5Pget_obj_track_times1",track_times,.FALSE.,total_error)
+     CALL H5Pget_obj_track_times_f(gcpl_id2, track_times, error)
+     CALL check("H5Pget_obj_track_times_f", error, total_error)
+     CALL VerifyLogical("H5Pget_obj_track_times2",track_times,.TRUE.,total_error)
+     
+!    /* Query the object information for each group */
+!    if(H5Oget_info(group_id, &oinfo) < 0) TEST_ERROR
+!    if(H5Oget_info(group_id2, &oinfo2) < 0) TEST_ERROR
+
+!!$    /* Sanity check object information for each group */
+!!$    if(oinfo.atime != 0) TEST_ERROR
+!!$    if(oinfo.mtime != 0) TEST_ERROR
+!!$    if(oinfo.ctime != 0) TEST_ERROR
+!!$    if(oinfo.btime != 0) TEST_ERROR
+!!$    if(oinfo.atime == oinfo2.atime) TEST_ERROR
+!!$    if(oinfo.mtime == oinfo2.mtime) TEST_ERROR
+!!$    if(oinfo.ctime == oinfo2.ctime) TEST_ERROR
+!!$    if(oinfo.btime == oinfo2.btime) TEST_ERROR
+!!$    if((oinfo.hdr.flags & H5O_HDR_STORE_TIMES) != 0) TEST_ERROR
+!!$    if((oinfo2.hdr.flags & H5O_HDR_STORE_TIMES) == 0) TEST_ERROR
+!!$    if(oinfo.hdr.space.total >= oinfo2.hdr.space.total) TEST_ERROR
+!!$    if(oinfo.hdr.space.meta >= oinfo2.hdr.space.meta) TEST_ERROR
+
+     ! /* Close the property lists */
+     CALL H5Pclose_f(gcpl_id, error)
+     CALL check("H5Pclose_f", error, total_error)
+     CALL H5Pclose_f(gcpl_id2, error)
+     CALL check("H5Pclose_f", error, total_error)
+
+     ! /* Close the groups */
+     CALL H5Gclose_f(group_id, error)
+     CALL check("H5Gclose_f", error, total_error)
+     CALL H5Gclose_f(group_id2, error)
+     CALL check("H5Gclose_f", error, total_error)
+
+     !/* Close the file */
+     CALL H5Fclose_f(file_id, error)
+     CALL check("H5Fclose_f", error, total_error)
+
+     !/* Re-open the file */
+
+     CALL h5fopen_f(FileName, H5F_ACC_RDONLY_F, file_id, error, H5P_DEFAULT_F)
+     CALL check("h5fopen_f",error,total_error)
+
+     !/* Open groups */
+     CALL H5Gopen_f(file_id, TIMESTAMP_GROUP_1, group_id, error) ! with no optional param.
+     CALL check("H5Gopen_f", error, total_error)
+     CALL H5Gopen_f(file_id, TIMESTAMP_GROUP_2, group_id2, error, H5P_DEFAULT_F) ! with optional param.
+     CALL check("H5Gopen_f", error, total_error)
+
+    ! /* Retrieve the new groups' creation properties */
+     CALL H5Gget_create_plist_f(group_id, gcpl_id, error)
+     CALL check("H5Gget_create_plist", error, total_error)
+     CALL H5Gget_create_plist_f(group_id2, gcpl_id2, error)
+     CALL check("H5Gget_create_plist", error, total_error)
+
+    ! /* Query & verify the object timestamp settings */
+
+     CALL H5Pget_obj_track_times_f(gcpl_id, track_times, error)
+     CALL check("H5Pget_obj_track_times_f", error, total_error)
+     CALL VerifyLogical("H5Pget_obj_track_times1",track_times,.FALSE.,total_error)
+     CALL H5Pget_obj_track_times_f(gcpl_id2, track_times, error)
+     CALL check("H5Pget_obj_track_times_f", error, total_error)
+     CALL VerifyLogical("H5Pget_obj_track_times2",track_times,.TRUE.,total_error)
+!!$
+!!$    /* Query the object information for each group */
+!!$    if(H5Oget_info(group_id, &oinfo) < 0) TEST_ERROR
+!!$    if(H5Oget_info(group_id2, &oinfo2) < 0) TEST_ERROR
+!!$
+!!$    /* Sanity check object information for each group */
+!!$    if(oinfo.atime != 0) TEST_ERROR
+!!$    if(oinfo.mtime != 0) TEST_ERROR
+!!$    if(oinfo.ctime != 0) TEST_ERROR
+!!$    if(oinfo.btime != 0) TEST_ERROR
+!!$    if(oinfo.atime == oinfo2.atime) TEST_ERROR
+!!$    if(oinfo.mtime == oinfo2.mtime) TEST_ERROR
+!!$    if(oinfo.ctime == oinfo2.ctime) TEST_ERROR
+!!$    if(oinfo.btime == oinfo2.btime) TEST_ERROR
+!!$    if((oinfo.hdr.flags & H5O_HDR_STORE_TIMES) != 0) TEST_ERROR
+!!$    if((oinfo2.hdr.flags & H5O_HDR_STORE_TIMES) == 0) TEST_ERROR
+!!$    if(oinfo.hdr.space.total >= oinfo2.hdr.space.total) TEST_ERROR
+!!$    if(oinfo.hdr.space.meta >= oinfo2.hdr.space.meta) TEST_ERROR
+
+     ! /* Close the property lists */
+     CALL H5Pclose_f(gcpl_id, error)
+     CALL check("H5Pclose_f", error, total_error)
+     CALL H5Pclose_f(gcpl_id2, error)
+     CALL check("H5Pclose_f", error, total_error)
+
+     ! /* Close the groups */
+     CALL H5Gclose_f(group_id, error)
+     CALL check("H5Gclose_f", error, total_error)
+     CALL H5Gclose_f(group_id2, error)
+     CALL check("H5Gclose_f", error, total_error)
+
+     !/* Close the file */
+     CALL H5Fclose_f(file_id, error)
+     CALL check("H5Fclose_f", error, total_error)
+
+     IF(cleanup) CALL h5_cleanup_f(prefix, H5P_DEFAULT_F, error)
+     CALL check("h5_cleanup_f", error, total_error)
+
+
+   END SUBROUTINE timestamps
+
+!/*-------------------------------------------------------------------------
+! * Function:	mklinks
+! *
+! * Purpose:	Build a file with assorted links.
+! *
+! *
+! * Programmer:	Adapted from C test by:
+! *             M.S. Breitenfeld
+! *
+! * Modifications:
+! *
+! *-------------------------------------------------------------------------
+! */
+
+   SUBROUTINE mklinks(fapl, total_error)
+
+     USE HDF5 ! This module contains all necessary modules 
+     
+     IMPLICIT NONE
+     INTEGER, INTENT(OUT) :: total_error
+     INTEGER(HID_T), INTENT(IN) :: fapl
+
+     INTEGER(HID_T) :: file, scalar, grp, d1
+     CHARACTER(LEN=12), PARAMETER :: filename ='TestLinks.h5'
+     INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
+     INTEGER ::   arank = 1                      ! Attribure rank
+     INTEGER :: error
+
+     WRITE(*,*) "link creation (w/new group format)"
+
+     ! /* Create a file */
+     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, file, error, H5P_DEFAULT_F, fapl)
+     CALL check("mklinks.h5fcreate_f",error,total_error)
+     CALL h5screate_simple_f(arank, adims2, scalar, error)
+     CALL check("mklinks.h5screate_simple_f",error,total_error)
+
+     !/* Create a group */
+     CALL H5Gcreate_f(file, "grp1", grp, error) 
+     CALL check("H5Gcreate_f", error, total_error)
+     CALL H5Gclose_f(grp, error)
+     CALL check("h5gclose_f",error,total_error)
+
+     !/* Create a dataset */
+     CALL h5dcreate_f(file, "d1", H5T_NATIVE_INTEGER, scalar, d1, error)
+     CALL check("h5dcreate_f",error,total_error)
+     CALL h5dclose_f(d1, error)
+     CALL check("h5dclose_f",error,total_error)
+
+     !/* Create a hard link */
+     CALL H5Lcreate_hard_f(file, "d1", INT(H5L_SAME_LOC_F,HID_T), "grp1/hard", error)
+     CALL check("H5Lcreate_hard_f", error, total_error)
+     
+     !/* Create a symbolic link */
+     CALL H5Lcreate_soft_f("/d1", file, "grp1/soft",error)
+     CALL check("H5Lcreate_soft_f", error, total_error)
+
+    !/* Create a symbolic link to something that doesn't exist */
+
+     CALL H5Lcreate_soft_f("foobar", file, "grp1/dangle",error)
+
+    !/* Create a recursive symbolic link */
+     CALL H5Lcreate_soft_f("/grp1/recursive", file, "/grp1/recursive",error)
+
+    !/* Close */
+     CALL h5sclose_f(scalar, error)
+     CALL check("h5sclose_f",error,total_error)
+     CALL h5fclose_f(file, error)
+     CALL check("h5fclose_f",error,total_error)
+
+  END SUBROUTINE mklinks
+
+!/*-------------------------------------------------------------------------
+! * Function:    test_move_preserves
+! *
+! * Purpose:     Tests that moving and renaming links preserves their
+! *              properties.
+! *
+! * Programmer:  M.S. Breitenfeld
+! *              March 3, 2008
+! *
+! * Modifications:
+! *
+! *-------------------------------------------------------------------------
+! */
+
+  SUBROUTINE test_move_preserves(fapl_id, total_error)
+
+    USE HDF5 ! This module contains all necessary modules 
+    
+    IMPLICIT NONE
+    INTEGER, INTENT(OUT) :: total_error
+    INTEGER(HID_T), INTENT(IN) :: fapl_id
+
+    INTEGER(HID_T):: file_id
+    INTEGER(HID_T):: group_id
+    INTEGER(HID_T):: fcpl_id ! /* Group creation property list ID */
+    INTEGER(HID_T):: lcpl_id
+    INTEGER(HID_T):: lcpl2_id
+    !H5O_info_t oinfo;
+    !H5L_info_t linfo;
+    INTEGER :: old_cset
+    INTEGER :: old_corder
+    !H5T_cset_t old_cset;
+    !int64_t old_corder;         /* Creation order value of link */
+    !time_t old_modification_time;
+    !time_t curr_time;
+    !unsigned crt_order_flags;   /* Status of creation order info for GCPL */
+    !char filename[1024];
+
+    INTEGER :: crt_order_flags ! /* Status of creation order info for GCPL */
+    CHARACTER(LEN=12), PARAMETER :: filename = 'TestLinks.h5'
+
+    INTEGER :: cset ! Indicates the character set used for the link’s name. 
+    INTEGER :: corder ! Specifies the link’s creation order position.
+    LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
+    INTEGER :: link_type ! Specifies the link class:
+     	                              !  H5L_LINK_HARD_F      - Hard link
+     	                              !  H5L_LINK_SOFT_F      - Soft link
+     	                              !  H5L_LINK_EXTERNAL_F  - External link
+     	                              !  H5L_LINK_ERROR _F    - Error
+    INTEGER :: address  ! If the link is a hard link, address specifies the file address that the link points to
+    INTEGER(HSIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
+
+    INTEGER :: error
+
+    WRITE(*,*) "moving and copying links preserves their properties (w/new group format)"
+
+    !/* Create a file creation property list with creation order stored for links
+    ! * in the root group
+    ! */
+
+    CALL H5Pcreate_f(H5P_FILE_CREATE_F, fcpl_id, error)
+    CALL check("H5Pcreate_f",error, total_error)
+
+    CALL H5Pget_link_creation_order_f(fcpl_id, crt_order_flags, error)
+    CALL check("H5Pget_link_creation_order_f",error, total_error)
+    CALL VERIFY("H5Pget_link_creation_order_f",crt_order_flags,0, total_error)
+    
+    CALL H5Pset_link_creation_order_f(fcpl_id, H5P_CRT_ORDER_TRACKED_F, error)
+    CALL check("H5Pset_link_creation_order_f", error, total_error)
+ 
+    CALL H5Pget_link_creation_order_f(fcpl_id, crt_order_flags, error)
+    CALL check("H5Pget_link_creation_order_f",error, total_error)
+    CALL VERIFY("H5Pget_link_creation_order_f",crt_order_flags, H5P_CRT_ORDER_TRACKED_F, total_error)
+
+    !/* Create file */
+    !/* (with creation order tracking for the root group) */
+    
+    CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, file_id, error, fcpl_id, fapl_id)
+    CALL check("h5fcreate_f",error,total_error)
+
+    !/* Create a link creation property list with the UTF-8 character encoding */
+    CALL H5Pcreate_f(H5P_LINK_CREATE_F, lcpl_id, error)
+    CALL check("H5Pcreate_f",error, total_error)
+
+    CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
+    CALL check("H5Pset_char_encoding_f",error, total_error)
+
+    !/* Create a group with that lcpl */
+    CALL H5Gcreate_f(file_id, "group", group_id, error,lcpl_id=lcpl_id, gcpl_id=H5P_DEFAULT_F, gapl_id=H5P_DEFAULT_F) 
+    CALL check("H5Gcreate_f", error, total_error)
+    CALL H5Gclose_f(group_id, error)
+    CALL check("H5Gclose_f", error, total_error)
+
+    ! /* Get the group's link's information */
+    CALL H5Lget_info_f(file_id, "group", &
+         cset, corder, f_corder_valid, link_type, address, val_size, &
+         error, H5P_DEFAULT_F)
+    CALL check("H5Lget_info_f",error,total_error)
+
+!    if(H5Oget_info_by_name(file_id, "group", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+
+    old_cset = cset
+    CALL VERIFY("H5Lget_info_f",old_cset,H5T_CSET_UTF8_F,total_error)
+    CALL VerifyLogical("H5Lget_info_f",f_corder_valid,.TRUE.,total_error)
+    old_corder = corder;
+    CALL VERIFY("H5Lget_info_f",old_corder,0,total_error)
+
+!    old_modification_time = oinfo.mtime;
+
+!    /* If this test happens too quickly, the times will all be the same.  Make sure the time changes. */
+!    curr_time = HDtime(NULL);
+!    while(HDtime(NULL) <= curr_time)
+!        ;
+
+!    /* Close the file and reopen it */
+    CALL H5Fclose_f(file_id, error)
+    CALL check("H5Fclose_f", error, total_error)
+    
+!!$    if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id)) < 0) TEST_ERROR
+!!$
+!!$    /* Get the link's character set & modification time .  They should be unchanged */
+!!$    if(H5Lget_info(file_id, "group", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(H5Oget_info_by_name(file_id, "group", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(old_cset != linfo.cset) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(old_corder != linfo.corder) TEST_ERROR
+!!$
+!!$    /* Create a new link to the group.  It should have a different creation order value but the same modification time */
+!!$    if(H5Lcreate_hard(file_id, "group", file_id, "group2", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(H5Oget_info_by_name(file_id, "group2", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(H5Lget_info(file_id, "group2", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_corder == linfo.corder) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(linfo.corder != 1) TEST_ERROR
+!!$    if(linfo.cset != H5T_CSET_ASCII) TEST_ERROR
+!!$
+!!$    /* Copy the first link to a UTF-8 name.
+!!$     *  Its creation order value should be different, but modification time
+!!$     * should not change.
+!!$     */
+!!$    if(H5Lcopy(file_id, "group", file_id, "group_copied", lcpl_id, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(H5Oget_info_by_name(file_id, "group_copied", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(H5Lget_info(file_id, "group_copied", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(linfo.corder != 2) TEST_ERROR
+!!$
+!!$    /* Check that its character encoding is UTF-8 */
+!!$    if(linfo.cset != H5T_CSET_UTF8) TEST_ERROR
+!!$
+!!$    /* Move the link with the default property list. */
+!!$    if(H5Lmove(file_id, "group_copied", file_id, "group_copied2", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(H5Oget_info_by_name(file_id, "group_copied2", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(H5Lget_info(file_id, "group_copied2", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(linfo.corder != 3) TEST_ERROR
+!!$
+!!$    /* Check that its character encoding is not UTF-8 */
+!!$    if(linfo.cset == H5T_CSET_UTF8) TEST_ERROR
+!!$
+!!$    /* Check that the original link is unchanged */
+!!$    if(H5Oget_info_by_name(file_id, "group", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(H5Lget_info(file_id, "group", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(old_corder != linfo.corder) TEST_ERROR
+!!$    if(linfo.cset != H5T_CSET_UTF8) TEST_ERROR
+!!$
+!!$    /* Move the first link to a UTF-8 name.
+!!$     *  Its creation order value will change, but modification time should not
+!!$     *  change. */
+!!$    if(H5Lmove(file_id, "group", file_id, "group_moved", lcpl_id, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(H5Oget_info_by_name(file_id, "group_moved", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(H5Lget_info(file_id, "group_moved", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(linfo.corder != 4) TEST_ERROR
+!!$
+!!$    /* Check that its character encoding is UTF-8 */
+!!$    if(linfo.cset != H5T_CSET_UTF8) TEST_ERROR
+!!$
+!!$    /* Move the link again using the default property list. */
+!!$    if(H5Lmove(file_id, "group_moved", file_id, "group_moved_again", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(H5Oget_info_by_name(file_id, "group_moved_again", &oinfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(old_modification_time != oinfo.mtime) TEST_ERROR
+!!$    if(H5Lget_info(file_id, "group_moved_again", &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder_valid != TRUE) TEST_ERROR
+!!$    if(linfo.corder != 5) TEST_ERROR
+!!$
+!!$    /* Check that its character encoding is not UTF-8 */
+!!$    if(linfo.cset == H5T_CSET_UTF8) TEST_ERROR
+
+    ! /* Close open IDs */
+     CALL H5Pclose_f(fcpl_id, error)
+     CALL check("H5Pclose_f", error, total_error)
+     CALL H5Pclose_f(lcpl_id, error)
+     CALL check("H5Pclose_f", error, total_error)
+    
+    ! if(H5Fclose(file_id) < 0) TEST_ERROR
+
+   END SUBROUTINE test_move_preserves
+
+!!$!/*-------------------------------------------------------------------------
+!!$! * Function:    ud_hard_links
+!!$! *
+!!$! * Purpose:     Check that the functionality of hard links can be duplicated
+!!$! *              with user-defined links.
+!!$! *
+!!$! *
+!!$! * Programmer:  M.S. Breitenfeld
+!!$! *              February, 2008
+!!$! *
+!!$! *-------------------------------------------------------------------------
+!!$! */
+!!$!
+!!$!/* Callback functions for UD hard links. */
+!!$!/* UD_hard_create increments the object's reference count */
+!!$
+!!$  SUBROUTINE ud_hard_links(fapl, total_error)
+!!$    
+!!$    USE HDF5 ! This module contains all necessary modules 
+!!$     
+!!$    IMPLICIT NONE
+!!$    INTEGER, INTENT(OUT) :: total_error
+!!$    INTEGER(HID_T), INTENT(IN) :: fapl
+!!$
+!!$    INTEGER(HID_T) :: fid ! /* File ID */
+!!$    INTEGER(HID_T) :: gid ! /* Group IDs */
+!!$
+!!$    CHARACTER(LEN=10) :: objname = 'objname.h5' ! /* Object name */
+!!$    CHARACTER(LEN=10), PARAMETER :: filename = 'filname.h5'
+!!$    
+!!$    INTEGER(HSIZE_T) :: name_len ! /* Size of an empty file */
+!!$
+!!$    INTEGER, PARAMETER :: UD_HARD_TYPE=201
+!!$    LOGICAL :: registered
+!!$
+!!$!/* Link information */
+!!$
+!!$!    ssize_t     name_len;                       /* Length of object name */
+!!$!    h5_stat_size_t empty_size;                  /* Size of an empty file */
+!!$
+!!$
+!!$    WRITE(*,*) "user-defined hard link (w/new group format)"
+!!$
+!!$    ! /* Set up filename and create file*/
+!!$
+!!$    CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, H5P_DEFAULT_F, fapl)
+!!$    CALL check("h5fcreate_f",error,total_error)
+!!$    
+!!$    ! /* Close file */
+!!$    CALL h5fclose_f(fid, error)
+!!$    CALL check("h5fclose_f",error,total_error)
+!!$    
+!!$    ! if((empty_size = h5_get_file_size(filename))<0) TEST_ERROR
+!!$
+!!$    ! /* Create file */
+!!$    CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, H5P_DEFAULT_F, fapl)
+!!$    CALL check("h5fcreate_f",error,total_error)
+!!$
+!!$    ! /* Check that external links are registered and UD hard links are not */
+!!$
+!!$    CALL H5Lis_registered(H5L_TYPE_EXTERNAL, registered, error)
+!!$    CALL VerifyLogical("H5Lis_registered", registered, .TRUE., total_error)
+!!$
+!!$    CALL H5Lis_registered(UD_HARD_TYPE, registered, error)
+!!$    CALL VerifyLogical("H5Lis_registered", registered, .FALSE., total_error)
+!!$
+!!$    !/* Register "user-defined hard links" with the library */
+!!$!    if(H5Lregister(UD_hard_class) < 0) TEST_ERROR
+!!$
+!!$    /* Check that UD hard links are now registered */
+!!$    if(H5Lis_registered(H5L_TYPE_EXTERNAL) != TRUE) TEST_ERROR
+!!$    if(H5Lis_registered(UD_HARD_TYPE) != TRUE) TEST_ERROR
+!!$
+!!$    /* Create a group for the UD hard link to point to */
+!!$    if((gid = H5Gcreate2(fid, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+!!$
+!!$    /* Get address for the group to give to the hard link */
+!!$    if(H5Lget_info(fid, "group", &li, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$    if(H5Gclose(gid) < 0) TEST_ERROR
+!!$
+!!$
+!!$    /* Create a user-defined "hard link" to the group using the address we got
+!!$     * from H5Lget_info */
+!!$    if(H5Lcreate_ud(fid, "ud_link", UD_HARD_TYPE, &(li.u.address), sizeof(haddr_t), H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$    /* Close and re-open file to ensure that data is written to disk */
+!!$    if(H5Fclose(fid) < 0) TEST_ERROR
+!!$    if((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) TEST_ERROR
+!!$
+!!$    /* Open group through UD link */
+!!$    if((gid = H5Gopen2(fid, "ud_link", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+!!$
+!!$    /* Check name */
+!!$    if((name_len = H5Iget_name( gid, objname, (size_t)NAME_BUF_SIZE )) < 0) TEST_ERROR
+!!$    if(HDstrcmp(objname, "/group")) TEST_ERROR
+!!$
+!!$    /* Create object in group */
+!!$    if((gid2 = H5Gcreate2(gid, "new_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+!!$
+!!$    /* Close groups*/
+!!$    if(H5Gclose(gid2) < 0) TEST_ERROR
+!!$    if(H5Gclose(gid) < 0) TEST_ERROR
+!!$
+!!$    /* Re-open group without using ud link to check that it was created properly */
+!!$    if((gid = H5Gopen2(fid, "group/new_group", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+!!$
+!!$    /* Check name */
+!!$    if((name_len = H5Iget_name( gid, objname, (size_t)NAME_BUF_SIZE )) < 0) TEST_ERROR
+!!$    if(HDstrcmp(objname, "/group/new_group")) TEST_ERROR
+!!$
+!!$    /* Close opened object */
+!!$    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+!!$
+!!$    /* Check that H5Lget_objinfo works on the hard link */
+!!$    if(H5Lget_info(fid, "ud_link", &li, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$    /* UD hard links have no query function, thus return a "link length" of 0 */
+!!$    if(li.u.val_size != 0) TEST_ERROR
+!!$    if(UD_HARD_TYPE != li.type) {
+!!$	H5_FAILED();
+!!$	puts("    Unexpected link class - should have been a UD hard link");
+!!$	goto error;
+!!$    } /* end if */
+!!$
+!!$    /* Unlink the group pointed to by the UD link.  It shouldn't be
+!!$     * deleted because of the UD link. */
+!!$    if(H5Ldelete(fid, "/group", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$
+!!$    /* Ensure we can open the group through the UD link */
+!!$    if((gid = H5Gopen2(fid, "ud_link", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+!!$
+!!$    /* Unlink the group contained within it. */
+!!$    if(H5Ldelete(gid, "new_group", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+!!$
+!!$    /* Now delete the UD link.  This should cause the group to be
+!!$     * deleted, too. */
+!!$    if(H5Ldelete(fid, "ud_link", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$
+!!$    /* Close file */
+!!$    if(H5Fclose(fid) < 0) FAIL_STACK_ERROR
+!!$
+!!$    /* The file should be empty again. */
+!!$    if(empty_size != h5_get_file_size(filename)) TEST_ERROR
+!!$
+!!$    if(H5Lunregister(UD_HARD_TYPE) < 0) FAIL_STACK_ERROR
+!!$
+!!$    PASSED();
+!!$    return 0;
+!!$
+!!$ error:
+!!$    H5E_BEGIN_TRY {
+!!$    	H5Gclose(gid2);
+!!$    	H5Gclose(gid);
+!!$    	H5Fclose(fid);
+!!$    } H5E_END_TRY;
+!!$    return -1;
+!!$} /* end ud_hard_links() */
+
+!/*-------------------------------------------------------------------------
+! * Function:    lifecycle
+! *
+! * Purpose:     Test that adding links to a group follow proper "lifecycle"
+! *              of empty->compact->symbol table->compact->empty.  (As group
+! *              is created, links are added, then links removed)
+! *
+! * Return:      Success:        0
+! *
+! *              Failure:        -1
+! *
+! * Programmer:  Quincey Koziol
+! *              Monday, October 17, 2005
+! *
+! *-------------------------------------------------------------------------
+! */
+SUBROUTINE lifecycle(cleanup, fapl2, total_error)
+
+
+  USE HDF5 ! This module contains all necessary modules 
+    
+  IMPLICIT NONE
+  INTEGER, INTENT(OUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: fapl2
+  INTEGER :: error
+
+  INTEGER, PARAMETER :: NAME_BUF_SIZE =7
+
+  INTEGER(HID_T) :: fid            !/* File ID */
+  INTEGER(HID_T) :: gid            !/* Group ID */
+  INTEGER(HID_T) :: gid2           !/* Datatype ID */
+  INTEGER(HID_T) :: gcpl           !/* Group creation property list ID */
+  INTEGER(size_t) :: lheap_size_hint !/* Local heap size hint */
+  INTEGER :: max_compact            !/* Maximum # of links to store in group compactly */
+  INTEGER :: min_dense              !/* Minimum # of links to store in group "densely" */
+  INTEGER :: est_num_entries	!/* Estimated # of entries in group */
+  INTEGER :: est_name_len		!/* Estimated length of entry name */
+  INTEGER :: nmsgs		        !/* Number of messages in group's header */
+  CHARACTER(LEN=NAME_BUF_SIZE) :: objname ! /* Object name */
+  CHARACTER(LEN=NAME_BUF_SIZE) :: filename = 'fixx.h5'
+  INTEGER :: empty_size             ! /* Size of an empty file */
+  INTEGER :: u                      ! /* Local index variable */
+  INTEGER(SIZE_T) :: LIFECYCLE_LOCAL_HEAP_SIZE_HINT = 256
+  INTEGER :: LIFECYCLE_MAX_COMPACT = 4
+  INTEGER :: LIFECYCLE_MIN_DENSE = 3
+  INTEGER :: LIFECYCLE_EST_NUM_ENTRIES = 4
+  INTEGER :: LIFECYCLE_EST_NAME_LEN=8
+  CHARACTER(LEN=3) :: LIFECYCLE_TOP_GROUP="top"
+! These value are taken from H5Gprivate.h
+  INTEGER :: H5G_CRT_GINFO_MAX_COMPACT = 8
+  INTEGER :: H5G_CRT_GINFO_MIN_DENSE = 6
+  INTEGER :: H5G_CRT_GINFO_EST_NUM_ENTRIES = 4
+  INTEGER :: H5G_CRT_GINFO_EST_NAME_LEN = 8
+  logical :: cleanup
+
+  WRITE(*,*) 'group lifecycle'
+
+  ! /* Create file */
+  CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, fid, error, access_prp=fapl2)
+  CALL check("H5Fcreate_f",error,total_error)
+
+  !/* Close file */
+  CALL H5Fclose_f(fid,error)
+  CALL check("H5Fclose_f",error,total_error)
+
+  ! /* Get size of file as empty */
+  ! if((empty_size = h5_get_file_size(filename)) < 0) TEST_ERROR
+
+  ! /* Re-open file */
+
+  CALL H5Fopen_f(filename, H5F_ACC_RDWR_F, fid, error,access_prp=fapl2)
+  CALL check("H5Fopen_f",error,total_error)
+
+
+  ! /* Set up group creation property list */
+  CALL H5Pcreate_f(H5P_GROUP_CREATE_F,gcpl,error)
+  CALL check("H5Pcreate_f",error,total_error)
+  
+
+  ! /* Query default group creation property settings */
+  CALL H5Pget_local_heap_size_hint_f(gcpl, lheap_size_hint, error)
+  CALL check("H5Pget_local_heap_size_hint_f",error,total_error)
+  CALL verify("H5Pget_local_heap_size_hint_f", lheap_size_hint,0,total_error)
+
+  CALL H5Pget_link_phase_change_f(gcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_link_phase_change_f", error, total_error)
+  CALL verify("H5Pget_link_phase_change_f", max_compact, H5G_CRT_GINFO_MAX_COMPACT,total_error)
+  CALL verify("H5Pget_link_phase_change_f", min_dense, H5G_CRT_GINFO_MIN_DENSE,total_error)
+
+
+  CALL H5Pget_est_link_info_f(gcpl, est_num_entries, est_name_len, error)
+  CALL check("H5Pget_est_link_info_f", error, total_error)
+  CALL verify("H5Pget_est_link_info_f", est_num_entries, H5G_CRT_GINFO_EST_NUM_ENTRIES,total_error)
+  CALL verify("H5Pget_est_link_info_f", est_name_len, H5G_CRT_GINFO_EST_NAME_LEN,total_error)
+  
+
+  !/* Set GCPL parameters */
+
+  CALL H5Pset_local_heap_size_hint_f(gcpl, LIFECYCLE_LOCAL_HEAP_SIZE_HINT, error)
+  CALL check("H5Pset_local_heap_size_hint_f", error, total_error)
+  CALL H5Pset_link_phase_change_f(gcpl, LIFECYCLE_MAX_COMPACT, LIFECYCLE_MIN_DENSE, error)
+  CALL check("H5Pset_link_phase_change_f", error, total_error)
+  CALL H5Pset_est_link_info_f(gcpl, LIFECYCLE_EST_NUM_ENTRIES, LIFECYCLE_EST_NAME_LEN, error)
+  CALL check("H5Pset_est_link_info_f", error, total_error)
+
+  ! /* Create group for testing lifecycle */
+
+  CALL H5Gcreate_f(fid, LIFECYCLE_TOP_GROUP, gid, error, gcpl_id=gcpl)
+  CALL check("H5Gcreate_f", error, total_error)
+
+  ! /* Query group creation property settings */
+
+  CALL H5Pget_local_heap_size_hint_f(gcpl, lheap_size_hint, error)
+  CALL check("H5Pget_local_heap_size_hint_f",error,total_error)
+  CALL verify("H5Pget_local_heap_size_hint_f", lheap_size_hint,LIFECYCLE_LOCAL_HEAP_SIZE_HINT,total_error)
+
+  CALL H5Pget_link_phase_change_f(gcpl, max_compact, min_dense, error)
+  CALL check("H5Pget_link_phase_change_f", error, total_error)
+  CALL verify("H5Pget_link_phase_change_f", max_compact, LIFECYCLE_MAX_COMPACT,total_error)
+  CALL verify("H5Pget_link_phase_change_f", min_dense, LIFECYCLE_MIN_DENSE,total_error)
+
+  CALL H5Pget_est_link_info_f(gcpl, est_num_entries, est_name_len, error)
+  CALL check("H5Pget_est_link_info_f", error, total_error)
+  CALL verify("H5Pget_est_link_info_f", est_num_entries, LIFECYCLE_EST_NUM_ENTRIES,total_error)
+  CALL verify("H5Pget_est_link_info_f", est_name_len, LIFECYCLE_EST_NAME_LEN,total_error)
+
+
+  ! /* Use internal testing routine to check that the group has no links or symbol table */
+  !  if(H5G_is_empty_test(gid) != TRUE) TEST_ERROR
+
+!!$   /* Create first "bottom" group */
+!!$  sprintf(objname, LIFECYCLE_BOTTOM_GROUP, (unsigned)0);
+!!$  IF((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+!!$
+!!$    /* Check on bottom group's status */
+!!$    if(H5G_is_empty_test(gid2) != TRUE) TEST_ERROR
+!!$
+!!$    /* Close bottom group */
+!!$    if(H5Gclose(gid2) < 0) TEST_ERROR
+!!$
+!!$    /* Check on top group's status */
+!!$    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
+!!$    if(H5G_has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
+!!$    if(nmsgs != 1) TEST_ERROR
+!!$
+!!$    /* Create several more bottom groups, to push the top group almost to a symbol table */
+!!$    /* (Start counting at '1', since we've already created one bottom group */
+!!$    for(u = 1; u < LIFECYCLE_MAX_COMPACT; u++) {
+!!$        sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
+!!$        if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+!!$
+!!$        /* Check on bottom group's status */
+!!$        if(H5G_is_empty_test(gid2) != TRUE) TEST_ERROR
+!!$
+!!$        /* Close bottom group */
+!!$        if(H5Gclose(gid2) < 0) TEST_ERROR
+!!$    } /* end for */
+!!$
+!!$    /* Check on top group's status */
+!!$    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
+!!$    if(H5G_has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
+!!$    if(nmsgs != LIFECYCLE_MAX_COMPACT) TEST_ERROR
+!!$    if(H5G_is_new_dense_test(gid) != FALSE) TEST_ERROR
+!!$
+!!$    /* Check that the object header is only one chunk and the space has been allocated correctly */
+!!$    if(H5Oget_info(gid, &oinfo) < 0) TEST_ERROR
+!!$    if(oinfo.hdr.space.total != 151) TEST_ERROR
+!!$    if(oinfo.hdr.space.free != 0) TEST_ERROR
+!!$    if(oinfo.hdr.nmesgs != 6) TEST_ERROR
+!!$    if(oinfo.hdr.nchunks != 1) TEST_ERROR
+!!$
+!!$    /* Create one more "bottom" group, which should push top group into using a symbol table */
+!!$    sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
+!!$    if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+!!$
+!!$    /* Check on bottom group's status */
+!!$    if(H5G_is_empty_test(gid2) != TRUE) TEST_ERROR
+!!$
+!!$    /* Close bottom group */
+!!$    if(H5Gclose(gid2) < 0) TEST_ERROR
+!!$
+!!$    /* Check on top group's status */
+!!$    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
+!!$    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
+!!$    if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR
+!!$
+!!$    /* Check that the object header is still one chunk and the space has been allocated correctly */
+!!$    if(H5Oget_info(gid, &oinfo) < 0) TEST_ERROR
+!!$    if(oinfo.hdr.space.total != 151) TEST_ERROR
+!!$    if(oinfo.hdr.space.free != 92) TEST_ERROR
+!!$    if(oinfo.hdr.nmesgs != 3) TEST_ERROR
+!!$    if(oinfo.hdr.nchunks != 1) TEST_ERROR
+!!$
+!!$    /* Unlink objects from top group */
+!!$    while(u >= LIFECYCLE_MIN_DENSE) {
+!!$        sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
+!!$
+!!$        if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$
+!!$        u--;
+!!$    } /* end while */
+!!$
+!!$    /* Check on top group's status */
+!!$    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
+!!$    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
+!!$    if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR
+!!$
+!!$    /* Unlink one more object from the group, which should transform back to using links */
+!!$    sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
+!!$    if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$    u--;
+!!$
+!!$    /* Check on top group's status */
+!!$    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
+!!$    if(H5G_has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
+!!$    if(nmsgs != (LIFECYCLE_MIN_DENSE - 1)) TEST_ERROR
+!!$
+!!$    /* Unlink last two objects from top group */
+!!$    sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
+!!$    if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$    u--;
+!!$    sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
+!!$    if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$
+!!$    /* Check on top group's status */
+!!$    if(H5G_is_empty_test(gid) != TRUE) TEST_ERROR
+
+    !/* Close top group */
+    CALL H5Gclose_f(gid, error)
+    CALL check("H5Gclose_f", error, total_error)
+
+    !/* Unlink top group */
+
+    CALL H5Ldelete_f(fid, LIFECYCLE_TOP_GROUP, error)
+    CALL check("H5Ldelete_f", error, total_error)
+    
+    ! /* Close GCPL */
+    CALL H5Pclose_f(gcpl, error)
+    CALL check("H5Pclose_f", error, total_error)
+
+    ! /* Close file */
+    CALL H5Fclose_f(fid,error)
+    CALL check("H5Fclose_f",error,total_error)
+
+!!$    /* Get size of file as empty */
+!!$    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
+!!$
+!!$    /* Verify that file is correct size */
+!!$    if(file_size != empty_size) TEST_ERROR
+
+    IF(cleanup) CALL h5_cleanup_f("fixx", H5P_DEFAULT_F, error)
+    CALL check("h5_cleanup_f", error, total_error)
+
+  END SUBROUTINE lifecycle
+!/*-------------------------------------------------------------------------
+! * Function:	cklinks
+! *
+! * Purpose:	Open the file created in the first step and check that the
+! *		links look correct.
+! *
+! * Return:	Success:	0
+! *
+! *		Failure:	-1
+! *
+! * Programmer:	M.S. Breitenfeld
+! *             April 14, 2008
+! *
+! * Modifications: Modified Original C code
+! *
+! *-------------------------------------------------------------------------
+! */
+
+
+  SUBROUTINE cklinks(fapl, total_error)
+
+!    USE ISO_C_BINDING
+  USE HDF5 ! This module contains all necessary modules 
+    
+  IMPLICIT NONE
+  INTEGER, INTENT(OUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER :: error
+
+  INTEGER(HID_T) :: file
+!    H5O_info_t		oinfo1, oinfo2;
+!    H5L_info_t		linfo2;
+
+  CHARACTER(LEN=12), PARAMETER :: filename ='TestLinks.h5'
+  CHARACTER(LEN=12) :: linkval
+
+!  TYPE(C_PTR) :: linkval
+
+  LOGICAL :: Lexists
+
+
+!!$    if(new_format)
+!!$        TESTING("link queries (w/new group format)")
+!!$    else
+!!$        TESTING("link queries")
+
+  ! /* Open the file */
+  CALL H5Fopen_f(filename, H5F_ACC_RDONLY_F, file, error,access_prp=fapl)
+  CALL check("H5Fopen_f",error,total_error)
+
+
+  ! /* Hard link */
+!!$  IF(H5Oget_info_by_name(file, "d1", &oinfo1, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$  IF(H5Oget_info_by_name(file, "grp1/hard", &oinfo2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$  IF(H5O_TYPE_DATASET != oinfo2.type) {
+!!$	H5_FAILED();
+!!$	printf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
+!!$	TEST_ERROR
+!!$    } /* end if */
+!!$    if(H5F_addr_ne(oinfo1.addr, oinfo2.addr)) {
+!!$	H5_FAILED();
+!!$	puts("    Hard link test failed. Link seems not to point to the ");
+!!$	puts("    expected file location.");
+!!$	TEST_ERROR
+!!$    } /* end if */
+
+  
+  CALL H5Lexists_f(file,"d1",Lexists, error)
+  CALL verifylogical("test_lcpl.H5Lexists", Lexists,.TRUE.,total_error)
+
+  CALL H5Lexists_f(file,"grp1/hard",Lexists, error)
+  CALL verifylogical("test_lcpl.H5Lexists", Lexists,.TRUE.,total_error)
+
+
+!!$    /* Symbolic link */
+!!$    if(H5Oget_info_by_name(file, "grp1/soft", &oinfo2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$    if(H5O_TYPE_DATASET != oinfo2.type) {
+!!$	H5_FAILED();
+!!$	printf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
+!!$	TEST_ERROR
+!!$    } /* end if */
+!!$    if(H5F_addr_ne(oinfo1.addr, oinfo2.addr)) {
+!!$	H5_FAILED();
+!!$	puts("    Soft link test failed. Link seems not to point to the ");
+!!$	puts("    expected file location.");
+!!$	TEST_ERROR
+!!$    } /* end if */
+
+!  CALL H5Lget_val(file, "grp1/soft", INT(LEN(linkval), SIZE_T), linkval, error)
+
+
+!!$    if(H5Lget_val(file, "grp1/soft", linkval, sizeof linkval, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$    if(HDstrcmp(linkval, "/d1")) {
+!!$	H5_FAILED();
+!!$	puts("    Soft link test failed. Wrong link value");
+!!$	TEST_ERROR
+!!$    } /* end if */
+!!$    if(H5Lexists(file, "grp1/soft", H5P_DEFAULT) != TRUE) FAIL_STACK_ERROR
+!!$
+!!$    /* Dangling link */
+!!$    H5E_BEGIN_TRY {
+!!$	status = H5Oget_info_by_name(file, "grp1/dangle", &oinfo2, H5P_DEFAULT);
+!!$    } H5E_END_TRY;
+!!$    if(status >= 0) {
+!!$	H5_FAILED();
+!!$	puts("    H5Oget_info_by_name() should have failed for a dangling link.");
+!!$	TEST_ERROR
+!!$    } /* end if */
+!!$    if(H5Lget_info(file, "grp1/dangle", &linfo2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$    if(H5L_TYPE_SOFT != linfo2.type) {
+!!$	H5_FAILED();
+!!$	printf("    %d: Unexpected object type should have been a symbolic link\n", __LINE__);
+!!$	TEST_ERROR
+!!$    } /* end if */
+!!$    if(H5Lget_val(file, "grp1/dangle", linkval, sizeof linkval, H5P_DEFAULT) < 0) {
+!!$	H5_FAILED();
+!!$	printf("    %d: Can't retrieve link value\n", __LINE__);
+!!$	TEST_ERROR
+!!$    } /* end if */
+!!$    if(HDstrcmp(linkval, "foobar")) {
+!!$	H5_FAILED();
+!!$	puts("    Dangling link test failed. Wrong link value");
+!!$	TEST_ERROR
+!!$    } /* end if */
+!!$    if(H5Lexists(file, "grp1/dangle", H5P_DEFAULT) != TRUE) FAIL_STACK_ERROR
+!!$
+!!$    /* Recursive link */
+!!$    H5E_BEGIN_TRY {
+!!$	status = H5Oget_info_by_name(file, "grp1/recursive", &oinfo2, H5P_DEFAULT);
+!!$    } H5E_END_TRY;
+!!$    if(status >= 0) {
+!!$	H5_FAILED();
+!!$	puts("    H5Oget_info_by_name() should have failed for a recursive link.");
+!!$	TEST_ERROR
+!!$    } /* end if */
+!!$    if(H5Lget_info(file, "grp1/recursive", &linfo2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+!!$    if(H5L_TYPE_SOFT != linfo2.type) {
+!!$	H5_FAILED();
+!!$	printf("    %d: Unexpected object type should have been a symbolic link\n", __LINE__);
+!!$	TEST_ERROR
+!!$    } /* end if */
+!!$    if(H5Lget_val(file, "grp1/recursive", linkval, sizeof linkval, H5P_DEFAULT) < 0) {
+!!$	H5_FAILED();
+!!$	printf("    %d: Can't retrieve link value\n", __LINE__);
+!!$	TEST_ERROR
+!!$    } /* end if */
+!!$    if(HDstrcmp(linkval, "/grp1/recursive")) {
+!!$	H5_FAILED();
+!!$	puts("   Recursive link test failed. Wrong link value");
+!!$	TEST_ERROR
+!!$    } /* end if */
+!!$
+!!$    /* Non-existant link */
+!!$    if(H5Lexists(file, "foobar", H5P_DEFAULT) == TRUE) FAIL_STACK_ERROR
+
+  ! /* Cleanup */
+    CALL H5Fclose_f(file,error)
+    CALL check("H5Fclose_f",error,total_error)
+
+  END SUBROUTINE cklinks
+
+
+!/*-------------------------------------------------------------------------
+! * Function:    delete_by_idx
+! *
+! * Purpose:     Create a group with creation order indices and test deleting
+! *              links by index.
+! *
+! * Return:      Total error
+! *
+! * C Programmer:  Quincey Koziol
+! *                Tuesday, November 14, 2006
+! *
+! * Adapted to FORTRAN: M.S. Breitenfeld
+! *                     March 3, 2008
+! *
+! *-------------------------------------------------------------------------
+! */
+SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
+
+  USE HDF5 ! This module contains all necessary modules 
+  
+  IMPLICIT NONE
+  INTEGER, INTENT(OUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: fapl
+
+  INTEGER(HID_T) :: file_id  ! /* File ID */
+  INTEGER(HID_T) :: group_id ! /* Group ID */
+  INTEGER(HID_T) :: gcpl_id  ! /* Group creation property list ID */
+
+  INTEGER :: idx_type        ! /* Type of index to operate on */
+  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./) 
+                             ! /* Use index on creation order values */
+  INTEGER :: max_compact     ! /* Maximum # of links to store in group compactly */ 
+  INTEGER :: min_dense       ! /* Minimum # of links to store in group "densely" */
+
+  CHARACTER(LEN=7) :: objname   ! /* Object name */
+  CHARACTER(LEN=8) :: filename = 'file0.h5' ! /* File name */
+  CHARACTER(LEN=7) :: tmpname   ! /* Temporary link name */
+  CHARACTER(LEN=12), PARAMETER :: CORDER_GROUP_NAME = "corder_group"
+
+  LOGICAL :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! Indicates the size, in the number of characters, of the attribute
+
+  INTEGER :: u ! /* Local index variable */
+  INTEGER :: Input1, i
+  INTEGER(HID_T) :: group_id2
+
+  INTEGER :: iorder ! /* Order within in the index */
+  CHARACTER(LEN=2) :: chr2
+  INTEGER :: error
+  !
+  !
+  !
+  CHARACTER(LEN=6)  :: filename1 
+  CHARACTER(LEN=6)  :: filename2
+  CHARACTER(LEN=80) :: fix_filename1
+  CHARACTER(LEN=80) :: fix_filename2
+  INTEGER(SIZE_T) :: size_tmp
+
+  LOGICAL :: cleanup
+
+  DO i = 1, 80
+     fix_filename1(i:i) = " "
+     fix_filename2(i:i) = " "
+  ENDDO
+
+  ! /* Loop over operating on different indices on link fields */
+  DO idx_type = H5_INDEX_NAME_F, H5_INDEX_CRT_ORDER_F
+     ! /* Loop over operating in different orders */
+     DO iorder = H5_ITER_INC_F,  H5_ITER_DEC_F
+        ! /* Loop over using index for creation order value */
+        DO i = 1, 2
+           ! /* Print appropriate test message */
+           IF(idx_type == H5_INDEX_CRT_ORDER_F)THEN
+              IF(iorder == H5_ITER_INC_F)THEN
+                 IF(use_index(i))THEN
+                    WRITE(*,'(5x,A)')"deleting links by creation order index in increasing order w/creation order index"
+                 ELSE
+                    WRITE(*,'(5x,A)')"deleting links by creation order index in increasing order w/o creation order index"
+                 ENDIF
+              ELSE
+                 IF(use_index(i))THEN
+                    WRITE(*,'(5x,A)')"deleting links by creation order index in decreasing order w/creation order index"
+                 ELSE
+                    WRITE(*,'(5x,A)')"deleting links by creation order index in decreasing order w/o creation order index"
+                 ENDIF
+              ENDIF
+           ELSE
+              IF(iorder == H5_ITER_INC_F)THEN
+                 IF(use_index(i))THEN
+                    WRITE(*,'(5x,A)')"deleting links by name index in increasing order w/creation order index"
+                 ELSE
+                    WRITE(*,'(5x,A)')"deleting links by name index in increasing order w/o creation order index"
+                 ENDIF
+              ELSE
+                 IF(use_index(i))THEN
+                    WRITE(*,'(5x,A)')"deleting links by name index in decreasing order w/creation order index"
+                 ELSE
+                    WRITE(*,'(5x,A)')"deleting links by name index in decreasing order w/o creation order index"
+                 ENDIF
+              ENDIF
+           ENDIF
+!           CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
+!           IF(error .NE. 0) STOP
+
+           ! /* Create file */
+           CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, access_prp=fapl)
+           CALL check("delete_by_idx.H5Fcreate_f", error, total_error)
+           
+           ! /* Create group creation property list */
+           CALL H5Pcreate_f(H5P_GROUP_CREATE_F, gcpl_id, error )
+           CALL check("delete_by_idx.H5Pcreate_f", error, total_error)
+
+           ! /* Set creation order tracking & indexing on group */
+           IF(use_index(i))THEN
+              Input1 = H5P_CRT_ORDER_INDEXED_F
+           ELSE
+              Input1 = 0
+           ENDIF
+
+           CALL H5Pset_link_creation_order_f(gcpl_id, IOR(H5P_CRT_ORDER_TRACKED_F, Input1), error)
+           CALL check("delete_by_idx.H5Pset_link_creation_order_f", error, total_error)
+
+           ! /* Create group with creation order tracking on */
+           CALL H5Gcreate_f(file_id, CORDER_GROUP_NAME, group_id, error, gcpl_id=gcpl_id)
+           CALL check("delete_by_idx.H5Gcreate_f", error, total_error)
+
+           ! /* Query the group creation properties */
+           CALL H5Pget_link_phase_change_f(gcpl_id, max_compact, min_dense, error)
+           CALL check("delete_by_idx.H5Pget_link_phase_change_f", error, total_error)
+
+
+           ! /* Delete links from one end */
+
+           ! /* Check for deletion on empty group */
+           CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, INT(0,HSIZE_T), error)
+           CALL VERIFY("delete_by_idx.H5Ldelete_by_idx_f", error, -1, total_error) ! test should fail (error = -1)
+           ! /* Create several links, up to limit of compact form */
+           DO u = 0, max_compact-1
+              ! /* Make name for link */
+              WRITE(chr2,'(I2.2)') u
+              objname = 'fill '//chr2
+
+              ! /* Create hard link, with group object */
+              CALL H5Gcreate_f(group_id, objname, group_id2, error)
+              CALL check("delete_by_idx.H5Gcreate_f", error, total_error)
+              CALL H5Gclose_f(group_id2, error)
+              CALL check("delete_by_idx.H5Gclose_f", error, total_error)
+
+              ! /* Verify link information for new link */
+              CALL link_info_by_idx_check(group_id, objname, u, &
+                   .TRUE., use_index, total_error)
+           ENDDO
+
+           ! /* Verify state of group (compact) */
+           ! IF(H5G_has_links_test(group_id, NULL) != TRUE) TEST_ERROR
+
+           ! /* Check for out of bound deletion */
+
+           CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, INT(u,HSIZE_T), error)
+           CALL VERIFY("delete_by_idx.H5Ldelete_by_idx_f", error, -1, total_error) ! test should fail (error = -1)
+
+
+           ! /* Delete links from compact group */
+
+           DO u = 0, (max_compact - 1) -1
+              ! /* Delete first link in appropriate order */
+              CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, INT(0,HSIZE_T), error)
+              CALL check("delete_by_idx.H5Ldelete_by_idx_f", error, total_error)
+              ! /* Verify the link information for first link in appropriate order */
+              ! HDmemset(&linfo, 0, sizeof(linfo));
+
+              CALL H5Lget_info_by_idx_f(group_id, ".", idx_type, iorder, INT(0,HSIZE_T), &
+                   f_corder_valid, corder, cset, data_size, error)
+
+              IF(iorder.EQ.H5_ITER_INC_F)THEN
+                 CALL VERIFY("delete_by_idx.H5Lget_info_by_idx_f", corder, u+1, total_error)
+              ELSE
+                 CALL VERIFY("delete_by_idx.H5Lget_info_by_idx_f", corder, (max_compact - (u + 2)), total_error)
+              ENDIF
+
+              ! /* Verify the name for first link in appropriate order */
+              ! HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+!!$              size_tmp = 20
+!!$              CALL H5Lget_name_by_idx_f(group_id, ".", idx_type, order, INT(0,HSIZE_T), size_tmp, tmpname, error)
+!!$              CALL check("delete_by_idx.H5Lget_name_by_idx_f", error, total_error)
+!!$
+!!$              IF(order .EQ. H5_ITER_INC_F)THEN
+!!$                 WRITE(chr2,'(I2.2)') u + 1
+!!$              ELSE
+!!$                 WRITE(chr2,'(I2.2)') (max_compact - (u + 2))
+!!$              ENDIF
+!!$              objname = 'fill '//chr2
+!!$              PRINT*,objname, tmpname
+!!$              CALL verifyString("delete_by_idx.H5Lget_name_by_idx_f", objname, tmpname,  total_error)
+           ENDDO
+!!$
+!!$                /* Delete last link */
+!!$                if(H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                /* Verify state of group (empty) */
+!!$                if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+!!$
+!!$                /* Create more links, to push group into dense form */
+!!$                for(u = 0; u < (max_compact * 2); u++) {
+!!$                    hid_t group_id2;	        /* Group ID */
+!!$
+!!$                    /* Make name for link */
+!!$                    sprintf(objname, "filler %02u", u);
+!!$
+!!$                    /* Create hard link, with group object */
+!!$                    if((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+!!$                    if(H5Gclose(group_id2) < 0) TEST_ERROR
+!!$
+!!$                    /* Verify state of group (dense) */
+!!$                    if(u >= max_compact)
+!!$                        if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+!!$
+!!$                    /* Verify link information for new link */
+!!$                    if(link_info_by_idx_check(group_id, objname, (hsize_t)u, TRUE, use_index) < 0) TEST_ERROR
+!!$                } /* end for */
+!!$
+!!$                /* Check for out of bound deletion again */
+!!$                H5E_BEGIN_TRY {
+!!$                    ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
+!!$                } H5E_END_TRY;
+!!$                if(ret >= 0) TEST_ERROR
+!!$
+!!$                /* Delete links from dense group, in appropriate order */
+!!$                for(u = 0; u < ((max_compact * 2) - 1); u++) {
+!!$                    /* Delete first link in appropriate order */
+!!$                    if(H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                    /* Verify the link information for first link in appropriate order */
+!!$                    HDmemset(&linfo, 0, sizeof(linfo));
+!!$                    if(H5Lget_info_by_idx(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$                    if(order == H5_ITER_INC) {
+!!$                        if(linfo.corder != (u + 1)) TEST_ERROR
+!!$                    } /* end if */
+!!$                    else {
+!!$                        if(linfo.corder != ((max_compact * 2) - (u + 2))) TEST_ERROR
+!!$                    } /* end else */
+!!$
+!!$                    /* Verify the name for first link in appropriate order */
+!!$                    HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+!!$                    if(H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR
+!!$                    if(order == H5_ITER_INC)
+!!$                        sprintf(objname, "filler %02u", (u + 1));
+!!$                    else
+!!$                        sprintf(objname, "filler %02u", ((max_compact * 2) - (u + 2)));
+!!$                    if(HDstrcmp(objname, tmpname)) TEST_ERROR
+!!$                } /* end for */
+!!$
+!!$                /* Delete last link */
+!!$                if(H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                /* Verify state of group (empty) */
+!!$                if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+!!$                if(H5G_is_new_dense_test(group_id) == TRUE) TEST_ERROR
+!!$
+!!$                /* Check for deletion on empty group again */
+!!$                H5E_BEGIN_TRY {
+!!$                    ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
+!!$                } H5E_END_TRY;
+!!$                if(ret >= 0) TEST_ERROR
+!!$
+!!$
+!!$                /* Delete links in middle */
+!!$
+!!$
+!!$                /* Create more links, to push group into dense form */
+!!$                for(u = 0; u < (max_compact * 2); u++) {
+!!$                    hid_t group_id2;	        /* Group ID */
+!!$
+!!$                    /* Make name for link */
+!!$                    sprintf(objname, "filler %02u", u);
+!!$
+!!$                    /* Create hard link, with group object */
+!!$                    if((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+!!$                    if(H5Gclose(group_id2) < 0) TEST_ERROR
+!!$
+!!$                    /* Verify state of group (dense) */
+!!$                    if(u >= max_compact)
+!!$                        if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+!!$
+!!$                    /* Verify link information for new link */
+!!$                    if(link_info_by_idx_check(group_id, objname, (hsize_t)u, TRUE, use_index) < 0) TEST_ERROR
+!!$                } /* end for */
+!!$
+!!$                /* Delete every other link from dense group, in appropriate order */
+!!$                for(u = 0; u < max_compact; u++) {
+!!$                    /* Delete link */
+!!$                    if(H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                    /* Verify the link information for current link in appropriate order */
+!!$                    HDmemset(&linfo, 0, sizeof(linfo));
+!!$                    if(H5Lget_info_by_idx(group_id, ".", idx_type, order, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$                    if(order == H5_ITER_INC) {
+!!$                        if(linfo.corder != ((u * 2) + 1)) TEST_ERROR
+!!$                    } /* end if */
+!!$                    else {
+!!$                        if(linfo.corder != ((max_compact * 2) - ((u * 2) + 2))) TEST_ERROR
+!!$                    } /* end else */
+!!$
+!!$                    /* Verify the name for current link in appropriate order */
+!!$                    HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+!!$                    if(H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR
+!!$                    if(order == H5_ITER_INC)
+!!$                        sprintf(objname, "filler %02u", ((u * 2) + 1));
+!!$                    else
+!!$                        sprintf(objname, "filler %02u", ((max_compact * 2) - ((u * 2) + 2)));
+!!$                    if(HDstrcmp(objname, tmpname)) TEST_ERROR
+!!$                } /* end for */
+!!$
+!!$                /* Delete remaining links from dense group, in appropriate order */
+!!$                for(u = 0; u < (max_compact - 1); u++) {
+!!$                    /* Delete link */
+!!$                    if(H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                    /* Verify the link information for first link in appropriate order */
+!!$                    HDmemset(&linfo, 0, sizeof(linfo));
+!!$                    if(H5Lget_info_by_idx(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$                    if(order == H5_ITER_INC) {
+!!$                        if(linfo.corder != ((u * 2) + 3)) TEST_ERROR
+!!$                    } /* end if */
+!!$                    else {
+!!$                        if(linfo.corder != ((max_compact * 2) - ((u * 2) + 4))) TEST_ERROR
+!!$                    } /* end else */
+!!$
+!!$                    /* Verify the name for first link in appropriate order */
+!!$                    HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+!!$                    if(H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR
+!!$                    if(order == H5_ITER_INC)
+!!$                        sprintf(objname, "filler %02u", ((u * 2) + 3));
+!!$                    else
+!!$                        sprintf(objname, "filler %02u", ((max_compact * 2) - ((u * 2) + 4)));
+!!$                    if(HDstrcmp(objname, tmpname)) TEST_ERROR
+!!$                } /* end for */
+!!$
+!!$                /* Delete last link */
+!!$                if(H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT) < 0) TEST_ERROR
+!!$
+!!$                /* Verify state of group (empty) */
+!!$                if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+!!$                if(H5G_is_new_dense_test(group_id) == TRUE) TEST_ERROR
+!!$
+!!$
+!!$
+           ! /* Close the group */
+           CALL H5Gclose_f(group_id, error)
+           CALL check("delete_by_idx.H5Gclose_f", error, total_error)
+
+           !/* Close the group creation property list */
+           CALL H5Pclose_f(gcpl_id, error)
+           CALL check("delete_by_idx.H5Gclose_f", error, total_error)
+
+           !/* Close the file */
+           CALL H5Fclose_f(file_id, error)
+           CALL check("delete_by_idx.H5Gclose_f", error, total_error)
+
+           IF(cleanup) CALL h5_cleanup_f("file0", H5P_DEFAULT_F, error)
+           CALL check("h5_cleanup_f", error, total_error)
+
+        ENDDO
+     ENDDO
+  ENDDO
+!!$
+!!$    return 0;
+!!$
+!!$error:
+!!$    H5E_BEGIN_TRY {
+!!$        H5Pclose(gcpl_id);
+!!$        H5Gclose(group_id);
+!!$        H5Fclose(file_id);
+!!$    } H5E_END_TRY;
+!!$    return -1;
+!!$} /* end delete_by_idx() */
+
+END SUBROUTINE delete_by_idx
+
+
+
+!/*-------------------------------------------------------------------------
+! * Function:    link_info_by_idx_check
+! *
+! * Purpose:     Support routine for link_info_by_idx, to verify the link
+! *              info is correct for a link
+! *
+! * Note:	This routine assumes that the links have been inserted in the
+! *              group in alphabetical order.
+! *
+! * Return:      Success:        0
+! *              Failure:        -1
+! *
+! * Programmer:  Quincey Koziol
+! *              Tuesday, November  7, 2006
+! *
+! *-------------------------------------------------------------------------
+! */
+SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
+    hard_link, use_index, total_error)
+
+  USE HDF5 ! This module contains all necessary modules 
+  
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: group_id
+  CHARACTER(LEN=*), INTENT(IN) :: linkname
+  INTEGER, INTENT(IN) :: n
+  LOGICAL, INTENT(IN) :: hard_link
+  LOGICAL, INTENT(IN) :: use_index
+
+  LOGICAL :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+  INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
+  INTEGER :: cset ! Indicates the character set used for the attribute’s name
+  INTEGER(HSIZE_T) :: data_size   ! Indicates the size, in the number of characters, of the attribute
+
+  CHARACTER(LEN=7) :: tmpname     !/* Temporary link name */
+  CHARACTER(LEN=3) :: tmpname_small !/* to small temporary link name */
+  CHARACTER(LEN=10) :: tmpname_big !/* to big temporary link name */
+
+  CHARACTER(LEN=7) :: valname     !/* Link value name */
+  CHARACTER(LEN=7) :: tmpval      !/* Temporary link value */
+  CHARACTER(LEN=2) :: chr2
+  INTEGER(SIZE_T) :: size_tmp
+  INTEGER :: error
+
+  ! /* Make link value for increasing/native order queries */
+
+  WRITE(chr2,'(I2.2)') n
+  valname = 'valn.'//chr2
+
+  ! /* Verify the link information for first link, in increasing creation order */
+  !  HDmemset(&linfo, 0, sizeof(linfo));
+  CALL H5Lget_info_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(0,HSIZE_T), &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("H5Lget_info_by_idx_f", error, total_error)
+  CALL VERIFY("H5Lget_info_by_idx_f", corder, 0, total_error)
+
+  ! /* Verify the link information for new link, in increasing creation order */
+  ! HDmemset(&linfo, 0, sizeof(linfo));
+  CALL H5Lget_info_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), &
+       f_corder_valid, corder, cset, data_size, error)
+  CALL check("H5Lget_info_by_idx_f", error, total_error)
+  CALL VERIFY("H5Lget_info_by_idx_f", corder, n, total_error)
+
+  ! /* Verify value for new soft link, in increasing creation order */
+!!$  IF(hard_link)THEN
+!!$     ! HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE);
+!!$     
+!!$     CALL H5Lget_val_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, n, tmpval, INT(7,SIZE_T),error)
+!!$     CALL check("H5Lget_val_by_idx",error,total_error)
+!!$
+!!$!     IF(HDstrcmp(valname, tmpval)) TEST_ERROR
+!!$  ENDIF
+
+  ! /* Verify the name for new link, in increasing creation order */
+  !  HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+
+  ! The actual size of tmpname should be 7
+
+  size_tmp = INT(3,SIZE_T)
+  CALL H5Lget_name_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), size_tmp, tmpname_small, error)
+  CALL check("link_info_by_idx_check.H5Lget_name_by_idx_f", error, total_error)
+  CALL verifyString("link_info_by_idx_check.H5Lget_name_by_idx_f", &
+       linkname(1:LEN(tmpname_small)), tmpname_small(1:LEN(tmpname_small)),  total_error)
+  CALL VERIFY("link_info_by_idx_check.H5Lget_name_by_idx_f", INT(size_tmp), 7, total_error)
+
+  ! try it with the correct size
+  size_tmp = INT(LEN(tmpname),SIZE_T)
+  CALL H5Lget_name_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), size_tmp, tmpname, error)
+  CALL check("link_info_by_idx_check.H5Lget_name_by_idx_f", error, total_error)
+  CALL verifyString("link_info_by_idx_check.H5Lget_name_by_idx_f", &
+       linkname(1:LEN(tmpname)), tmpname(1:LEN(tmpname)),  total_error)
+  CALL VERIFY("link_info_by_idx_check.H5Lget_name_by_idx_f", INT(size_tmp), 7, total_error)
+
+  size_tmp = INT(LEN(tmpname_big),SIZE_T)
+  CALL H5Lget_name_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), size_tmp, tmpname_big, error)
+  CALL check("link_info_by_idx_check.H5Lget_name_by_idx_f", error, total_error)
+  CALL verifyString("link_info_by_idx_check.H5Lget_name_by_idx_f", &
+       linkname(1:7), tmpname_big(1:7),  total_error)
+  CALL VERIFY("link_info_by_idx_check.H5Lget_name_by_idx_f", INT(size_tmp), 7, total_error)
+
+  ! Try with a buffer set to small
+
+!!$  size_tmp = INT(4,SIZE_T)
+!!$  CALL H5Lget_name_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), size_tmp, tmpname, error)
+!!$  CALL check("H5Lget_name_by_idx_f", error, total_error)
+!!$  CALL verifyString("H5Lget_name_by_idx_f", linkname, tmpname,  total_error)
+
+
+!!$
+!!$    if(H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(HDstrcmp(linkname, tmpname)) TEST_ERROR
+
+!!$    /* Don't test "native" order if there is no creation order index, since
+!!$     *  there's not a good way to easily predict the link's order in the name
+!!$     *  index.
+!!$     */
+!!$    if(use_index) {
+!!$        /* Verify the link information for first link, in native creation order (which is increasing) */
+!!$        HDmemset(&linfo, 0, sizeof(linfo));
+!!$        if(H5Lget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$        if(linfo.corder != 0) TEST_ERROR
+!!$
+!!$        /* Verify the link information for new link, in native creation order (which is increasing) */
+!!$        HDmemset(&linfo, 0, sizeof(linfo));
+!!$        if(H5Lget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$        if(linfo.corder != (int64_t)n) TEST_ERROR
+!!$
+!!$        /* Verify value for new soft link, in native creation order (which is increasing) */
+!!$        if(!hard_link) {
+!!$            HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE);
+!!$            if(H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR
+!!$            if(HDstrcmp(valname, tmpval)) TEST_ERROR
+!!$        } /* end if */
+!!$
+!!$        /* Verify the name for new link, in native creation order (which is increasing) */
+!!$        HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+!!$        if(H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR
+!!$        if(HDstrcmp(linkname, tmpname)) TEST_ERROR
+!!$    } /* end if */
+!!$
+!!$    /* Verify the link information for first link, in decreasing creation order */
+!!$    HDmemset(&linfo, 0, sizeof(linfo));
+!!$    if(H5Lget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder != 0) TEST_ERROR
+!!$
+!!$    /* Verify the link information for new link, in decreasing creation order */
+!!$    HDmemset(&linfo, 0, sizeof(linfo));
+!!$    if(H5Lget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder != (int64_t)n) TEST_ERROR
+!!$
+!!$    /* Verify value for new soft link, in decreasing creation order */
+!!$    if(!hard_link) {
+!!$        HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE);
+!!$        if(H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR
+!!$        if(HDstrcmp(valname, tmpval)) TEST_ERROR
+!!$    } /* end if */
+!!$
+!!$    /* Verify the name for new link, in decreasing creation order */
+!!$    HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+!!$    if(H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(HDstrcmp(linkname, tmpname)) TEST_ERROR
+!!$
+!!$
+!!$    /* Verify the link information for first link, in increasing link name order */
+!!$    HDmemset(&linfo, 0, sizeof(linfo));
+!!$    if(H5Lget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder != 0) TEST_ERROR
+!!$
+!!$    /* Verify the link information for new link, in increasing link name order */
+!!$    HDmemset(&linfo, 0, sizeof(linfo));
+!!$    if(H5Lget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder != (int64_t)n) TEST_ERROR
+!!$
+!!$    /* Verify value for new soft link, in increasing link name order */
+!!$    if(!hard_link) {
+!!$        HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE);
+!!$        if(H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR
+!!$        if(HDstrcmp(valname, tmpval)) TEST_ERROR
+!!$    } /* end if */
+!!$
+!!$    /* Verify the name for new link, in increasing link name order */
+!!$    HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+!!$    if(H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(HDstrcmp(linkname, tmpname)) TEST_ERROR
+!!$
+!!$    /* Don't test "native" order queries on link name order, since there's not
+!!$     *  a good way to easily predict the order of the links in the name index.
+!!$     */
+!!$
+!!$    /* Verify the link information for first link, in decreasing link name order */
+!!$    HDmemset(&linfo, 0, sizeof(linfo));
+!!$    if(H5Lget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder != 0) TEST_ERROR
+!!$
+!!$    /* Verify the link information for new link, in decreasing link name order */
+!!$    HDmemset(&linfo, 0, sizeof(linfo));
+!!$    if(H5Lget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(linfo.corder != (int64_t)n) TEST_ERROR
+!!$
+!!$    /* Verify value for new soft link, in decreasing link name order */
+!!$    if(!hard_link) {
+!!$        HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE);
+!!$        if(H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR
+!!$        if(HDstrcmp(valname, tmpval)) TEST_ERROR
+!!$    } /* end if */
+!!$
+!!$    /* Verify the name for new link, in decreasing link name order */
+!!$    HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
+!!$    if(H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR
+!!$    if(HDstrcmp(linkname, tmpname)) TEST_ERROR
+!!$
+!!$    /* Success */
+!!$    return(0);
+!!$
+!!$error:
+!!$    /* Failure */
+!!$    return(-1);
+!!$} /* end link_info_by_idx_check() */
+
+  END SUBROUTINE link_info_by_idx_check
+
+
+!/*-------------------------------------------------------------------------
+! * Function:    test_lcpl
+! *
+! * Purpose:     Tests Link Creation Property Lists
+! *
+! * Return:      Success:        0
+! *              Failure:        number of errors
+! *
+! * Programmer:  M.S. Breitenfeld
+! *              Modified C routine
+! *              March 12, 2008
+! *
+! * Modifications:
+! *
+! *-------------------------------------------------------------------------
+! */
+
+
+  SUBROUTINE test_lcpl(cleanup, fapl, total_error)
+
+  USE HDF5 ! This module contains all necessary modules 
+  
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  LOGICAL :: cleanup
+    
+  INTEGER(HID_T) :: file_id
+  INTEGER(HID_T) :: group_id
+  INTEGER(HID_T) :: space_id, data_space
+  INTEGER(HID_T) :: dset_id
+  INTEGER(HID_T) :: type_id
+  INTEGER(HID_T) :: lcpl_id
+  
+  INTEGER :: cset ! Indicates the character set used for the link’s name. 
+  INTEGER :: corder ! Specifies the link’s creation order position.
+  LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
+  INTEGER :: link_type ! Specifies the link class:
+     	                              !  H5L_LINK_HARD_F      - Hard link
+     	                              !  H5L_LINK_SOFT_F      - Soft link
+     	                              !  H5L_LINK_EXTERNAL_F  - External link
+     	                              !  H5L_LINK_ERROR _F    - Error
+  INTEGER :: address  ! If the link is a hard link, address specifies the file address that the link points to
+  INTEGER(HSIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
+  INTEGER(HSIZE_T) :: data_size   ! Indicates the size, in the number of characters, of the attribute
+
+  CHARACTER(LEN=1024) :: filename = 'tempfile.h5'
+  INTEGER, PARAMETER :: TEST6_DIM1 = 8, TEST6_DIM2 = 7
+  INTEGER(HSIZE_T), DIMENSION(1:2), PARAMETER :: dims = (/TEST6_DIM1,TEST6_DIM2/)
+
+  INTEGER :: encoding
+  INTEGER :: error
+  LOGICAL :: Lexists
+  INTEGER(HSIZE_T), DIMENSION(1:2), PARAMETER :: extend_dim = (/TEST6_DIM1-2,TEST6_DIM2-3/)
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsout, maxdimsout ! dimensions
+
+  INTEGER :: i
+
+  WRITE(*,*) "link creation property lists (w/new group format)"
+
+  
+  !/* Actually, intermediate group creation is tested elsewhere (tmisc).
+  ! * Here we only need to test the character encoding property */
+
+  !/* Create file */
+  !  h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
+  
+  CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
+  CALL check("test_lcpl.H5Fcreate_f", error, total_error)
+
+
+  ! /* Create and link a group with the default LCPL */
+  
+  CALL H5Gcreate_f(file_id, "/group", group_id, error)
+  CALL check("test_lcpl.H5Gcreate_f", error, total_error)
+  
+
+  ! /* Check that its character encoding is the default */
+  
+  CALL H5Lget_info_f(file_id, "group", &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       error, H5P_DEFAULT_F)
+
+!/* File-wide default character encoding can not yet be set via the file
+! * creation property list and is always ASCII. */
+!#define H5F_DEFAULT_CSET H5T_CSET_ASCII  -- FROM H5Fprivate.h --
+
+  CALL VERIFY("test_lcpl.H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
+
+  ! /* Create and commit a datatype with the default LCPL */
+  CALL h5tcopy_f(H5T_NATIVE_INTEGER, type_id, error)
+  CALL check("test_lcpl.h5tcopy_f",error,total_error)
+  CALL h5tcommit_f(file_id, "/type", type_id, error)
+  CALL check("test_lcpl.h5tcommit_f", error, total_error)
+  CALL h5tclose_f(type_id, error)
+  CALL check("test_lcpl.h5tclose_f", error, total_error)
+  
+
+  ! /* Check that its character encoding is the default */
+  CALL H5Lget_info_f(file_id, "type", &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       error)
+  CALL check("test_lcpl.h5tclose_f", error, total_error)
+
+!/* File-wide default character encoding can not yet be set via the file
+! * creation property list and is always ASCII. */
+!#define H5F_DEFAULT_CSET H5T_CSET_ASCII  -- FROM H5Fprivate.h --
+
+  CALL verify("test_lcpl.H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
+
+  !/* Create a dataspace */
+  CALL h5screate_simple_f(2, dims, space_id, error)
+  CALL check("test_lcpl.h5screate_simple_f",error,total_error)
+
+  ! /* Create a dataset using the default LCPL */
+  CALL h5dcreate_f(file_id, "/dataset", H5T_NATIVE_INTEGER, space_id, dset_id, error)
+  CALL check("test_lcpl.h5dcreate_f", error, total_error)
+  CALL h5dclose_f(dset_id, error)
+  CALL check("test_lcpl.h5dclose_f", error, total_error)
+
+  ! Reopen
+
+  CALL H5Dopen_f(file_id, "/dataset", dset_id, error)
+  CALL check("test_lcpl.h5dopen_f", error, total_error)
+
+  !  /* Extend the  dataset */
+  CALL H5Dset_extent_f(dset_id, extend_dim, error)
+  CALL check("test_lcpl.H5Dset_extent_f", error, total_error)
+  !  /* Verify the dataspaces */
+        !
+          !Get dataset's dataspace handle.
+          !
+  CALL h5dget_space_f(dset_id, data_space, error)
+  CALL check("h5dget_space_f",error,total_error)
+
+  CALL h5sget_simple_extent_dims_f(data_space, dimsout, maxdimsout, error)
+  CALL check("test_lcpl.h5sget_simple_extent_dims_f",error, total_error)
+  
+  DO i = 1, 2
+     CALL VERIFY("H5Sget_simple_extent_dims", dimsout(i), extend_dim(i), total_error)
+     CALL VERIFY("H5Sget_simple_extent_dims", maxdimsout(i), dims(i), total_error)
+  ENDDO
+
+  ! /* close data set */
+
+  CALL h5dclose_f(dset_id, error)
+  CALL check("test_lcpl.h5dclose_f", error, total_error) 
+
+  ! /* Check that its character encoding is the default */
+  CALL H5Lget_info_f(file_id, "dataset", &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       error)
+  CALL check("test_lcpl.H5Lget_info_f", error, total_error)
+
+!/* File-wide default character encoding can not yet be set via the file
+! * creation property list and is always ASCII. */
+!#define H5F_DEFAULT_CSET H5T_CSET_ASCII  -- FROM H5Fprivate.h --
+
+  CALL verify("test_lcpl.h5tclose_f",cset, H5T_CSET_ASCII_F,total_error)
+
+  !/* Create a link creation property list with the UTF-8 character encoding */
+  CALL H5Pcreate_f(H5P_LINK_CREATE_F,lcpl_id,error)
+  CALL check("test_lcpl.h5Pcreate_f",error,total_error)
+  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
+  CALL check("test_lcpl.H5Pset_char_encoding_f",error, total_error)
+
+  ! /* Create and link a group with the new LCPL */
+  CALL H5Gcreate_f(file_id, "/group2", group_id, error,lcpl_id=lcpl_id)
+  CALL check("test_lcpl.test_lcpl.H5Gcreate_f", error, total_error)
+  CALL H5Gclose_f(group_id, error)
+  CALL check("test_lcpl.test_lcpl.H5Gclose_f", error, total_error)
+
+
+  !/* Check that its character encoding is UTF-8 */
+  CALL H5Lget_info_f(file_id, "group2", &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       error)
+  CALL check("test_lcpl.H5Lget_info_f", error, total_error)
+  CALL verify("test_lcpl.H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
+
+
+  ! /* Create and commit a datatype with the new LCPL */
+
+  CALL h5tcopy_f(H5T_NATIVE_INTEGER, type_id, error)
+  CALL check("test_lcpl.h5tcopy_f",error,total_error)
+  CALL h5tcommit_f(file_id, "/type2", type_id, error, lcpl_id=lcpl_id)
+  CALL check("test_lcpl.h5tcommit_f", error, total_error)
+  CALL h5tclose_f(type_id, error)
+  CALL check("test_lcpl.h5tclose_f", error, total_error)
+
+
+  !/* Check that its character encoding is UTF-8 */
+  CALL H5Lget_info_f(file_id, "type2", &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       error)
+  CALL check("test_lcpl.H5Lget_info_f", error, total_error)
+  CALL verify("test_lcpl.H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
+
+  ! /* Create a dataset using the new LCPL */
+  CALL h5dcreate_f(file_id, "/dataset2", H5T_NATIVE_INTEGER, space_id, dset_id, error,lcpl_id=lcpl_id)
+  CALL check("test_lcpl.h5dcreate_f", error, total_error)
+
+  CALL h5dclose_f(dset_id, error)
+  CALL check("test_lcpl.h5dclose_f", error, total_error)
+
+  CALL H5Pget_char_encoding_f(lcpl_id, encoding, error)
+  CALL check("test_lcpl.H5Pget_char_encoding_f", error, total_error)
+  CALL VERIFY("test_lcpl.H5Pget_char_encoding_f", encoding, H5T_CSET_UTF8_F, total_error) 
+
+  ! /* Check that its character encoding is UTF-8 */
+  CALL H5Lget_info_f(file_id, "dataset2", &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       error)
+  CALL check("test_lcpl.H5Lget_info_f", error, total_error)
+  CALL verify("test_lcpl.H5Lget_info_f2",cset, H5T_CSET_UTF8_F,total_error)
+
+  ! /* Create a new link to the dataset with a different character encoding. */
+  CALL H5Pclose_f(lcpl_id, error)
+  CALL check("test_lcpl.H5Pclose_f", error, total_error)
+
+  CALL H5Pcreate_f(H5P_LINK_CREATE_F,lcpl_id,error)
+  CALL check("test_lcpl.h5Pcreate_f",error,total_error)
+  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_ASCII_F, error)
+  CALL check("test_lcpl.H5Pset_char_encoding_f",error, total_error)
+  CALL H5Lcreate_hard_f(file_id, "/dataset2", file_id, "/dataset2_link", error, lcpl_id)
+  CALL check("test_lcpl.H5Lcreate_hard_f",error, total_error)
+
+  CALL H5Lexists_f(file_id,"/dataset2_link",Lexists, error)
+  CALL check("test_lcpl.H5Lexists",error, total_error)
+  CALL verifylogical("test_lcpl.H5Lexists", Lexists,.TRUE.,total_error)
+
+  ! /* Check that its character encoding is ASCII */
+  CALL H5Lget_info_f(file_id, "/dataset2_link", &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       error)
+  CALL check("test_lcpl.H5Lget_info_f", error, total_error)
+  CALL verify("test_lcpl.H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error) 
+
+  ! /* Check that the first link's encoding hasn't changed */
+
+  CALL H5Lget_info_f(file_id, "/dataset2", &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       error)
+  CALL check("test_lcpl.H5Lget_info_f", error, total_error)
+  CALL verify("test_lcpl.H5Lget_info_f3",cset, H5T_CSET_UTF8_F,total_error)
+
+
+  !/* Make sure that LCPLs work properly for other API calls: */
+  !/* H5Lcreate_soft */
+  
+  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
+  CALL check("test_lcpl.H5Pset_char_encoding_f",error, total_error)
+  CALL H5Lcreate_soft_f("dataset2", file_id, "slink_to_dset2",error,lcpl_id)
+  CALL check("H5Lcreate_soft_f", error, total_error)
+
+  CALL H5Lget_info_f(file_id, "slink_to_dset2", &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       error)
+  CALL check("test_lcpl.H5Lget_info_f", error, total_error)
+  CALL verify("test_lcpl.H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
+
+
+  ! /* H5Lmove */
+  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_ASCII_F, error)
+  CALL check("test_lcpl.H5Pset_char_encoding_f",error, total_error)
+
+  CALL H5Lmove_f(file_id, "slink_to_dset2", file_id, "moved_slink", error, lcpl_id, H5P_DEFAULT_F)
+  CALL check("test_lcpl.H5Lmove_f",error, total_error)
+
+  CALL H5Lget_info_f(file_id, "moved_slink", &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       error)
+  CALL check("test_lcpl.H5Lget_info_f", error, total_error)
+  CALL verify("test_lcpl.H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
+
+
+  ! /* H5Lcopy */
+  
+  CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
+  CALL check("test_lcpl.H5Pset_char_encoding_f",error, total_error)
+
+  CALL H5Lcopy_f(file_id, "moved_slink", file_id, "copied_slink", error, lcpl_id)
+  
+  CALL H5Lget_info_f(file_id, "copied_slink", &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       error)
+  CALL check("test_lcpl.H5Lget_info_f", error, total_error)
+  CALL verify("test_lcpl.H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
+
+
+  ! /* H5Lcreate_external */
+
+  CALL H5Lcreate_external_f("test_lcpl.filename", "path", file_id, "extlink", error, lcpl_id)
+  CALL check("test_lcpl.H5Lcreate_external_f", error, total_error)
+
+  CALL H5Lget_info_f(file_id, "extlink", &
+       cset, corder, f_corder_valid, link_type, address, val_size, &
+       error)
+  CALL check("test_lcpl.H5Lget_info_f", error, total_error)
+  CALL verify("test_lcpl.H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
+
+
+  ! /* Close open IDs */
+
+  CALL H5Pclose_f(lcpl_id, error)
+  CALL check("test_lcpl.H5Pclose_f", error, total_error)
+  CALL H5Sclose_f(space_id, error)
+  CALL check("test_lcpl.h5Sclose_f",error,total_error)
+  CALL H5Fclose_f(file_id, error)
+  CALL check("test_lcpl.H5Fclose_f", error, total_error)
+
+  IF(cleanup) CALL h5_cleanup_f("tempfile", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+
+END SUBROUTINE test_lcpl
+
+SUBROUTINE objcopy(fapl, total_error)
+
+  USE HDF5 ! This module contains all necessary modules 
+  
+  IMPLICIT NONE
+  INTEGER, INTENT(INOUT) :: total_error
+  INTEGER(HID_T), INTENT(IN) :: fapl
+
+  INTEGER(HID_T) :: fapl2, pid
+
+  INTEGER :: flag, cpy_flags
+
+  INTEGER :: error
+
+  flag = H5O_COPY_SHALLOW_HIERARCHY_F
+
+!/* Copy the file access property list */
+  CALL H5Pcopy_f(fapl, fapl2, error)
+  CALL check("H5Pcopy_f", error, total_error)
+
+!/* Set the "use the latest version of the format" bounds for creating objects in the file */
+  CALL H5Pset_libver_bounds_f(fapl2, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
+  
+  ! /* create property to pass copy options */
+  CALL h5pcreate_f(H5P_OBJECT_COPY_F, pid, error)
+  CALL check("h5pcreate_f",error, total_error)
+
+  ! /* set options for object copy */
+  CALL H5Pset_copy_object_f(pid, flag, error) 
+  CALL check("H5Pset_copy_object_f",error, total_error)
+
+  ! /* Verify object copy flags */
+  CALL H5Pget_copy_object_f(pid, cpy_flags, error)
+  CALL check("H5Pget_copy_object_f",error, total_error)
+  CALL VERIFY("H5Pget_copy_object_f", cpy_flags, flag, total_error)
+
+!!$
+!!$  CALL test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_WITHOUT_ATTR_FLAG, 
+!!$                       FALSE, "H5Ocopy(): without attributes");
+
+  CALL lapl_nlinks(fapl2, total_error)
+
+END SUBROUTINE objcopy
+
+
+!/*-------------------------------------------------------------------------
+! * Function:    lapl_nlinks
+! *
+! * Purpose:     Check that the maximum number of soft links can be adjusted
+! *              by the user using the Link Access Property List.
+! *
+! * Return:      Success:        0
+! *
+! *              Failure:        -1
+! *
+! * Programmer:  James Laird
+! *              Tuesday, June 6, 2006
+! *
+! * Modifications:
+! *
+! *-------------------------------------------------------------------------
+! */
+
+SUBROUTINE lapl_nlinks( fapl, total_error)
+
+  USE HDF5
+  
+  IMPLICIT NONE
+  INTEGER(HID_T), INTENT(IN) :: fapl
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER :: error
+
+  INTEGER(HID_T) :: fid = (-1) !/* File ID */
+  INTEGER(HID_T) :: gid = (-1), gid2 = (-1) !/* Group IDs */
+  INTEGER(HID_T) :: plist = (-1) ! /* lapl ID */
+  INTEGER(HID_T) :: tid = (-1), sid = (-1), did = (-1) ! /* Other IDs */
+  INTEGER(HID_T) :: gapl = (-1), dapl = (-1), tapl = (-1) ! /* Other property lists */
+  
+  CHARACTER(LEN=7) :: objname ! /* Object name */
+  INTEGER(size_t) :: name_len ! /* Length of object name */
+  CHARACTER(LEN=12) :: filename = 'TestLinks.h5'
+  INTEGER(size_t) ::              nlinks ! /* nlinks for H5Pset_nlinks */
+  INTEGER(hsize_t), DIMENSION(2) :: dims
+  INTEGER(size_t) :: buf_size = 7
+  
+  WRITE(*,*) "adjusting nlinks with LAPL (w/new group format)"
+
+!!$    /* Make certain test is valid */
+!!$    /* XXX: should probably make a "generic" test that creates the proper
+!!$     *          # of links based on this value - QAK
+!!$     */
+!!$    HDassert(H5L_NUM_LINKS == 16);
+
+  ! /* Create file */
+  CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, fid, error, access_prp=fapl)
+  CALL check(" lapl_nlinks.h5fcreate_f",error,total_error)
+
+  ! /* Create group with short name in file (used as target for links) */
+  CALL H5Gcreate_f(fid, "final", gid, error) 
+  CALL check(" lapl_nlinks.H5Gcreate_f", error, total_error)
+  
+  !/* Create chain of soft links to existing object (limited) */
+  CALL H5Lcreate_soft_f("final", fid, "soft1", error)
+  CALL H5Lcreate_soft_f("soft1", fid, "soft2", error)
+  CALL H5Lcreate_soft_f("soft2", fid, "soft3", error)
+  CALL H5Lcreate_soft_f("soft3", fid, "soft4", error)
+  CALL H5Lcreate_soft_f("soft4", fid, "soft5", error)
+  CALL H5Lcreate_soft_f("soft5", fid, "soft6", error)
+  CALL H5Lcreate_soft_f("soft6", fid, "soft7", error)
+  CALL H5Lcreate_soft_f("soft7", fid, "soft8", error)
+  CALL H5Lcreate_soft_f("soft8", fid, "soft9", error)
+  CALL H5Lcreate_soft_f("soft9", fid, "soft10", error)
+  CALL H5Lcreate_soft_f("soft10", fid, "soft11", error)
+  CALL H5Lcreate_soft_f("soft11", fid, "soft12", error)
+  CALL H5Lcreate_soft_f("soft12", fid, "soft13", error)
+  CALL H5Lcreate_soft_f("soft13", fid, "soft14", error)
+  CALL H5Lcreate_soft_f("soft14", fid, "soft15", error)
+  CALL H5Lcreate_soft_f("soft15", fid, "soft16", error)
+  CALL H5Lcreate_soft_f("soft16", fid, "soft17", error)
+
+  !/* Close objects */
+  CALL H5Gclose_f(gid, error)
+  CALL check("h5gclose_f",error,total_error)
+  CALL h5fclose_f(fid, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  !/* Open file */
+  
+  CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
+  CALL check("h5open_f",error,total_error)
+  
+  !/* Create LAPL with higher-than-usual nlinks value */
+  !/* Create a non-default lapl with udata set to point to the first group */
+  
+  CALL H5Pcreate_f(H5P_LINK_ACCESS_F,plist,error)
+  CALL check("h5Pcreate_f",error,total_error)
+  nlinks = 20
+  CALL H5Pset_nlinks_f(plist, nlinks, error)
+  CALL check("H5Pset_nlinks_f",error,total_error)
+  !/* Ensure that nlinks was set successfully */
+  nlinks = 0
+  CALL H5Pget_nlinks_f(plist, nlinks, error)
+  CALL check("H5Pset_nlinks_f",error,total_error)
+  CALL VERIFY("H5Pset_nlinks_f",INT(nlinks), 20, total_error)
+
+
+  !/* Open object through what is normally too many soft links using
+  ! * new property list */
+  
+  CALL H5Oopen_f(fid,"soft17",gid,error,plist)
+  CALL check("H5Oopen_f",error,total_error)
+
+  !/* Check name */
+  CALL h5iget_name_f(gid, objname, buf_size, name_len, error)
+  CALL check("h5iget_name_f",error,total_error)
+  CALL VerifyString("h5iget_name_f", TRIM(objname),"/soft17", total_error)
+  !/* Create group using soft link */
+  CALL H5Gcreate_f(gid, "new_soft", gid2, error)
+  CALL check("H5Gcreate_f", error, total_error)
+
+  ! /* Close groups */ 
+  CALL H5Gclose_f(gid2, error)
+  CALL check("H5Gclose_f", error, total_error) 
+  CALL H5Gclose_f(gid, error)
+  CALL check("H5Gclose_f", error, total_error)
+
+
+  !/* Set nlinks to a smaller number */
+  nlinks = 4
+  CALL H5Pset_nlinks_f(plist, nlinks, error)
+  CALL check("H5Pset_nlinks_f", error, total_error)
+
+  !/* Ensure that nlinks was set successfully */
+  nlinks = 0
+
+  CALL H5Pget_nlinks_f(plist, nlinks, error)
+  CALL check("H5Pget_nlinks_f",error,total_error)
+  CALL VERIFY("H5Pget_nlinks_f", INT(nlinks), 4, total_error)
+
+  ! /* Try opening through what is now too many soft links */
+  
+  CALL H5Oopen_f(fid,"soft5",gid,error,plist)
+  CALL VERIFY("H5Oopen_f", error, -1, total_error) ! should fail
+
+  ! /* Open object through lesser soft link */
+  CALL H5Oopen_f(fid,"soft4",gid,error,plist)
+  CALL check("H5Oopen_",error,total_error)
+
+  ! /* Check name */
+  CALL h5iget_name_f(gid, objname, buf_size, name_len, error)
+  CALL check("h5iget_name_f",error,total_error)
+  CALL VerifyString("h5iget_name_f", TRIM(objname),"/soft4", total_error)
+
+  ! /* Test other functions that should use a LAPL */
+  nlinks = 20
+  CALL H5Pset_nlinks_f(plist, nlinks, error)
+  CALL check("H5Pset_nlinks_f", error, total_error)
+
+  !/* Try copying and moving when both src and dst contain many soft links
+  ! * using a non-default LAPL
+  ! */
+  CALL H5Lcopy_f(fid, "soft17", fid, "soft17/newer_soft", error, H5P_DEFAULT_F, plist)
+  CALL check("H5Lcopy_f",error,total_error)
+
+  CALL H5Lmove_f(fid, "soft17/newer_soft", fid, "soft17/newest_soft", error, lapl_id=plist)
+  CALL check("H5Lmove_f",error, total_error)
+
+  ! /* H5Olink */
+  CALL H5Olink_f(gid, fid, "soft17/link_to_group", error, H5P_DEFAULT_F, plist)
+  CALL check("H5Olink_f", error, total_error)
+
+  ! /* H5Lcreate_hard and H5Lcreate_soft */
+  CALL H5Lcreate_hard_f(fid, "soft17", fid, "soft17/link2_to_group", error, H5P_DEFAULT_F, plist)
+  CALL check("H5Lcreate_hard_f", error, total_error)
+
+
+  CALL H5Lcreate_soft_f("/soft4", fid, "soft17/soft_link",error, H5P_DEFAULT_F, plist)
+  CALL check("H5Lcreate_soft_f", error, total_error)
+
+  ! /* H5Ldelete */
+  CALL h5ldelete_f(fid, "soft17/soft_link", error, plist)
+  CALL check("H5Ldelete_f", error, total_error)
+
+!!$    /* H5Lget_val and H5Lget_info */
+!!$    if(H5Lget_val(fid, "soft17", NULL, (size_t)0, plist) < 0) TEST_ERROR
+!!$    if(H5Lget_info(fid, "soft17", NULL, plist) < 0) TEST_ERROR
+!!$
+
+  ! /* H5Lcreate_external and H5Lcreate_ud */
+  CALL H5Lcreate_external_f("filename", "path", fid, "soft17/extlink", error, H5P_DEFAULT_F, plist)
+  CALL check("H5Lcreate_external_f", error, total_error)
+
+!!$    if(H5Lregister(UD_rereg_class) < 0) TEST_ERROR
+!!$    if(H5Lcreate_ud(fid, "soft17/udlink", UD_HARD_TYPE, NULL, (size_t)0, H5P_DEFAULT, plist) < 0) TEST_ERROR
+!!$
+    ! /* Close plist */
+  CALL h5pclose_f(plist, error)
+  CALL check("h5pclose_f", error, total_error)
+
+    ! /* Create a datatype and dataset as targets inside the group */
+  CALL h5tcopy_f(H5T_NATIVE_INTEGER, tid, error)
+  CALL check("h5tcopy_f",error,total_error)
+  CALL h5tcommit_f(gid, "datatype", tid, error)
+  CALL check("h5tcommit_f", error, total_error)
+  CALL h5tclose_f(tid, error)
+  CALL check("h5tclose_f", error, total_error)
+
+!!$
+!!$    dims[0] = 2;
+!!$    dims[1] = 2;
+!!$    if((sid = H5Screate_simple(2, dims, NULL)) < 0) TEST_ERROR
+!!$    if((did = H5Dcreate2(gid, "dataset", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+!!$    if(H5Dclose(did) < 0) TEST_ERROR
+!!$
+  !/* Close group */
+  CALL h5gclose_f(gid, error)
+  CALL check("h5gclose_f",error,total_error)
+
+!!$
+!!$    /* Try to open the objects using too many symlinks with default *APLs */
+!!$    H5E_BEGIN_TRY {
+!!$        if((gid = H5Gopen2(fid, "soft17", H5P_DEFAULT)) >= 0)
+!!$            FAIL_PUTS_ERROR("    Should have failed for too many nested links.")
+!!$        if((tid = H5Topen2(fid, "soft17/datatype", H5P_DEFAULT)) >= 0)
+!!$            FAIL_PUTS_ERROR("    Should have failed for too many nested links.")
+!!$        if((did = H5Dopen2(fid, "soft17/dataset", H5P_DEFAULT)) >= 0)
+!!$            FAIL_PUTS_ERROR("    Should have failed for too many nested links.")
+!!$    } H5E_END_TRY
+!!$
+    ! /* Create property lists with nlinks set */
+  
+  CALL H5Pcreate_f(H5P_GROUP_ACCESS_F,gapl,error)
+  CALL check("h5Pcreate_f",error,total_error) 
+  CALL H5Pcreate_f(H5P_DATATYPE_ACCESS_F,tapl,error)
+  CALL check("h5Pcreate_f",error,total_error) 
+  CALL H5Pcreate_f(H5P_DATASET_ACCESS_F,dapl,error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+
+  nlinks = 20
+  CALL H5Pset_nlinks_f(gapl, nlinks, error)
+  CALL check("H5Pset_nlinks_f", error, total_error)
+  CALL H5Pset_nlinks_f(tapl, nlinks, error)
+  CALL check("H5Pset_nlinks_f", error, total_error)
+  CALL H5Pset_nlinks_f(dapl, nlinks, error)
+  CALL check("H5Pset_nlinks_f", error, total_error)
+
+  !/* We should now be able to use these property lists to open each kind
+  ! * of object.
+  ! */
+
+  CALL H5Gopen_f(fid, "soft17", gid, error, gapl)
+  CALL check("H5Gopen_f",error,total_error)
+
+  CALL H5Topen_f(fid, "soft17/datatype", tid, error, tapl)
+  CALL check("H5Gopen_f",error,total_error)
+  
+!!$    if((did = H5Dopen2(fid, "soft17/dataset", dapl)) < 0) TEST_ERROR
+
+  ! /* Close objects */
+  
+  CALL h5gclose_f(gid, error)
+  CALL check("h5gclose_f",error,total_error)
+  CALL h5tclose_f(tid, error)
+  CALL check("h5tclose_f", error, total_error)
+
+!!$    if(H5Dclose(did) < 0) TEST_ERROR
+!!$
+  ! /* Close plists */
+  
+  CALL h5pclose_f(gapl, error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5pclose_f(tapl, error)
+  CALL check("h5pclose_f", error, total_error)
+
+!!$    if(H5Pclose(dapl) < 0) TEST_ERROR
+!!$
+!!$    /* Unregister UD hard link class */
+!!$    if(H5Lunregister(UD_HARD_TYPE) < 0) TEST_ERROR
+!!$
+
+  ! /* Close file */
+  CALL H5Fclose_f(fid, error)
+  CALL check("H5Fclose_f", error, total_error)
+
+END SUBROUTINE lapl_nlinks
diff --git a/fortran/test/tH5O.f90 b/fortran/test/tH5O.f90
new file mode 100644
index 0000000..d0c3f16
--- /dev/null
+++ b/fortran/test/tH5O.f90
@@ -0,0 +1,208 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!   Copyright by The HDF Group.                                               *
+!   Copyright by the Board of Trustees of the University of Illinois.         *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
+!   of the source code distribution tree; Copyright.html can be found at the  *
+!   root level of an installed copy of the electronic HDF5 document set and   *
+!   is linked from the top-level documents page.  It can also be found at     *
+!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+!   access to either file, you may request a copy from help@hdfgroup.org.     *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!
+SUBROUTINE test_h5o(cleanup, total_error)
+  USE HDF5 ! This module contains all necessary modules 
+  
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(OUT) :: total_error
+
+  ! /* Output message about test being performed */
+  WRITE(*,*) "Testing Objects"
+
+!!$  test_h5o_open();		/* Test generic OPEN FUNCTION */
+!!$  test_h5o_open_by_addr();	/* Test opening objects by address */
+!!$  test_h5o_close();		/* Test generic CLOSE FUNCTION */
+!!$  test_h5o_refcount();        /* Test incrementing and decrementing reference count */
+!!$  test_h5o_plist();           /* Test object creation properties */
+  CALL test_h5o_link(total_error) ! /* Test object link routine */
+
+END SUBROUTINE test_h5o
+
+!/****************************************************************
+!**
+!**  test_h5o_link: Test creating link to object
+!**
+!****************************************************************/
+
+SUBROUTINE test_h5o_link(total_error)
+
+  USE HDF5 ! This module contains all necessary modules 
+  
+  IMPLICIT NONE
+  INTEGER, INTENT(OUT) :: total_error
+
+  INTEGER(HID_T) :: file_id
+  INTEGER(HID_T) :: group_id
+  INTEGER(HID_T) :: space_id
+  INTEGER(HID_T) :: dset_id
+  INTEGER(HID_T) :: type_id
+  INTEGER(HID_T) :: fapl_id
+  INTEGER(HID_T) :: lcpl_id
+  CHARACTER(LEN=8), PARAMETER :: TEST_FILENAME = 'TestFile'
+  INTEGER, PARAMETER :: TEST6_DIM1 = 2, TEST6_DIM2 = 5
+  INTEGER(HSIZE_T), DIMENSION(1:2), PARAMETER :: dims = (/TEST6_DIM1,TEST6_DIM2/)
+  INTEGER, DIMENSION(1:TEST6_DIM1,1:TEST6_DIM2) :: wdata, rdata
+
+  INTEGER, PARAMETER :: TRUE = 1, FALSE = 0
+
+  LOGICAL :: committed ! /* Whether the named datatype is committed */
+
+  INTEGER :: i, n, j
+  INTEGER ::  error  ! /* Value returned from API calls */
+
+  ! /* Initialize the raw data */
+  DO i = 1, TEST6_DIM1
+     DO j = 1, TEST6_DIM2
+        wdata(i,j) = i*j
+     ENDDO
+  ENDDO
+  
+  ! /* Create the dataspace */
+  CALL h5screate_simple_f(2, dims, space_id, error)
+  CALL check("h5screate_simple_f",error,total_error)
+
+  ! /* Create LCPL with intermediate group creation flag set */
+  CALL H5Pcreate_f(H5P_LINK_CREATE_F, lcpl_id, error)
+  CALL check("h5Pcreate_f",error,total_error)
+
+  CALL H5Pset_create_inter_group_f(lcpl_id, TRUE, error)
+  CALL check("H5Pset_create_inter_group_f",error,total_error)
+
+  ! /* Loop over using new group format */
+  ! for(new_format = FALSE; new_format <= TRUE; new_format++) {
+
+  !/* Make a FAPL that uses the "use the latest version of the format" bounds */
+  CALL H5Pcreate_f(H5P_FILE_ACCESS_F,fapl_id,error)
+  CALL check("h5Pcreate_f",error,total_error)
+  
+  ! /* Set the "use the latest version of the format" bounds for creating objects in the file */
+  
+  CALL H5Pset_libver_bounds_f(fapl_id, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
+  CALL check("H5Pset_libver_bounds_f",error, total_error)
+  
+!!$ ret = H5Pset_libver_bounds(fapl_id, (new_format ? H5F_LIBVER_LATEST : H5F_LIBVER_EARLIEST), H5F_LIBVER_LATEST);
+  
+  ! /* Create a new HDF5 file */
+  CALL H5Fcreate_f(TEST_FILENAME, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl_id)
+  CALL check("H5Fcreate_f", error, total_error)
+
+  ! /* Close the FAPL */
+  CALL h5pclose_f(fapl_id, error)
+  CALL check("h5pclose_f",error,total_error)
+  
+  ! /* Create and commit a datatype with no name */
+  CALL H5Tcopy_f( H5T_NATIVE_INTEGER, type_id, error)
+  CALL check("H5Tcopy",error,total_error)
+  
+  CALL H5Tcommit_anon_f(file_id, type_id, error) ! using no optional parameters
+  CALL check("H5Tcommit_anon",error,total_error)
+
+  CALL H5Tcommitted_f(type_id, committed, error)
+  CALL check("H5Tcommitted_f",error,total_error)
+  CALL verifyLogical("H5Tcommitted_f", committed, .TRUE., total_error)
+
+  ! /* Create a dataset with no name using the committed datatype*/
+  CALL H5Dcreate_anon_f(file_id, type_id, space_id, dset_id, error ) ! using no optional parameters
+  CALL check("H5Dcreate_anon_f",error,total_error)
+
+
+  ! /* Verify that we can write to and read from the dataset */
+  
+  ! /* Write the data to the dataset */
+
+  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, wdata, dims, error, &
+         mem_space_id=H5S_ALL_F, file_space_id=H5S_ALL_F, xfer_prp = H5P_DEFAULT_F)
+  CALL check("h5dwrite_f", error, total_error)
+
+  ! /* Read the data back */
+  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error, &
+       mem_space_id=H5S_ALL_F, file_space_id=H5S_ALL_F, xfer_prp = H5P_DEFAULT_F)
+  CALL check("h5dread_f", error, total_error)
+        
+  ! /* Verify the data */
+  DO i = 1, TEST6_DIM1
+     DO j = 1, TEST6_DIM2
+        CALL VERIFY("H5Dread_f",wdata(i,j),rdata(i,j),total_error)
+        wdata(i,j) = i*j
+     ENDDO
+  ENDDO
+
+  ! /* Create a group with no name*/
+
+  CALL H5Gcreate_anon_f(file_id, group_id, error)
+  CALL check("H5Gcreate_anon", error, total_error)
+
+  ! /* Link nameless datatype into nameless group */
+  CALL H5Olink_f(type_id, group_id, "datatype", error, H5P_DEFAULT_F)
+  CALL check("H5Olink_f", error, total_error)
+
+  ! /* Link nameless dataset into nameless group with intermediate group */
+  CALL H5Olink_f(dset_id, group_id, "inter_group/dataset", error, lcpl_id, H5P_DEFAULT_F)
+  CALL check("H5Olink_f", error, total_error)
+
+  ! /* Close IDs for dataset and datatype */
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5tclose_f(type_id, error)
+  CALL check("h5tclose_f", error, total_error)
+
+
+  ! /* Re-open datatype using new link */
+  CALL H5Topen_f(group_id, "datatype", type_id, error)
+  CALL check("h5topen_f", error, total_error)
+  
+  ! /* Link nameless group to root group and close the group ID*/
+  CALL H5Olink_f(group_id, file_id, "/group", error)
+  CALL check("H5Olink_f", error, total_error)
+  
+
+  CALL h5gclose_f(group_id, error)
+  CALL check("h5gclose_f",error,total_error)
+
+  ! /* Open dataset through root group and verify its data */
+  
+  CALL H5Dopen_f(file_id, "/group/inter_group/dataset", dset_id, error)
+  CALL check("test_lcpl.h5dopen_f", error, total_error)
+
+  ! /* Read data from dataset */
+  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error, &
+       H5S_ALL_F, H5S_ALL_F, xfer_prp = H5P_DEFAULT_F)
+  CALL check("h5dread_f", error, total_error)
+
+  ! /* Verify the data */
+  DO i = 1, TEST6_DIM1
+     DO j = 1, TEST6_DIM2
+        CALL VERIFY("H5Dread",wdata(i,j),rdata(i,j),total_error)
+     ENDDO
+  ENDDO
+  ! /* Close open IDs */
+
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5tclose_f(type_id, error)
+  CALL check("h5tclose_f",error,total_error)
+
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f",error,total_error)
+
+  ! /* Close remaining IDs */
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f",error,total_error)
+  CALL h5pclose_f(lcpl_id,error)
+  CALL check("h5pclose_f", error, total_error)
+
+END SUBROUTINE test_h5o_link
diff --git a/fortran/test/tH5R.f90 b/fortran/test/tH5R.f90
index 687bb06..9dfc374 100644
--- a/fortran/test/tH5R.f90
+++ b/fortran/test/tH5R.f90
@@ -17,377 +17,435 @@
 ! 
 !    Testing Reference Interface functionality.
 !
-!    The following subroutine tests h5rcreate_f, h5rdereference_f
+!    The following subroutine tests h5rcreate_f, h5rdereference_f, h5rget_name_f
 !    and H5Rget_object_type functions
 !
-        SUBROUTINE refobjtest(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules 
-          IMPLICIT NONE
-          LOGICAL, INTENT(IN)  :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
-
-          CHARACTER(LEN=9), PARAMETER :: filename = "reference"
-          CHARACTER(LEN=80) :: fix_filename
-          CHARACTER(LEN=8), PARAMETER :: dsetnamei = "INTEGERS"
-          CHARACTER(LEN=17), PARAMETER :: dsetnamer = "OBJECT_REFERENCES"
-          CHARACTER(LEN=6), PARAMETER :: groupname1 = "GROUP1"
-          CHARACTER(LEN=6), PARAMETER :: groupname2 = "GROUP2"
-
-          INTEGER(HID_T) :: file_id       ! File identifier 
-          INTEGER(HID_T) :: grp1_id       ! Group identifier 
-          INTEGER(HID_T) :: grp2_id       ! Group identifier 
-          INTEGER(HID_T) :: dset1_id      ! Dataset identifier 
-          INTEGER(HID_T) :: dsetr_id      ! Dataset identifier 
-          INTEGER(HID_T) :: type_id       ! Type identifier  
-          INTEGER(HID_T) :: space_id      ! Dataspace identifier 
-          INTEGER(HID_T) :: spacer_id     ! Dataspace identifier 
-          INTEGER     ::   error, obj_type
-          INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/5/)
-          INTEGER(HSIZE_T), DIMENSION(1) :: dimsr= (/4/)
-          INTEGER(HSIZE_T), DIMENSION(1) :: my_maxdims = (/5/)
-          INTEGER :: rank = 1 
-          INTEGER :: rankr = 1 
-          TYPE(hobj_ref_t_f), DIMENSION(4) ::  ref
-          TYPE(hobj_ref_t_f), DIMENSION(4) ::  ref_out
-          INTEGER(HSIZE_T), DIMENSION(1) :: ref_dim
-          INTEGER, DIMENSION(5) :: data = (/1, 2, 3, 4, 5/)
-          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-
-
-          !
-          !Create a new file with Default file access and
-          !file creation properties . 
-          !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-              CALL check("h5fcreate_f",error,total_error)
-
-
-          !
-          ! Create a group inside the file
-          !
-          CALL h5gcreate_f(file_id, groupname1, grp1_id, error)
-              CALL check("h5gcreate_f",error,total_error)
-
-          !
-          ! Create a group inside the group GROUP1
-          !
-          CALL h5gcreate_f(grp1_id, groupname2, grp2_id, error)
-              CALL check("h5gcreate_f",error,total_error)
-
-          ! 
-          ! Create dataspaces for datasets   
-          !
-          CALL h5screate_simple_f(rank, dims, space_id, error, maxdims=my_maxdims)
-              CALL check("h5screate_simple_f",error,total_error)
-          CALL h5screate_simple_f(rankr, dimsr, spacer_id, error)
-              CALL check("h5screate_simple_f",error,total_error)
-
-          !
-          ! Create integer dataset
-          !
-          CALL h5dcreate_f(file_id, dsetnamei, H5T_NATIVE_INTEGER, space_id, &
-                      dset1_id, error)
-              CALL check("h5dcreate_f",error,total_error)
-          !
-          ! Create dataset to store references to the objects
-          !
-          CALL h5dcreate_f(file_id, dsetnamer, H5T_STD_REF_OBJ, spacer_id, &
-                      dsetr_id, error)
-              CALL check("h5dcreate_f",error,total_error)
-          !
-          ! Create a datatype and store in the file
-          !
-          CALL h5tcopy_f(H5T_NATIVE_REAL, type_id, error)
-              CALL check("h5tcopy_f",error,total_error)
-          CALL h5tcommit_f(file_id, "MyType", type_id, error)
-              CALL check("h5tcommit_f",error,total_error)
-
-          !
-          !  Close dataspaces, groups and integer dataset
-          ! 
-          CALL h5sclose_f(space_id, error)
-              CALL check("h5sclose_f",error,total_error)
-          CALL h5sclose_f(spacer_id, error)         
-              CALL check("h5sclose_f",error,total_error)
-          CALL h5dclose_f(dset1_id, error)
-              CALL check("h5dclose_f",error,total_error)
-          CALL h5tclose_f(type_id, error)
-              CALL check("h5tclose_f",error,total_error)
-          CALL h5gclose_f(grp1_id, error)
-              CALL check("h5gclose_f",error,total_error)
-          CALL h5gclose_f(grp2_id, error)
-              CALL check("h5gclose_f",error,total_error)
+SUBROUTINE refobjtest(cleanup, total_error)
+  USE HDF5 ! This module contains all necessary modules 
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(OUT) :: total_error 
+  
+  CHARACTER(LEN=9), PARAMETER :: filename = "reference"
+  CHARACTER(LEN=80) :: fix_filename
+  CHARACTER(LEN=8), PARAMETER :: dsetnamei = "INTEGERS"
+  CHARACTER(LEN=17), PARAMETER :: dsetnamer = "OBJECT_REFERENCES"
+  CHARACTER(LEN=6), PARAMETER :: groupname1 = "GROUP1"
+  CHARACTER(LEN=6), PARAMETER :: groupname2 = "GROUP2"
+  
+  INTEGER(HID_T) :: file_id       ! File identifier 
+  INTEGER(HID_T) :: grp1_id       ! Group identifier 
+  INTEGER(HID_T) :: grp2_id       ! Group identifier 
+  INTEGER(HID_T) :: dset1_id      ! Dataset identifier 
+  INTEGER(HID_T) :: dsetr_id      ! Dataset identifier 
+  INTEGER(HID_T) :: type_id       ! Type identifier  
+  INTEGER(HID_T) :: space_id      ! Dataspace identifier 
+  INTEGER(HID_T) :: spacer_id     ! Dataspace identifier 
+  INTEGER     ::   error, obj_type
+  INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/5/)
+  INTEGER(HSIZE_T), DIMENSION(1) :: dimsr= (/4/)
+  INTEGER(HSIZE_T), DIMENSION(1) :: my_maxdims = (/5/)
+  INTEGER :: rank = 1 
+  INTEGER :: rankr = 1 
+  TYPE(hobj_ref_t_f), DIMENSION(4) ::  ref
+  TYPE(hobj_ref_t_f), DIMENSION(4) ::  ref_out
+  INTEGER(HSIZE_T), DIMENSION(1) :: ref_dim
+  INTEGER, DIMENSION(5) :: DATA = (/1, 2, 3, 4, 5/)
+  INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+  
+  CHARACTER(LEN=7) :: buf        ! buffer to hold the region name
+  CHARACTER(LEN=16) :: buf_big    ! buffer bigger then needed
+  CHARACTER(LEN=4) :: buf_small  ! buffer smaller then needed
+  INTEGER(SIZE_T) :: buf_size     ! returned size of the region buffer name
+  
+  !
+  !Create a new file with Default file access and
+  !file creation properties . 
+  !
+  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) "Cannot modify filename"
+     STOP
+  ENDIF
+  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+  CALL check("h5fcreate_f",error,total_error)
+              
+  
+  !
+  ! Create a group inside the file
+  !
+  CALL h5gcreate_f(file_id, groupname1, grp1_id, error)
+  CALL check("h5gcreate_f",error,total_error)
+  
+  !
+  ! Create a group inside the group GROUP1
+  !
+  CALL h5gcreate_f(grp1_id, groupname2, grp2_id, error)
+  CALL check("h5gcreate_f",error,total_error)
+  
+  ! 
+  ! Create dataspaces for datasets   
+  !
+  CALL h5screate_simple_f(rank, dims, space_id, error, maxdims=my_maxdims)
+  CALL check("h5screate_simple_f",error,total_error)
+  CALL h5screate_simple_f(rankr, dimsr, spacer_id, error)
+  CALL check("h5screate_simple_f",error,total_error)
+  
+  !
+  ! Create integer dataset
+  !
+  CALL h5dcreate_f(file_id, dsetnamei, H5T_NATIVE_INTEGER, space_id, &
+       dset1_id, error)
+  CALL check("h5dcreate_f",error,total_error)
+  !
+  ! Create dataset to store references to the objects
+  !
+  CALL h5dcreate_f(file_id, dsetnamer, H5T_STD_REF_OBJ, spacer_id, &
+       dsetr_id, error)
+  CALL check("h5dcreate_f",error,total_error)
+  !
+  ! Create a datatype and store in the file
+  !
+  CALL h5tcopy_f(H5T_NATIVE_REAL, type_id, error)
+  CALL check("h5tcopy_f",error,total_error)
+  CALL h5tcommit_f(file_id, "MyType", type_id, error)
+  CALL check("h5tcommit_f",error,total_error)
+  
+  !
+  !  Close dataspaces, groups and integer dataset
+  ! 
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f",error,total_error)
+  CALL h5sclose_f(spacer_id, error)         
+  CALL check("h5sclose_f",error,total_error)
+  CALL h5dclose_f(dset1_id, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5tclose_f(type_id, error)
+  CALL check("h5tclose_f",error,total_error)
+  CALL h5gclose_f(grp1_id, error)
+  CALL check("h5gclose_f",error,total_error)
+  CALL h5gclose_f(grp2_id, error)
+  CALL check("h5gclose_f",error,total_error)
+  
+  !
+  ! Craete references to two groups, integer dataset and shared datatype
+  ! and write it to the dataset in the file
+  !
+  CALL h5rcreate_f(file_id, groupname1, ref(1), error)
+  CALL check("h5rcreate_f",error,total_error)
+  CALL h5rcreate_f(file_id, "/GROUP1/GROUP2", ref(2), error)
+  CALL check("h5rcreate_f",error,total_error)
+  CALL h5rcreate_f(file_id, dsetnamei, ref(3), error)
+  CALL check("h5rcreate_f",error,total_error)
+  CALL h5rcreate_f(file_id, "MyType", ref(4), error)
+  CALL check("h5rcreate_f",error,total_error)
+  ref_dim(1) = SIZE(ref)
+  CALL h5dwrite_f(dsetr_id, H5T_STD_REF_OBJ, ref, ref_dim, error)
+  CALL check("h5dwrite_f",error,total_error)
+  
+  ! getting path to normal dataset in root group
+  
+  CALL H5Rget_name_f(dsetr_id, ref(1), buf, error, buf_size )
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T), total_error)
+  CALL VerifyString("H5Rget_name_f", buf, "/GROUP1", total_error)
+  
+  ! with buffer bigger then needed
+  
+  CALL H5Rget_name_f(dsetr_id, ref(1), buf_big, error, buf_size )
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T),total_error)
+  CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/GROUP1", total_error)
+  
+  ! getting path to dataset in /Group1
+  
+  CALL H5Rget_name_f(dsetr_id, ref(2), buf_big, error, buf_size )
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL VERIFY("H5Rget_name_f", buf_size,INT(14,SIZE_T),total_error)
+  CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/GROUP1/GROUP2", total_error)
+  
+  !
+  !Close the dataset
+  ! 
+  CALL h5dclose_f(dsetr_id, error)
+  CALL check("h5dclose_f",error,total_error)
+  
+  ! 
+  ! Reopen the dataset with object references
+  !
+  CALL h5dopen_f(file_id, dsetnamer,dsetr_id,error)
+  CALL check("h5dopen_f",error,total_error)
+  ref_dim(1) = SIZE(ref_out)
+  CALL h5dread_f(dsetr_id, H5T_STD_REF_OBJ, ref_out, ref_dim, error)
+  CALL check("h5dread_f",error,total_error)
+  
+  !
+  !get the third reference's type and Dereference it
+  !
+  CALL h5rget_object_type_f(dsetr_id, ref(3), obj_type, error) 
+  CALL check("h5rget_object_type_f",error,total_error)
+  IF (obj_type == H5G_DATASET_F) THEN 
+     CALL h5rdereference_f(dsetr_id, ref(3), dset1_id, error)
+     CALL check("h5rdereference_f",error,total_error)
+     
+     data_dims(1) = 5
+     CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, DATA, data_dims, error)
+     CALL check("h5dwrite_f",error,total_error)
+  END IF
+  
+  !
+  !get the fourth reference's type and Dereference it
+  !
+  CALL h5rget_object_type_f(dsetr_id, ref(4), obj_type, error) 
+  CALL check("h5rget_object_type_f",error,total_error)
+  IF (obj_type == H5G_TYPE_F) THEN 
+     CALL h5rdereference_f(dsetr_id, ref(4), type_id, error)
+     CALL check("h5rdereference_f",error,total_error)
+  END IF
+  
+  !
+  ! Close all objects.
+  !          
+  CALL h5dclose_f(dset1_id, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5tclose_f(type_id, error)
+  CALL check("h5tclose_f",error,total_error)
+  
+  CALL h5dclose_f(dsetr_id, error)
+  CALL check("h5dclose_f",error,total_error)
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f",error,total_error)
+  
+  
+  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  RETURN
+  
+END SUBROUTINE refobjtest
+!
+!   The following subroutine tests h5rget_region_f, h5rcreate_f, h5rget_name_f,
+!   and h5rdereference_f functionalities
+! 
+SUBROUTINE refregtest(cleanup, total_error)
+  USE HDF5 ! This module contains all necessary modules 
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(OUT) :: total_error 
+  
+  CHARACTER(LEN=6), PARAMETER :: filename = "Refreg"
+  CHARACTER(LEN=80) :: fix_filename
+  CHARACTER(LEN=6), PARAMETER :: dsetnamev = "MATRIX"
+  CHARACTER(LEN=17), PARAMETER :: dsetnamer = "REGION_REFERENCES"
 
+  CHARACTER(LEN=7) :: buf        ! buffer to hold the region name
+  CHARACTER(LEN=11) :: buf_big    ! buffer bigger then needed
+  CHARACTER(LEN=4) :: buf_small  ! buffer smaller then needed
+  INTEGER(SIZE_T) :: buf_size     ! returned size of the region buffer name
+  INTEGER(HID_T) :: file_id       ! File identifier 
+  INTEGER(HID_T) :: space_id      ! Dataspace identifier 
+  INTEGER(HID_T) :: spacer_id     ! Dataspace identifier 
+  INTEGER(HID_T) :: dsetv_id      ! Dataset identifier 
+  INTEGER(HID_T) :: dsetr_id      ! Dataset identifier 
+  INTEGER     ::   error
+  TYPE(hdset_reg_ref_t_f) , DIMENSION(2) :: ref     ! Buffers to store references
+  TYPE(hdset_reg_ref_t_f) , DIMENSION(2) :: ref_out !
+  INTEGER(HSIZE_T), DIMENSION(2) :: ref_dim
+  INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+  INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/2,9/)  ! Datasets dimensions
+  INTEGER(HSIZE_T), DIMENSION(1) :: dimsr = (/2/)   ! 
+  INTEGER(HSIZE_T), DIMENSION(2) :: start
+  INTEGER(HSIZE_T), DIMENSION(2) :: count
+  INTEGER :: rankr = 1 
+  INTEGER :: rank = 2
+  INTEGER , DIMENSION(2,9) ::  DATA 
+  INTEGER , DIMENSION(2,9) ::  data_out = 0 
+  INTEGER(HSIZE_T) , DIMENSION(2,3) :: coord
+  INTEGER(SIZE_T) ::num_points = 3  ! Number of selected points
+  coord = RESHAPE((/1,1,2,7,1,9/), (/2,3/))   ! Coordinates of selected points
+  DATA = RESHAPE ((/1,1,1,2,2,2,3,3,3,4,4,4,5,5,5,6,6,6/), (/2,9/))
 
-          !
-          ! Craete references to two groups, integer dataset and shared datatype
-          ! and write it to the dataset in the file
-          !
-          CALL h5rcreate_f(file_id, groupname1, ref(1), error)
-              CALL check("h5rcreate_f",error,total_error)
-          CALL h5rcreate_f(file_id, "/GROUP1/GROUP2", ref(2), error)
-              CALL check("h5rcreate_f",error,total_error)
-          CALL h5rcreate_f(file_id, dsetnamei, ref(3), error)
-              CALL check("h5rcreate_f",error,total_error)
-          CALL h5rcreate_f(file_id, "MyType", ref(4), error)
-              CALL check("h5rcreate_f",error,total_error)
-          ref_dim(1) = size(ref)
-          CALL h5dwrite_f(dsetr_id, H5T_STD_REF_OBJ, ref, ref_dim, error)
-              CALL check("h5dwrite_f",error,total_error)
+  !
+  !  Initialize FORTRAN predefined datatypes.
+  !
+  !          CALL h5init_types_f(error)
+  !              CALL check("h5init_types_f", error, total_error)
+  !
+  !  Create a new file.
+  !
+  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) "Cannot modify filename"
+     STOP
+  ENDIF
+  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+  ! Default file access and file creation
+  ! properties are used. 
+  CALL check("h5fcreate_f", error, total_error)
+  ! 
+  ! Create  dataspaces:
+  ! 
+  ! for dataset with references to dataset regions 
+  !
+  CALL h5screate_simple_f(rankr, dimsr, spacer_id, error)
+  CALL check("h5screate_simple_f", error, total_error)
+  !
+  ! for integer dataset 
+  !
+  CALL h5screate_simple_f(rank, dims, space_id, error)
+  CALL check("h5screate_simple_f", error, total_error)
+  !
+  ! Create  and write datasets:
+  !
+  ! Integer dataset 
+  !
+  CALL h5dcreate_f(file_id, dsetnamev, H5T_NATIVE_INTEGER, space_id, &
+       dsetv_id, error)
+  CALL check("h5dcreate_f", error, total_error)
+  data_dims(1) = 2
+  data_dims(2) = 9 
+  CALL h5dwrite_f(dsetv_id, H5T_NATIVE_INTEGER, DATA, data_dims, error)
+  CALL check("h5dwrite_f", error, total_error)
 
-          !
-          !Close the dataset
-          ! 
-          CALL h5dclose_f(dsetr_id, error)
-              CALL check("h5dclose_f",error,total_error)
-          ! 
-          ! Reopen the dataset with object references
-          !
-          CALL h5dopen_f(file_id, dsetnamer,dsetr_id,error)
-              CALL check("h5dopen_f",error,total_error)
-          ref_dim(1) = size(ref_out)
-          CALL h5dread_f(dsetr_id, H5T_STD_REF_OBJ, ref_out, ref_dim, error)
-              CALL check("h5dread_f",error,total_error)
-   
-          !
-          !get the third reference's type and Dereference it
-          !
-          CALL h5rget_object_type_f(dsetr_id, ref(3), obj_type, error) 
-              CALL check("h5rget_object_type_f",error,total_error)
-          if (obj_type == H5G_DATASET_F) then 
-              CALL h5rdereference_f(dsetr_id, ref(3), dset1_id, error)
-                  CALL check("h5rdereference_f",error,total_error)
-          
-              data_dims(1) = 5
-              CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, data, data_dims, error)
-                  CALL check("h5dwrite_f",error,total_error)
-          end if
+  CALL h5dclose_f(dsetv_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  !
+  ! Dataset with references
+  !
+  CALL h5dcreate_f(file_id, dsetnamer, H5T_STD_REF_DSETREG, spacer_id, &
+       dsetr_id, error)
+  CALL check("h5dcreate_f", error, total_error)
+  !
+  ! Create a reference to the hyperslab selection.
+  !
+  start(1) = 0 
+  start(2) = 3 
+  COUNT(1) = 2
+  COUNT(2) = 3
+  CALL h5sselect_hyperslab_f(space_id, H5S_SELECT_SET_F, &
+       start, count, error) 
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+  CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(1), error) 
+  CALL check("h5rcreate_f", error, total_error)
+  !
+  ! Create a reference to elements selection.
+  !
+  CALL h5sselect_none_f(space_id, error)
+  CALL check("h5sselect_none_f", error, total_error)
+  CALL h5sselect_elements_f(space_id, H5S_SELECT_SET_F, rank, num_points,&
+       coord, error) 
+  CALL check("h5sselect_elements_f", error, total_error)
+  CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(2), error) 
+  CALL check("h5rcreate_f", error, total_error)
+  !
+  ! Write dataset with the references. 
+  !
+  ref_dim(1) = SIZE(ref)
+  CALL h5dwrite_f(dsetr_id, H5T_STD_REF_DSETREG, ref, ref_dim, error) 
+  CALL check("h5dwrite_f", error, total_error)
+  !
+  ! Close all objects.
+  !
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5sclose_f(spacer_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5dclose_f(dsetr_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f", error, total_error)
+  !
+  ! Reopen the file to test selections.
+  !
+  CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
+  CALL check("h5fopen_f", error, total_error)
+  CALL h5dopen_f(file_id, dsetnamer, dsetr_id, error)
+  CALL check("h5dopen_f", error, total_error)
+  !
+  ! Read references to the dataset regions.
+  !
+  ref_dim(1) = SIZE(ref_out)
+  CALL h5dread_f(dsetr_id, H5T_STD_REF_DSETREG, ref_out, ref_dim, error) 
+  CALL check("h5dread_f", error, total_error)
 
-          !
-          !get the fourth reference's type and Dereference it
-          !
-          CALL h5rget_object_type_f(dsetr_id, ref(4), obj_type, error) 
-              CALL check("h5rget_object_type_f",error,total_error)
-          if (obj_type == H5G_TYPE_F) then 
-              CALL h5rdereference_f(dsetr_id, ref(4), type_id, error)
-                  CALL check("h5rdereference_f",error,total_error)
-          end if
 
-          !
-          ! Close all objects.
-          !          
-          CALL h5dclose_f(dset1_id, error)
-              CALL check("h5dclose_f",error,total_error)
-          CALL h5tclose_f(type_id, error)
-              CALL check("h5tclose_f",error,total_error)
+  ! Get name of the dataset the first region reference points to using H5Rget_name_f
+  CALL H5Rget_name_f(dsetr_id, ref_out(1), buf, error, buf_size )
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T),total_error)
+  CALL VerifyString("H5Rget_name_f", buf, "/MATRIX", total_error)
 
-          CALL h5dclose_f(dsetr_id, error)
-              CALL check("h5dclose_f",error,total_error)
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f",error,total_error)
+  ! Get name of the dataset the first region reference points to using H5Rget_name_f
+  ! buffer bigger then needed
+  CALL H5Rget_name_f(dsetr_id, ref_out(1), buf_big, error, buf_size )
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T),total_error)
+  CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/MATRIX", total_error)
 
 
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          RETURN
+  ! Get name of the dataset the first region reference points to using H5Rget_name_f
+  ! buffer smaller then needed
+  CALL H5Rget_name_f(dsetr_id, ref_out(1), buf_small, error, buf_size )
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T),total_error)
+  CALL VerifyString("H5Rget_name_f", TRIM(buf_small), "/MAT", total_error)
 
-        END SUBROUTINE refobjtest
-!
-!   The following subroutine tests h5rget_region_f, h5rcreate_f
-!   and h5rdereference_f functionalities
-! 
-        SUBROUTINE refregtest(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules 
-          IMPLICIT NONE
-          LOGICAL, INTENT(IN)  :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
+  ! 
+  ! Dereference the first reference.
+  ! 
+  CALL H5rdereference_f(dsetr_id, ref_out(1), dsetv_id, error)
+  CALL check("h5rdereference_f", error, total_error)
+  CALL H5rget_region_f(dsetr_id, ref_out(1), space_id, error) 
+  CALL check("h5rget_region_f", error, total_error)
 
-          CHARACTER(LEN=6), PARAMETER :: filename = "Refreg"
-          CHARACTER(LEN=80) :: fix_filename
-          CHARACTER(LEN=6), PARAMETER :: dsetnamev = "MATRIX"
-          CHARACTER(LEN=17), PARAMETER :: dsetnamer = "REGION_REFERENCES"
+  ! Get name of the dataset the second region reference points to using H5Rget_name_f
+  CALL H5Rget_name_f(dsetr_id, ref_out(2), buf, error) ! no optional size
+  CALL check("H5Rget_name_f", error, total_error)
+  CALL VerifyString("H5Rget_name_f", buf, "/MATRIX", total_error)
 
-          INTEGER(HID_T) :: file_id       ! File identifier 
-          INTEGER(HID_T) :: space_id      ! Dataspace identifier 
-          INTEGER(HID_T) :: spacer_id     ! Dataspace identifier 
-          INTEGER(HID_T) :: dsetv_id      ! Dataset identifier 
-          INTEGER(HID_T) :: dsetr_id      ! Dataset identifier 
-          INTEGER     ::   error
-          TYPE(hdset_reg_ref_t_f) , DIMENSION(2) :: ref     ! Buffers to store references
-          TYPE(hdset_reg_ref_t_f) , DIMENSION(2) :: ref_out !
-          INTEGER(HSIZE_T), DIMENSION(2) :: ref_dim
-          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-          INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/2,9/)  ! Datasets dimensions
-          INTEGER(HSIZE_T), DIMENSION(1) :: dimsr = (/2/)   ! 
-          INTEGER(HSIZE_T), DIMENSION(2) :: start
-          INTEGER(HSIZE_T), DIMENSION(2) :: count
-          INTEGER :: rankr = 1 
-          INTEGER :: rank = 2
-          INTEGER , DIMENSION(2,9) ::  data 
-          INTEGER , DIMENSION(2,9) ::  data_out = 0 
-          INTEGER(HSIZE_T) , DIMENSION(2,3) :: coord
-          INTEGER(SIZE_T) ::num_points = 3  ! Number of selected points
-          INTEGER :: i, j
-          coord = reshape((/1,1,2,7,1,9/), (/2,3/))   ! Coordinates of selected points
-          data = reshape ((/1,1,1,2,2,2,3,3,3,4,4,4,5,5,5,6,6,6/), (/2,9/))
 
-          !
-          !  Initialize FORTRAN predefined datatypes.
-          !
-!          CALL h5init_types_f(error)
-!              CALL check("h5init_types_f", error, total_error)
-          !
-          !  Create a new file.
-          !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-          ! Default file access and file creation
-          ! properties are used. 
-              CALL check("h5fcreate_f", error, total_error)
-          ! 
-          ! Create  dataspaces:
-          ! 
-          ! for dataset with references to dataset regions 
-          !
-          CALL h5screate_simple_f(rankr, dimsr, spacer_id, error)
-              CALL check("h5screate_simple_f", error, total_error)
-          !
-          ! for integer dataset 
-          !
-          CALL h5screate_simple_f(rank, dims, space_id, error)
-              CALL check("h5screate_simple_f", error, total_error)
-          !
-          ! Create  and write datasets:
-          !
-          ! Integer dataset 
-          !
-          CALL h5dcreate_f(file_id, dsetnamev, H5T_NATIVE_INTEGER, space_id, &
-               dsetv_id, error)
-              CALL check("h5dcreate_f", error, total_error)
-          data_dims(1) = 2
-          data_dims(2) = 9 
-          CALL h5dwrite_f(dsetv_id, H5T_NATIVE_INTEGER, data, data_dims, error)
-              CALL check("h5dwrite_f", error, total_error)
+  !
+  ! Read selected data from the dataset.
+  !
+  data_dims(1) = 2
+  data_dims(2) = 9
+  CALL h5dread_f(dsetv_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
+       mem_space_id = space_id, file_space_id = space_id)
+  CALL check("h5dread_f", error, total_error)
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5dclose_f(dsetv_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  data_out = 0
+  !  
+  ! Dereference the second reference.
+  ! 
+  CALL H5rdereference_f(dsetr_id, ref_out(2), dsetv_id, error)
+  CALL check("h5rdereference_f", error, total_error)
 
-          CALL h5dclose_f(dsetv_id, error)
-              CALL check("h5dclose_f", error, total_error)
-          !
-          ! Dataset with references
-          !
-          CALL h5dcreate_f(file_id, dsetnamer, H5T_STD_REF_DSETREG, spacer_id, &
-               dsetr_id, error)
-              CALL check("h5dcreate_f", error, total_error)
-          !
-          ! Create a reference to the hyperslab selection.
-          !
-          start(1) = 0 
-          start(2) = 3 
-          count(1) = 2
-          count(2) = 3
-          CALL h5sselect_hyperslab_f(space_id, H5S_SELECT_SET_F, &
-               start, count, error) 
-              CALL check("h5sselect_hyperslab_f", error, total_error)
-          CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(1), error) 
-              CALL check("h5rcreate_f", error, total_error)
-          !
-          ! Create a reference to elements selection.
-          !
-          CALL h5sselect_none_f(space_id, error)
-              CALL check("h5sselect_none_f", error, total_error)
-          CALL h5sselect_elements_f(space_id, H5S_SELECT_SET_F, rank, num_points,&
-               coord, error) 
-              CALL check("h5sselect_elements_f", error, total_error)
-          CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(2), error) 
-              CALL check("h5rcreate_f", error, total_error)
-          !
-          ! Write dataset with the references. 
-          !
-          ref_dim(1) = size(ref)
-          CALL h5dwrite_f(dsetr_id, H5T_STD_REF_DSETREG, ref, ref_dim, error) 
-              CALL check("h5dwrite_f", error, total_error)
-          !
-          ! Close all objects.
-          !
-          CALL h5sclose_f(space_id, error)
-              CALL check("h5sclose_f", error, total_error)
-          CALL h5sclose_f(spacer_id, error)
-              CALL check("h5sclose_f", error, total_error)
-          CALL h5dclose_f(dsetr_id, error)
-              CALL check("h5dclose_f", error, total_error)
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
-          !
-          ! Reopen the file to test selections.
-          !
-          CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
-              CALL check("h5fopen_f", error, total_error)
-          CALL h5dopen_f(file_id, dsetnamer, dsetr_id, error)
-              CALL check("h5dopen_f", error, total_error)
-          !
-          ! Read references to the dataset regions.
-          !
-          ref_dim(1) = size(ref_out)
-          CALL h5dread_f(dsetr_id, H5T_STD_REF_DSETREG, ref_out, ref_dim, error) 
-              CALL check("h5dread_f", error, total_error)
-          ! 
-          ! Dereference the first reference.
-          ! 
-          CALL H5rdereference_f(dsetr_id, ref_out(1), dsetv_id, error)
-              CALL check("h5rdereference_f", error, total_error)
-          CALL H5rget_region_f(dsetr_id, ref_out(1), space_id, error) 
-              CALL check("h5rget_region_f", error, total_error)
-          !
-          ! Read selected data from the dataset.
-          !
-          data_dims(1) = 2
-          data_dims(2) = 9
-          CALL h5dread_f(dsetv_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
-               mem_space_id = space_id, file_space_id = space_id)
-              CALL check("h5dread_f", error, total_error)
-          CALL h5sclose_f(space_id, error)
-              CALL check("h5sclose_f", error, total_error)
-          CALL h5dclose_f(dsetv_id, error)
-              CALL check("h5dclose_f", error, total_error)
-          data_out = 0
-          !  
-          ! Dereference the second reference.
-          ! 
-          CALL H5rdereference_f(dsetr_id, ref_out(2), dsetv_id, error)
-              CALL check("h5rdereference_f", error, total_error)
-           
-          CALL H5rget_region_f(dsetr_id, ref_out(2), space_id, error) 
-              CALL check("h5rget_region_f", error, total_error)
-          !
-          ! Read selected data from the dataset.
-          !
-          CALL h5dread_f(dsetv_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
-               mem_space_id = space_id, file_space_id = space_id)
-              CALL check("h5dread_f", error, total_error)
-          !
-          ! Close all objects
-          !
-          CALL h5sclose_f(space_id, error)
-              CALL check("h5sclose_f", error, total_error)
-          CALL h5dclose_f(dsetv_id, error)
-              CALL check("h5dclose_f", error, total_error)
-          CALL h5dclose_f(dsetr_id, error)
-              CALL check("h5dclose_f", error, total_error)
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
+  CALL H5rget_region_f(dsetr_id, ref_out(2), space_id, error) 
+  CALL check("h5rget_region_f", error, total_error)
+  !
+  ! Read selected data from the dataset.
+  !
+  CALL h5dread_f(dsetv_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
+       mem_space_id = space_id, file_space_id = space_id)
+  CALL check("h5dread_f", error, total_error)
+  !
+  ! Close all objects
+  !
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5dclose_f(dsetv_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5dclose_f(dsetr_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f", error, total_error)
 
 
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
-          RETURN
+  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  RETURN
 
-        END SUBROUTINE refregtest
+END SUBROUTINE refregtest
 
diff --git a/fortran/test/tH5Sselect.f90 b/fortran/test/tH5Sselect.f90
index 2f77db9..a004ba7 100644
--- a/fortran/test/tH5Sselect.f90
+++ b/fortran/test/tH5Sselect.f90
@@ -52,10 +52,6 @@
     !
     INTEGER(HSIZE_T), DIMENSION(3) :: dimsm = (/7,7,3/)
 
-    !
-    !to get Dataset dimensions 
-    !
-    INTEGER(HSIZE_T), DIMENSION(2) :: dims_out
 
     !
     !Dataset dimensions 
@@ -103,21 +99,18 @@
     !
     INTEGER :: memrank = 3
 
-    !
-    !integer to get the dataspace rank from dataset
-    !
-    INTEGER :: rank 
+
 
 
     !
     !general purpose integer 
     !
-    INTEGER :: i, j, k 
+    INTEGER :: i, j 
 
     !
     !flag to check operation success 
     !
-    INTEGER :: error, error_n 
+    INTEGER :: error 
     INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
 
 
@@ -397,8 +390,7 @@
     !
     !flag to check operation success 
     !
-    INTEGER :: error 
-    LOGICAL :: status
+    INTEGER :: error
     INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
 
 
@@ -720,8 +712,7 @@
 
      INTEGER(HID_T) :: file_id       ! File identifier 
      INTEGER(HID_T) :: dset_id       ! Dataset identifier 
-     INTEGER(HID_T) :: dataspace     ! Dataspace identifier 
-     INTEGER(HID_T) :: memspace      ! memspace identifier 
+     INTEGER(HID_T) :: dataspace     ! Dataspace identifier
 
      !
      !Dataset dimensions 
@@ -763,10 +754,6 @@
      !
      INTEGER(HSIZE_T), DIMENSION(RANK, NUMPS) :: coord
 
-     !
-     !Size of the hyperslab in memory 
-     !
-     INTEGER(HSIZE_T), DIMENSION(3) :: count_out = (/3,4,1/)
 
      !
      !Number of hyperslabs selected in the current dataspace 
@@ -802,19 +789,9 @@
      INTEGER, DIMENSION(5,6) :: data
 
      !
-     !output buffer 
-     !
-     INTEGER, DIMENSION(7,7,3) :: data_out
-
-     !
-     !general purpose integer 
-     !
-     INTEGER :: i, j, k 
-
-     !
      !flag to check operation success 
      !
-     INTEGER :: error, error_n 
+     INTEGER :: error
      INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
 
      !
diff --git a/fortran/test/tH5T.f90 b/fortran/test/tH5T.f90
index 3bbb974..4857a2b 100644
--- a/fortran/test/tH5T.f90
+++ b/fortran/test/tH5T.f90
@@ -27,7 +27,7 @@
 ! The following H5T interface functions are tested:
 ! h5tcopy_f, h5tset(get)_size_f, h5tcreate_f, h5tinsert_f,  h5tclose_f,
 ! h5tget_class_f, h5tget_member_name_f, h5tget_member_offset_f, h5tget_member_type_f,
-! h5tequal_f, h5tinsert_array_f, h5tcommit_f
+! h5tequal_f, h5tinsert_array_f, h5tcommit_f, h5tencode_f, h5tdecode_f
 
 
      USE HDF5 ! This module contains all necessary modules 
@@ -88,6 +88,12 @@
      INTEGER(SIZE_T) :: sizechar
      INTEGER(HSIZE_T), DIMENSION(1) :: data_dims
      LOGICAL :: flag = .TRUE.
+     
+     CHARACTER(LEN=1024) :: cmpd_buf
+     INTEGER(size_t) :: cmpd_buf_size=0
+     INTEGER(hid_t) :: decoded_sid1
+     INTEGER :: decoded_tid1
+
      data_dims(1) = dimsize
      !
      ! Initialize data buffer.
@@ -176,7 +182,36 @@
      !
      offset = offset + type_sized  ! Offset of the last member is 14
      CALL h5tinsert_f(dtype_id, "real_field", offset, H5T_NATIVE_REAL, error)
-         CALL check("h5tinsert_f", error, total_error)
+     CALL check("h5tinsert_f", error, total_error)
+
+!!$     !/*-----------------------------------------------------------------------
+!!$     ! * Test encoding and decoding compound  datatypes
+!!$     ! *-----------------------------------------------------------------------
+!!$     !*/
+!!$     !    /* Encode compound type in a buffer */
+!!$
+!!$     !         First find the buffer size
+!!$
+!!$     CALL H5Tencode_f(dtype_id, cmpd_buf, cmpd_buf_size, error)
+!!$     CALL check("H5Tencode_f", error, total_error)
+!!$
+!!$     ! /* Try decoding bogus buffer */
+!!$
+!!$     CALL H5Tdecode_f(cmpd_buf, decoded_tid1, error)
+!!$     CALL VERIFY("H5Tdecode_f", error, -1, total_error)  
+!!$     
+!!$     CALL H5Tencode_f(dtype_id, cmpd_buf, cmpd_buf_size, error)
+!!$     CALL check("H5Tencode_f", error, total_error)
+!!$
+!!$     ! /* Decode from the compound buffer and return an object handle */
+!!$     CALL H5Tdecode_f(cmpd_buf, decoded_tid1, error)
+!!$     CALL check("H5Tdecode_f", error, total_error)  
+!!$
+!!$     ! /* Verify that the datatype was copied exactly */
+!!$     
+!!$     CALL H5Tequal_f(decoded_tid1, dtype_id, flag, error)
+!!$     CALL check("H5Tequal_f", error, total_error) 
+!!$     CALL VerifyLogical("H5Tequal_f", flag, .TRUE., total_error)
 
      !
      ! Create the dataset with compound datatype.
@@ -485,7 +520,33 @@
             endif
          enddo
      !
+     ! *-----------------------------------------------------------------------
+     ! * Test encoding and decoding compound datatypes
+     ! *-----------------------------------------------------------------------
+     !
+     !    /* Encode compound type in a buffer */
+     !         -- First find the buffer size
+
+     CALL H5Tencode_f(dtype_id, cmpd_buf, cmpd_buf_size, error)
+     CALL check("H5Tencode_f", error, total_error)
 
+     ! /* Try decoding bogus buffer */
+
+     CALL H5Tdecode_f(cmpd_buf, decoded_tid1, error)
+     CALL VERIFY("H5Tdecode_f", error, -1, total_error)  
+     
+     CALL H5Tencode_f(dtype_id, cmpd_buf, cmpd_buf_size, error)
+     CALL check("H5Tencode_f", error, total_error)
+
+     ! /* Decode from the compound buffer and return an object handle */
+     CALL H5Tdecode_f(cmpd_buf, decoded_tid1, error)
+     CALL check("H5Tdecode_f", error, total_error)  
+
+     ! /* Verify that the datatype was copied exactly */
+     
+     CALL H5Tequal_f(decoded_tid1, dtype_id, flag, error)
+     CALL check("H5Tequal_f", error, total_error) 
+     CALL VerifyLogical("H5Tequal_f", flag, .TRUE., total_error)
      !
      ! Close all open objects.
      !
diff --git a/fortran/test/tH5VL.f90 b/fortran/test/tH5VL.f90
index 998fef5..13f2af1 100644
--- a/fortran/test/tH5VL.f90
+++ b/fortran/test/tH5VL.f90
@@ -364,7 +364,6 @@
           INTEGER(HID_T) :: file_id       ! File identifier 
           INTEGER(HID_T) :: dset_id       ! Dataset identifier 
           INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-          INTEGER(HID_T) :: vltype_id     ! Datatype identifier
 
 
           INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/4/) ! Dataset dimensions
@@ -374,10 +373,9 @@
 
           CHARACTER(LEN=10), DIMENSION(4) :: string_data ! Array of strings
           CHARACTER(LEN=10), DIMENSION(4) :: string_data_out     ! Data buffers
-          CHARACTER(LEN=10) :: tmp_str
           INTEGER     ::   error ! Error flag
 
-          INTEGER     :: i, j    !general purpose integers
+          INTEGER     :: i    !general purpose integers
           INTEGER(HSIZE_T), DIMENSION(2) :: data_dims = (/10,4/)
           INTEGER(HID_T) :: vl_type_id
           LOGICAL        :: vl_flag
diff --git a/fortran/test/tH5Z.f90 b/fortran/test/tH5Z.f90
index 2a71961..ea567a2 100644
--- a/fortran/test/tH5Z.f90
+++ b/fortran/test/tH5Z.f90
@@ -22,7 +22,7 @@
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
      INTEGER, INTENT(OUT) :: total_error 
-     LOGICAL :: status, status1
+     LOGICAL :: status
      INTEGER(HID_T)    :: crtpr_id, xfer_id
      INTEGER           :: nfilters
      INTEGER           :: error
diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90
index 673a8e2..eb033b6 100644
--- a/fortran/test/tf.f90
+++ b/fortran/test/tf.f90
@@ -23,30 +23,60 @@
 !DEC$attributes dllexport :: check
 !DEC$endif
 
-         SUBROUTINE check(string,error,total_error)
-            CHARACTER(LEN=*) :: string
-            INTEGER :: error, total_error
-            if (error .lt. 0) then
-                total_error=total_error+1
-                write(*,*) string, " failed"
-            endif
-            RETURN
-         END SUBROUTINE check   
-
+SUBROUTINE check(string,error,total_error)
+  CHARACTER(LEN=*) :: string
+  INTEGER :: error, total_error
+  IF (error .LT. 0) THEN
+     total_error=total_error+1
+     WRITE(*,*) string, " FAILED"
+  ENDIF
+  RETURN
+END SUBROUTINE check
 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: verify
 !DEC$endif
-         SUBROUTINE verify(string,value,correct_value,total_error)
-            CHARACTER(LEN=*) :: string
-            INTEGER :: value, correct_value, total_error
-            if (value .ne. correct_value) then
-                total_error=total_error+1
-                write(*,*) string
-            endif
-            RETURN
-         END SUBROUTINE verify
+SUBROUTINE VERIFY(string,value,correct_value,total_error)
+  CHARACTER(LEN=*) :: string
+  INTEGER :: value, correct_value, total_error
+  IF (value .NE. correct_value) THEN
+     total_error=total_error+1
+     WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string
+  ENDIF
+  RETURN
+END SUBROUTINE verify
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: verifyLogical
+!DEC$endif
+SUBROUTINE verifyLogical(string,value,correct_value,total_error)
+  CHARACTER(LEN=*) :: string
+  LOGICAL :: value, correct_value
+  INTEGER :: total_error
+  IF (value .NEQV. correct_value) THEN
+     total_error = total_error + 1
+     WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string
+  ENDIF
+  RETURN
+END SUBROUTINE verifyLogical
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: verifyLogical
+!DEC$endif
+SUBROUTINE verifyString(string, value,correct_value,total_error)
+  CHARACTER(LEN=*) :: string
+  CHARACTER(LEN=*) :: value, correct_value
+  INTEGER :: total_error
+  IF (TRIM(value) .NE. TRIM(correct_value)) THEN
+     total_error = total_error + 1
+     WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string
+  ENDIF
+  RETURN
+END SUBROUTINE verifyString
+
 
 !----------------------------------------------------------------------
 ! Name:		h5_fixname_f 
@@ -68,46 +98,46 @@
 !
 !
 !----------------------------------------------------------------------
-          SUBROUTINE h5_fixname_f(base_name, full_name, fapl, hdferr)
+SUBROUTINE h5_fixname_f(base_name, full_name, fapl, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5_fixname_f
 !DEC$endif
-            USE H5GLOBAL           
-            IMPLICIT NONE
-            CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name 
-            CHARACTER(LEN=*), INTENT(IN) :: full_name   ! full name 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
-            INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
-
-            INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
-            INTEGER(SIZE_T) :: full_namelen ! Length of the full name character string
+  USE H5GLOBAL           
+  IMPLICIT NONE
+  CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name 
+  CHARACTER(LEN=*), INTENT(IN) :: full_name   ! full name 
+  INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+  INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
+  
+  INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
+  INTEGER(SIZE_T) :: full_namelen ! Length of the full name character string
 !            INTEGER(HID_T) :: fapl_default
 
-            INTERFACE
-              INTEGER FUNCTION h5_fixname_c(base_name, base_namelen, fapl, &
-                               full_name, full_namelen)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_FIXNAME_C':: h5_fixname_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: base_name 
-              !DEC$ATTRIBUTES reference :: full_name 
-              CHARACTER(LEN=*), INTENT(IN) :: base_name
-              INTEGER(SIZE_T) :: base_namelen
-              INTEGER(HID_T), INTENT(IN) :: fapl
-              CHARACTER(LEN=*), INTENT(IN) :: full_name
-              INTEGER(SIZE_T) :: full_namelen
-              END FUNCTION h5_fixname_c
-            END INTERFACE
-
-            base_namelen = LEN(base_name)
-            full_namelen = LEN(full_name)
-            hdferr = h5_fixname_c(base_name, base_namelen, fapl, &
-                     full_name, full_namelen) 
-
-          END SUBROUTINE h5_fixname_f
+  INTERFACE
+     INTEGER FUNCTION h5_fixname_c(base_name, base_namelen, fapl, &
+          full_name, full_namelen)
+       USE H5GLOBAL
+       !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+       !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_FIXNAME_C':: h5_fixname_c
+       !DEC$ ENDIF
+       !DEC$ATTRIBUTES reference :: base_name 
+       !DEC$ATTRIBUTES reference :: full_name 
+       CHARACTER(LEN=*), INTENT(IN) :: base_name
+       INTEGER(SIZE_T) :: base_namelen
+       INTEGER(HID_T), INTENT(IN) :: fapl
+       CHARACTER(LEN=*), INTENT(IN) :: full_name
+       INTEGER(SIZE_T) :: full_namelen
+     END FUNCTION h5_fixname_c
+  END INTERFACE
+  
+  base_namelen = LEN(base_name)
+  full_namelen = LEN(full_name)
+  hdferr = h5_fixname_c(base_name, base_namelen, fapl, &
+       full_name, full_namelen) 
+  
+END SUBROUTINE h5_fixname_f
           
 !----------------------------------------------------------------------
 ! Name:		h5_cleanup_f 
@@ -128,37 +158,37 @@
 !
 !
 !----------------------------------------------------------------------
-          SUBROUTINE h5_cleanup_f(base_name, fapl, hdferr)
+SUBROUTINE h5_cleanup_f(base_name, fapl, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5_cleanup_f
 !DEC$endif
-            USE H5GLOBAL           
-            IMPLICIT NONE
-            CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
-            INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
-
-            INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
-
-            INTERFACE
-              INTEGER FUNCTION h5_cleanup_c(base_name, base_namelen, fapl)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_CLEANUP_C':: h5_cleanup_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: base_name 
-              CHARACTER(LEN=*), INTENT(IN) :: base_name
-              INTEGER(SIZE_T) :: base_namelen
-              INTEGER(HID_T), INTENT(IN) :: fapl
-              END FUNCTION h5_cleanup_c
-            END INTERFACE
-
-            base_namelen = LEN(base_name)
-            hdferr = h5_cleanup_c(base_name, base_namelen, fapl)
-
-          END SUBROUTINE h5_cleanup_f
+  USE H5GLOBAL           
+  IMPLICIT NONE
+  CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name 
+  INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+  INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
+  
+  INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
+  
+  INTERFACE
+     INTEGER FUNCTION h5_cleanup_c(base_name, base_namelen, fapl)
+       USE H5GLOBAL
+       !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+       !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_CLEANUP_C':: h5_cleanup_c
+       !DEC$ ENDIF
+       !DEC$ATTRIBUTES reference :: base_name 
+       CHARACTER(LEN=*), INTENT(IN) :: base_name
+       INTEGER(SIZE_T) :: base_namelen
+       INTEGER(HID_T), INTENT(IN) :: fapl
+     END FUNCTION h5_cleanup_c
+  END INTERFACE
+  
+  base_namelen = LEN(base_name)
+  hdferr = h5_cleanup_c(base_name, base_namelen, fapl)
+  
+END SUBROUTINE h5_cleanup_f
 
 !----------------------------------------------------------------------
 ! Name:		h5_exit_f 
@@ -180,25 +210,25 @@
 !
 !
 !----------------------------------------------------------------------
-          SUBROUTINE h5_exit_f(status)
+SUBROUTINE h5_exit_f(status)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5_exit_f
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER, INTENT(IN) :: status         ! Return code
-
-            INTERFACE
-              SUBROUTINE h5_exit_c(status)
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_EXIT_C':: h5_exit_c
-              !DEC$ ENDIF
-              INTEGER, INTENT(IN) :: status
-              END SUBROUTINE h5_exit_c
-            END INTERFACE
-
-            CALL h5_exit_c(status)
-
-          END SUBROUTINE h5_exit_f
+  IMPLICIT NONE
+  INTEGER, INTENT(IN) :: status         ! Return code
+  
+  INTERFACE
+     SUBROUTINE h5_exit_c(status)
+       !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+       !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_EXIT_C':: h5_exit_c
+       !DEC$ ENDIF
+       INTEGER, INTENT(IN) :: status
+     END SUBROUTINE h5_exit_c
+  END INTERFACE
+  
+  CALL h5_exit_c(status)
+  
+END SUBROUTINE h5_exit_f 
 
diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c
index e80f86c..3502b3a 100644
--- a/hl/src/H5TB.c
+++ b/hl/src/H5TB.c
@@ -1353,7 +1353,9 @@ herr_t H5TBdelete_record( hid_t loc_id,
  size_t   *src_offset;
  size_t   *src_sizes;
  hsize_t  nrows;
+#if defined (SHRINK)
  hsize_t  dims[1];
+#endif
 
 
 /*-------------------------------------------------------------------------
@@ -1441,9 +1443,11 @@ herr_t H5TBdelete_record( hid_t loc_id,
  * Change the table dimension
  *-------------------------------------------------------------------------
  */
+#if defined (SHRINK)
  dims[0] = ntotal_records - nrecords;
  if(H5Dset_extent( did, dims ) < 0)
   goto out;
+#endif
 
  /* End access to the dataset */
  if(H5Dclose( did ) < 0)
diff --git a/perform/Makefile.am b/perform/Makefile.am
index f82def8..e2c5822 100644
--- a/perform/Makefile.am
+++ b/perform/Makefile.am
@@ -39,11 +39,10 @@ endif
 
 # These are the programs that `make all' or `make tests' will build and which
 # `make check' will run. List them in the order they should be run.
-TEST_PROG = iopipe chunk overhead zip_perf perf_meta h5perf_serial $(BUILD_ALL_PROGS)
+TEST_PROG = iopipe chunk overhead zip_perf perf_meta $(BUILD_ALL_PROGS)
 check_PROGRAMS=$(TEST_PROG_PARA) $(TEST_PROG)
 
 h5perf_SOURCES=pio_perf.c pio_engine.c pio_timer.c
-h5perf_serial_SOURCES=sio_perf.c sio_engine.c sio_timer.c
 
 # These are the files that `make clean' (and derivatives) will remove from
 # this directory.
@@ -53,7 +52,6 @@ CLEANFILES=*.h5 *.raw *.dat x-gnuplot
 # depend on test or tools library.
 LDADD=$(LIBHDF5)
 h5perf_LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
-h5perf_serial_LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
 perf_LDADD=$(LIBH5TEST) $(LIBHDF5)
 iopipe_LDADD=$(LIBH5TEST) $(LIBHDF5)
 zip_perf_LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
diff --git a/perform/Makefile.in b/perform/Makefile.in
index a4dc884..3ba09a9 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -67,8 +67,7 @@ CONFIG_CLEAN_FILES =
 @BUILD_PARALLEL_CONDITIONAL_TRUE@	mpi-perf$(EXEEXT)
 @BUILD_ALL_CONDITIONAL_TRUE@am__EXEEXT_3 = $(am__EXEEXT_2)
 am__EXEEXT_4 = iopipe$(EXEEXT) chunk$(EXEEXT) overhead$(EXEEXT) \
-	zip_perf$(EXEEXT) perf_meta$(EXEEXT) h5perf_serial$(EXEEXT) \
-	$(am__EXEEXT_3)
+	zip_perf$(EXEEXT) perf_meta$(EXEEXT) $(am__EXEEXT_3)
 benchpar_SOURCES = benchpar.c
 benchpar_OBJECTS = benchpar.$(OBJEXT)
 benchpar_LDADD = $(LDADD)
@@ -81,10 +80,6 @@ am_h5perf_OBJECTS = pio_perf.$(OBJEXT) pio_engine.$(OBJEXT) \
 	pio_timer.$(OBJEXT)
 h5perf_OBJECTS = $(am_h5perf_OBJECTS)
 h5perf_DEPENDENCIES = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
-am_h5perf_serial_OBJECTS = sio_perf.$(OBJEXT) sio_engine.$(OBJEXT) \
-	sio_timer.$(OBJEXT)
-h5perf_serial_OBJECTS = $(am_h5perf_serial_OBJECTS)
-h5perf_serial_DEPENDENCIES = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
 iopipe_SOURCES = iopipe.c
 iopipe_OBJECTS = iopipe.$(OBJEXT)
 iopipe_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5)
@@ -117,12 +112,10 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = benchpar.c chunk.c $(h5perf_SOURCES) \
-	$(h5perf_serial_SOURCES) iopipe.c mpi-perf.c overhead.c perf.c \
-	perf_meta.c zip_perf.c
-DIST_SOURCES = benchpar.c chunk.c $(h5perf_SOURCES) \
-	$(h5perf_serial_SOURCES) iopipe.c mpi-perf.c overhead.c perf.c \
-	perf_meta.c zip_perf.c
+SOURCES = benchpar.c chunk.c $(h5perf_SOURCES) iopipe.c mpi-perf.c \
+	overhead.c perf.c perf_meta.c zip_perf.c
+DIST_SOURCES = benchpar.c chunk.c $(h5perf_SOURCES) iopipe.c \
+	mpi-perf.c overhead.c perf.c perf_meta.c zip_perf.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -365,9 +358,8 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
 
 # These are the programs that `make all' or `make tests' will build and which
 # `make check' will run. List them in the order they should be run.
-TEST_PROG = iopipe chunk overhead zip_perf perf_meta h5perf_serial $(BUILD_ALL_PROGS)
+TEST_PROG = iopipe chunk overhead zip_perf perf_meta $(BUILD_ALL_PROGS)
 h5perf_SOURCES = pio_perf.c pio_engine.c pio_timer.c
-h5perf_serial_SOURCES = sio_perf.c sio_engine.c sio_timer.c
 
 # These are the files that `make clean' (and derivatives) will remove from
 # this directory.
@@ -377,7 +369,6 @@ CLEANFILES = *.h5 *.raw *.dat x-gnuplot
 # depend on test or tools library.
 LDADD = $(LIBHDF5)
 h5perf_LDADD = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
-h5perf_serial_LDADD = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
 perf_LDADD = $(LIBH5TEST) $(LIBHDF5)
 iopipe_LDADD = $(LIBH5TEST) $(LIBHDF5)
 zip_perf_LDADD = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
@@ -447,9 +438,6 @@ chunk$(EXEEXT): $(chunk_OBJECTS) $(chunk_DEPENDENCIES)
 h5perf$(EXEEXT): $(h5perf_OBJECTS) $(h5perf_DEPENDENCIES) 
 	@rm -f h5perf$(EXEEXT)
 	$(LINK) $(h5perf_OBJECTS) $(h5perf_LDADD) $(LIBS)
-h5perf_serial$(EXEEXT): $(h5perf_serial_OBJECTS) $(h5perf_serial_DEPENDENCIES) 
-	@rm -f h5perf_serial$(EXEEXT)
-	$(LINK) $(h5perf_serial_OBJECTS) $(h5perf_serial_LDADD) $(LIBS)
 iopipe$(EXEEXT): $(iopipe_OBJECTS) $(iopipe_DEPENDENCIES) 
 	@rm -f iopipe$(EXEEXT)
 	$(LINK) $(iopipe_OBJECTS) $(iopipe_LDADD) $(LIBS)
@@ -485,9 +473,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio_perf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio_timer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sio_engine.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sio_perf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sio_timer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zip_perf.Po@am__quote@
 
 .c.o:
diff --git a/perform/sio_engine.c b/perform/sio_engine.c
deleted file mode 100644
index 92d6f1c..0000000
--- a/perform/sio_engine.c
+++ /dev/null
@@ -1,1746 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
- * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Author: Christian Chilan, April 2008 
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "hdf5.h"
-
-#ifdef H5_HAVE_GPFS
-#   include <gpfs_fcntl.h>
-#endif  /* H5_HAVE_GPFS */
-
-#include "sio_perf.h"
-#include "sio_timer.h"
-
-/* Macro definitions */
-
-/* sizes of various items. these sizes won't change during program execution */
-/* The following three must have the same type */
-#define ELMT_SIZE           (sizeof(unsigned char))     /* we're doing bytes */
-#define ELMT_H5_TYPE        H5T_NATIVE_UCHAR
-
-#define GOTOERROR(errcode)  { ret_code = errcode; goto done; }
-#define GOTODONE        { goto done; }
-#define ERRMSG(mesg) {                                                  \
-    fprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n",    \
-        mesg, (int)__LINE__, __FILE__);                             \
-}
-
-#define MSG(mesg) {                                     \
-    fprintf(stderr, "(%s) at line %4d in %s\n",         \
-        mesg, (int)__LINE__, __FILE__);             \
-}
-
-/* verify: if val is false (0), print mesg. */
-#define VRFY(val, mesg) do {                            \
-    if (!val) {                                         \
-    ERRMSG(mesg);                                   \
-    GOTOERROR(FAIL);                                \
-    }                                                   \
-} while(0)
-
-/* POSIX I/O macros */
-#define POSIXCREATE(fn)           HDopen(fn, O_CREAT|O_TRUNC|O_RDWR, 0600)
-#define POSIXOPEN(fn, F)          HDopen(fn, F, 0600)
-#define POSIXCLOSE(F)             HDclose(F)
-#define POSIXSEEK(F,L)            HDlseek(F, L, SEEK_SET)
-#define POSIXWRITE(F,B,S)         HDwrite(F,B,S)
-#define POSIXREAD(F,B,S)          HDread(F,B,S)
-
-enum {
-    SIO_CREATE = 1,
-    SIO_WRITE = 2,
-    SIO_READ = 4
-};
-
-/* Global variables */
-static int  clean_file_g = -1;  /*whether to cleanup temporary test     */
-/*files. -1 is not defined;             */
-/*0 is no cleanup; 1 is do cleanup      */
-
-/*
- * In a parallel machine, the filesystem suitable for compiling is
- * unlikely a parallel file system that is suitable for parallel I/O.
- * There is no standard pathname for the parallel file system.  /tmp
- * is about the best guess.
- */
-#ifndef HDF5_PARAPREFIX
-#  ifdef __PUMAGON__
-/* For the PFS of TFLOPS */
-#    define HDF5_PARAPREFIX     "pfs:/pfs_grande/multi/tmp_1"
-#  else
-#    define HDF5_PARAPREFIX     ""
-#  endif    /* __PUMAGON__ */
-#endif  /* !HDF5_PARAPREFIX */
-
-#ifndef MIN
-#   define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif  /* !MIN */
-
-/* the different types of file descriptors we can expect */
-typedef union _file_descr {
-    int         posixfd;    /* POSIX file handle*/
-    hid_t       h5fd;       /* HDF5 file        */
-} file_descr;
-
-/* local functions */
-static char  *sio_create_filename(iotype iot, const char *base_name,
-    char *fullname, size_t size, parameters *param);
-static herr_t do_write(results *res, file_descr *fd, parameters *parms, void *buffer);
-static herr_t do_read(results *res, file_descr *fd, parameters *parms, void *buffer);
-static herr_t dset_write(int local_dim, file_descr *fd, parameters *parms, void *buffer);
-static herr_t posix_buffer_write(int local_dim, file_descr *fd, parameters *parms, void *buffer);
-static herr_t dset_read(int localrank, file_descr *fd, parameters *parms, void *buffer);
-static herr_t posix_buffer_read(int local_dim, file_descr *fd, parameters *parms, void *buffer);
-static herr_t do_fopen(parameters *param, char *fname, file_descr *fd /*out*/,
-    int flags);
-hid_t set_vfd(parameters *param);
-static herr_t do_fclose(iotype iot, file_descr *fd);
-static void do_cleanupfile(iotype iot, char *fname);
-
-/* GPFS-specific functions */
-#ifdef H5_HAVE_GPFS
-static void gpfs_access_range(int handle, off_t start, off_t length, int is_write);
-static void gpfs_free_range(int handle, off_t start, off_t length);
-static void gpfs_clear_file_cache(int handle);
-static void gpfs_cancel_hints(int handle);
-static void gpfs_start_data_shipping(int handle, int num_insts);
-static void gpfs_start_data_ship_map(int handle, int partition_size,
-    int agent_count, int *agent_node_num);
-static void gpfs_stop_data_shipping(int handle);
-static void gpfs_invalidate_file_cache(const char *filename);
-#endif /* H5_HAVE_GPFS */
-
-/* global variables */
-static off_t offset[MAX_DIMS];       /* dataset size in bytes     */
-static size_t buf_offset[MAX_DIMS];   /* dataset size in bytes     */
-static int order[MAX_DIMS];        /* dimension access order */
-static size_t      linear_buf_size;        /* linear buffer size     */
-static int         cont_dim;       /* lowest dimension for contiguous POSIX  
-                                      access */
-static size_t      cont_size;      /* size of contiguous POSIX access */
-static hid_t       fapl;           /* file access list */
-static unsigned char *buf_p;       /* buffer pointer */
-static unsigned char *buf2_p;      /* buffer pointer */
-static const char *multi_letters = "msbrglo"; /* string for multi driver */
-static char *buffer2=NULL;         /* buffer for data verification */
-
-/* HDF5 global variables */
-static hsize_t     h5count[MAX_DIMS];      /*selection count               */
-static hssize_t    h5offset[MAX_DIMS];     /* Selection offset within dataspace */
-static hid_t       h5dset_space_id = -1;   /*dataset space ID              */
-static hid_t       h5mem_space_id = -1;    /*memory dataspace ID           */
-static hid_t       h5ds_id = -1;           /*dataset handle                */
-static hid_t       h5dcpl = -1;            /* Dataset creation property list */
-static hid_t       h5dxpl = -1;            /* Dataset transfer property list */
-
-/*
- * Function:        do_sio
- * Purpose:         SIO Engine where IO are executed.
- * Return:          results
- * Programmer:      Christian Chilan, April, 2008 
- * Modifications:
- */
-    results
-do_sio(parameters param)
-{
-    char       *buffer = NULL; /*data buffer pointer           */
-    off_t       nbytes;                 /* dataset raw size */
-    off_t       dset_size[MAX_DIMS];    /* dataset size in bytes     */
-    size_t      buf_size[MAX_DIMS];     /* general buffer size in bytes     */
-    size_t      chk_size[MAX_DIMS];     /* chunk size in bytes     */
-    file_descr  fd;                     /* file handles */
-    iotype      iot;                    /* API type */
-    char base_name[256];                /* test file base name */
-    /* return codes */
-    herr_t      ret_code = 0;   /*return code                           */
-    results     res;
-
-    char        fname[FILENAME_MAX];    /* test file name */
-    int     i;
-    /* HDF5 variables */
-    herr_t          hrc;        /*HDF5 return code              */
-
-    /* Sanity check parameters */
-
-    /* IO type */
-    iot = param.io_type;
-
-    switch (iot) {
-    case POSIXIO:
-        fd.posixfd = -1;
-        res.timers = sio_time_new();
-        break;
-    case HDF5:
-        fd.h5fd = -1;
-        res.timers = sio_time_new();
-        break;
-    default:
-        /* unknown request */
-        fprintf(stderr, "Unknown IO type request (%d)\n", iot);
-        GOTOERROR(FAIL);
-    }
-
-    nbytes = param.num_bytes;     
-    linear_buf_size = 1;
-
-    for (i=0; i<param.rank; i++){
-        dset_size[i] = param.dset_size[i];
-        buf_size[i] = param.buf_size[i];
-        chk_size[i] = param.chk_size[i];
-        order[i] = param.order[i];
-        linear_buf_size *= buf_size[i];
-        buf_offset[i] = 0;
-        offset[i] = 0;
-
-        /* Validate transfer buffer size */
-        if (param.buf_size[i]<=0) {
-            HDfprintf(stderr,
-            "Transfer buffer size[%d] (%Hd) must be > 0\n", i,(long_long)buf_size[i]);
-            GOTOERROR(FAIL);
-        }
-
-        if ((param.dset_size[i]%param.buf_size[i])!=0) {
-            HDfprintf(stderr,
-            "Dataset size[%d] (%Hd) must be a multiple of the "
-            "trasfer buffer size[%d] (%Hd)\n",param.rank,
-            (long_long)param.dset_size[i], param.rank, (long_long)param.buf_size[i]);
-            GOTOERROR(FAIL);
-        }
-
-    }
-
-    /* Allocate transfer buffer */
-    buffer2 = malloc(linear_buf_size); 
-    if ((buffer = malloc(linear_buf_size)) == NULL){
-        HDfprintf(stderr, "malloc for transfer buffer size (%Hd) failed\n",
-        (long_long)(linear_buf_size));
-        GOTOERROR(FAIL);
-    }
-
-    if (sio_debug_level >= 4) 
-
-    /* output all of the times for all iterations */
-        fprintf(output, "Timer details:\n");
-
-    /*
-     * Write performance measurement
-     */
-    /* Open file for write */
-
-    strcpy(base_name, "#sio_tmp");
-    sio_create_filename(iot, base_name, fname, sizeof(fname), &param);
-
-    if (sio_debug_level > 0)
-        HDfprintf(output, "data filename=%s\n",
-             fname);
-
-    set_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, START);
-    hrc = do_fopen(&param, fname, &fd, SIO_CREATE | SIO_WRITE);
-    VRFY((hrc == SUCCESS), "do_fopen failed");
-
-    set_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, START);
-    hrc = do_write(&res, &fd, &param, buffer);
-    set_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, STOP);
-    VRFY((hrc == SUCCESS), "do_write failed");
-
-    /* Close file for write */
-    hrc = do_fclose(iot, &fd);
-    set_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, STOP);
-    VRFY((hrc == SUCCESS), "do_fclose failed");
-
-    if (!param.h5_write_only) {
-        /*
-         * Read performance measurement
-         */
-
-        /* Open file for read */
-        set_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS, START);
-        hrc = do_fopen(&param, fname, &fd, SIO_READ);
-        VRFY((hrc == SUCCESS), "do_fopen failed");
-
-        set_time(res.timers, HDF5_FINE_READ_FIXED_DIMS, START);
-        hrc = do_read(&res, &fd, &param, buffer);
-        set_time(res.timers, HDF5_FINE_READ_FIXED_DIMS, STOP);
-        VRFY((hrc == SUCCESS), "do_read failed");
-
-        /* Close file for read */
-        hrc = do_fclose(iot, &fd);
-
-        set_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS, STOP);
-        VRFY((hrc == SUCCESS), "do_fclose failed");
-    }
-    
-    do_cleanupfile(iot, fname);
-
-done:
-    /* clean up */
-    /* release HDF5 objects */
-
-    /* close any opened files */
-    /* no remove(fname) because that should have happened normally. */
-    switch (iot) {
-        case POSIXIO:
-            if (fd.posixfd != -1)
-                hrc = do_fclose(iot, &fd);
-            break;
-        case HDF5:
-            if (fd.h5fd != -1)
-                hrc = do_fclose(iot, &fd);
-            break;
-    }
-
-    /* release generic resources */
-    if (buffer)
-        free(buffer);
-
-    res.ret_code = ret_code;
-    return res;
-}
-
-/*
- * Function:    sio_create_filename
- * Purpose:     Create a new filename to write to. Determine the correct
- *              suffix to append to the filename by the type of I/O we're
- *              doing. Also, place in the /tmp/{$USER,$LOGIN} directory if
- *              USER or LOGIN are specified in the environment.
- * Return:      Pointer to filename or NULL
- * Programmer:  Bill Wendling, 21. November 2001
- * Modifications: Support for file drivers. Christian Chilan, April, 2008
- */
-    static char *
-sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t size, parameters *param)
-{
-    const char *prefix, *suffix="";
-    char *ptr, last = '\0';
-    size_t i, j;
-    vfdtype vfd; 
-    vfd = param->vfd; 
-
-    if (!base_name || !fullname || size < 1)
-    return NULL;
-
-    memset(fullname, 0, size);
-
-    switch (iot) {
-    case POSIXIO:
-        suffix = ".posix";
-        break;
-    case HDF5:
-        suffix = ".h5";
-        if (vfd == family)
-            suffix = "%05d.h5";
-        else if (vfd == multi)
-            suffix = NULL;
-        break;
-    }
-
-    /* First use the environment variable and then try the constant */
-    prefix = getenv("HDF5_PARAPREFIX");
-
-#ifdef HDF5_PARAPREFIX
-    if (!prefix)
-    prefix = HDF5_PARAPREFIX;
-#endif  /* HDF5_PARAPREFIX */
-
-    /* Prepend the prefix value to the base name */
-    if (prefix && *prefix) {
-    /* If the prefix specifies the HDF5_PARAPREFIX directory, then
-     * default to using the "/tmp/$USER" or "/tmp/$LOGIN"
-     * directory instead. */
-    register char *user, *login, *subdir;
-
-    user = getenv("USER");
-    login = getenv("LOGIN");
-    subdir = (user ? user : login);
-
-    if (subdir) {
-        for (i = 0; i < size && prefix[i]; i++)
-        fullname[i] = prefix[i];
-
-        fullname[i++] = '/';
-
-        for (j = 0; i < size && subdir[j]; i++, j++)
-        fullname[i] = subdir[j];
-    } else {
-        /* We didn't append the prefix yet */
-        strncpy(fullname, prefix, MIN(strlen(prefix), size));
-    }
-
-    if ((strlen(fullname) + strlen(base_name) + 1) < size) {
-        /* Append the base_name with a slash first. Multiple slashes are
-         * handled below. */
-        h5_stat_t buf;
-
-        if (HDstat(fullname, &buf) < 0)
-        /* The directory doesn't exist just yet */
-        if (mkdir(fullname, (mode_t)0755) < 0 && errno != EEXIST) {
-            /* We couldn't make the "/tmp/${USER,LOGIN}" subdirectory.
-             * Default to PREFIX's original prefix value. */
-            strcpy(fullname, prefix);
-        }
-
-        strcat(fullname, "/");
-        strcat(fullname, base_name);
-    } else {
-        /* Buffer is too small */
-        return NULL;
-    }
-    } else if (strlen(base_name) >= size) {
-    /* Buffer is too small */
-        return NULL;
-    } else {
-        strcpy(fullname, base_name);
-    }
-
-    /* Append a suffix */
-    if (suffix) {
-        if (strlen(fullname) + strlen(suffix) >= size)
-            return NULL;
-
-        strcat(fullname, suffix);
-    }
-
-    /* Remove any double slashes in the filename */
-    for (ptr = fullname, i = j = 0; ptr && i < size; i++, ptr++) {
-    if (*ptr != '/' || last != '/')
-        fullname[j++] = *ptr;
-
-    last = *ptr;
-    }
-
-    return fullname;
-}
-
-/*
- * Function:        do_write
- * Purpose:         Write the required amount of data to the file.
- * Return:          SUCCESS or FAIL
- * Programmer:      Christian Chilan, April, 2008 
- * Modifications:
- */
-static herr_t
-do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
-{
-    int         ret_code = SUCCESS;
-    char        dname[64];
-    long        i;
-    /* HDF5 variables */
-    herr_t      hrc;                    /*HDF5 return code              */
-    hsize_t     h5dims[MAX_DIMS];       /*dataset dim sizes             */
-    hsize_t     h5chunk[MAX_DIMS];      /*dataset dim sizes             */
-    hsize_t     h5block[MAX_DIMS];      /*dataspace selection           */
-    hsize_t     h5stride[MAX_DIMS];     /*selection stride              */
-    hsize_t     h5start[MAX_DIMS];      /*selection start               */
-    hsize_t     h5maxdims[MAX_DIMS];
-    int         rank;                   /*rank of dataset */
-        /* Prepare buffer for verifying data */
-/*    if (parms->verify)
-            memset(buffer,1,linear_buf_size); */
-
-    buf_p=(unsigned char *)buffer;
-
-    for (i=0; i < linear_buf_size; i++)
-        buf_p[i]=i%128;
-
-    rank = parms->rank;
-
-    for (i=0; i<rank; i++) {
-        h5offset[i] = offset[i] = 0;
-    }
-
-    /* I/O Access specific setup */
-    switch (parms->io_type) {
-    case POSIXIO:
-
-            /* determine lowest dimension for contiguous POSIX access */
-            cont_dim = rank;
-            
-            for (i=rank-1; i>=0; i--) {
-                if (parms->buf_size[i]==parms->dset_size[i])
-                    cont_dim = i;
-                else
-                    break;
-            }
-
-            /* determine size of the contiguous POSIX access */ 
-            cont_size = (!cont_dim)? 1 : parms->buf_size[cont_dim-1];
-            for (i=cont_dim; i<rank; i++)
-                cont_size *= parms->buf_size[i];
-
-        break;
-
-    case HDF5: /* HDF5 setup */
-
-        for (i=0; i < rank; i++){
-            h5dims[i] = parms->dset_size[i];
-            h5start[i] = 0;
-            h5stride[i] = 1;
-            h5block[i] = 1;
-            h5count[i] = parms->buf_size[i];
-            h5chunk[i] = parms->chk_size[i];
-            h5maxdims[i] = H5S_UNLIMITED;
-            
-        }
-
-        if (parms->h5_use_chunks && parms->h5_extendable) {
-            h5dset_space_id = H5Screate_simple(rank, h5count, h5maxdims);
-            VRFY((h5dset_space_id >= 0), "H5Screate_simple");
-        }
-        else {
-            h5dset_space_id = H5Screate_simple(rank, h5dims, NULL);
-            VRFY((h5dset_space_id >= 0), "H5Screate_simple");
-        }
-
-        hrc = H5Sselect_hyperslab(h5dset_space_id, H5S_SELECT_SET,
-                    h5start, h5stride, h5count, h5block); 
-        VRFY((hrc >= 0), "H5Sselect_hyperslab");
-
-        /* Create the memory dataspace that corresponds to the xfer buffer */
-        h5mem_space_id = H5Screate_simple(rank, h5count, NULL);
-        VRFY((h5mem_space_id >= 0), "H5Screate_simple");
-
-        /* Create the dataset transfer property list */
-        h5dxpl = H5Pcreate(H5P_DATASET_XFER);
-        if (h5dxpl < 0) {
-            fprintf(stderr, "HDF5 Property List Create failed\n");
-            GOTOERROR(FAIL);
-        }
-
-        break;        
-    } /* end switch */
-
-
-    /* create dataset */
-    switch (parms->io_type) {
-        case POSIXIO:
-        break;
-
-        case HDF5:
-            h5dcpl = H5Pcreate(H5P_DATASET_CREATE);
-
-        if (h5dcpl < 0) {
-            fprintf(stderr, "HDF5 Property List Create failed\n");
-            GOTOERROR(FAIL);
-        }
-
-        if(parms->h5_use_chunks) {
-        /* Set the chunk size to be the same as the buffer size */
-            hrc = H5Pset_chunk(h5dcpl, rank, h5chunk);
-            if (hrc < 0) {
-                fprintf(stderr, "HDF5 Property List Set failed\n");
-                GOTOERROR(FAIL);
-            } /* end if */
-        } /* end if */
-
-        sprintf(dname, "Dataset_%ld", (unsigned long)parms->num_bytes);
-        h5ds_id = H5Dcreate2(fd->h5fd, dname, ELMT_H5_TYPE,
-            h5dset_space_id, H5P_DEFAULT, h5dcpl, H5P_DEFAULT);
-
-        if (h5ds_id < 0) {
-            fprintf(stderr, "HDF5 Dataset Create failed\n");
-            GOTOERROR(FAIL);
-        }
-
-        hrc = H5Pclose(h5dcpl);
-        /* verifying the close of the dcpl */
-        if (hrc < 0) {
-            fprintf(stderr, "HDF5 Property List Close failed\n");
-            GOTOERROR(FAIL);
-        }
-
-        break;
-    }
-
-    /* Start "raw data" write timer */
-    set_time(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, START);
-
-    /* Perform write */
-    hrc = dset_write(rank-1, fd, parms, buffer);
-    
-    if (hrc < 0) {
-        fprintf(stderr, "Error in dataset write\n");
-        GOTOERROR(FAIL);
-    }
-
-
-    /* Stop "raw data" write timer */
-    set_time(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, STOP);
-
-    /* Calculate write time */
-
-    /* Close dataset. Only HDF5 needs to do an explicit close. */
-    if (parms->io_type == HDF5) {
-        hrc = H5Dclose(h5ds_id);
-
-        if (hrc < 0) {
-            fprintf(stderr, "HDF5 Dataset Close failed\n");
-            GOTOERROR(FAIL);
-        }
-
-        h5ds_id = -1;
-    } /* end if */
-
-done:
-
-    /* release HDF5 objects */
-    if (h5dset_space_id != -1) {
-        hrc = H5Sclose(h5dset_space_id);
-        if (hrc < 0){
-            fprintf(stderr, "HDF5 Dataset Space Close failed\n");
-            ret_code = FAIL;
-        } else {
-            h5dset_space_id = -1;
-        }
-    }
-
-    if (h5mem_space_id != -1) {
-        hrc = H5Sclose(h5mem_space_id);
-        if (hrc < 0) {
-            fprintf(stderr, "HDF5 Memory Space Close failed\n");
-            ret_code = FAIL;
-        } else {
-            h5mem_space_id = -1;
-        }
-    }
-
-    if (h5dxpl != -1) {
-        hrc = H5Pclose(h5dxpl);
-        if (hrc < 0) {
-            fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
-            ret_code = FAIL;
-        } else {
-            h5dxpl = -1;
-        }
-    }
-
-    return ret_code;
-}
-
-/*
- * Function:        dset_write
- * Purpose:         Write buffer into the dataset. 
- * Return:          SUCCESS or FAIL
- * Programmer:      Christian Chilan, April, 2008
- * Modifications:
- */
-
-static herr_t dset_write(int local_dim, file_descr *fd, parameters *parms, void *buffer)
-{
-    int cur_dim = order[local_dim]-1;
-    int         ret_code = SUCCESS;
-    int         k;
-    hsize_t	dims[MAX_DIMS], maxdims[MAX_DIMS];
-    long i,j;
-    herr_t hrc;
-
-    /* iterates according to the dimensions in order array */ 
-    for (i=0; i < parms->dset_size[cur_dim]; i += parms->buf_size[cur_dim]){
-
-        h5offset[cur_dim] = offset[cur_dim] = i;
-            
-        if (local_dim > 0){
-
-            dset_write(local_dim-1, fd, parms, buffer);
-
-        }else{
-
-            switch (parms->io_type) {
-
-            case POSIXIO:
-                /* initialize POSIX offset in the buffer */
-                for (j=0; j < parms->rank; j++) {
-                    buf_offset[j]=0;
-                }
-                buf_p = (unsigned char *)buffer;
-                /* write POSIX buffer */
-                posix_buffer_write(0, fd, parms, buffer);
-                break;
-
-            case HDF5:
-                /* if dimensions are extendable, extend them as needed during
-                access */
-                if (parms->h5_use_chunks && parms->h5_extendable) {
-
-                    hrc=H5Sget_simple_extent_dims(h5dset_space_id,dims,maxdims);
-                    VRFY((hrc >= 0), "H5Sget_simple_extent_dims");
-
-                    for (k=0; k < parms->rank; k++){
-
-                        if (dims[k] <= h5offset[k]) {
-                            dims[k] = dims[k]+h5count[k];
-                            hrc=H5Sset_extent_simple(h5dset_space_id,parms->rank,dims,maxdims);
-                            VRFY((hrc >= 0), "H5Sset_extent_simple");
-                            hrc=H5Dset_extent(h5ds_id,dims);
-                            VRFY((hrc >= 0), "H5Dextend");
-                        }
-                    }
-                }
-                /* applies offset */               
-                hrc = H5Soffset_simple(h5dset_space_id, h5offset);
-                VRFY((hrc >= 0), "H5Soffset_simple");
-
-                /* Write the buffer out */
-                hrc=H5Sget_simple_extent_dims(h5dset_space_id,dims,maxdims);
-                hrc = H5Dwrite(h5ds_id, ELMT_H5_TYPE, h5mem_space_id,
-                    h5dset_space_id, h5dxpl, buffer);
-                VRFY((hrc >= 0), "H5Dwrite");
-
-                break;
-            } /* switch (parms->io_type) */
-        }
-    }
-done:
-    return ret_code;
-}
-
-/*
- * Function:        posix_buffer_write 
- * Purpose:         Write buffer into the POSIX file considering contiguity.
- * Return:          SUCCESS or FAIL
- * Programmer:      Christian Chilan, April, 2008
- * Modifications:
- */
-
-static herr_t posix_buffer_write(int local_dim, file_descr *fd, parameters *parms, void *buffer)
-{
-    int dtype_size = 1;
-    int         ret_code = SUCCESS;
-    long i;
-    size_t d_offset;
-    size_t linear_dset_offset = 0;
-    int j, rc;
-
-    /* if dimension is not contiguous, call recursively */
-    if (local_dim < parms->rank-1 && local_dim != cont_dim) {
-
-        for (i=0; i < parms->buf_size[local_dim]; i += dtype_size) {
-            buf_offset[local_dim] = i;
-            posix_buffer_write(local_dim+1, fd, parms, buffer);
-
-            /* if next dimension is cont_dim, it will fill out the buffer
-               traversing the entire dimension local_dim without the need
-               of performing iteration */
-            if (local_dim+1==cont_dim)
-                break;
-        }
-    /* otherwise, perform contiguous POSIX access */
-    } else {
-
-        buf_offset[local_dim] = 0;
-
-        /* determine offset in the buffer */
-        for (i=0; i < parms->rank; i++){
-            d_offset=1;
-
-            for (j=i+1; j < parms->rank; j++)
-                d_offset *= parms->dset_size[j];
-
-            linear_dset_offset += (offset[i]+buf_offset[i])*d_offset;
-        }
-
-        /* only care if seek returns error */
-        rc = POSIXSEEK(fd->posixfd, linear_dset_offset) < 0 ? -1 : 0;
-        VRFY((rc==0), "POSIXSEEK");
-        /* check if all bytes are written */
-        rc = ((ssize_t)cont_size ==
-             POSIXWRITE(fd->posixfd, buf_p, cont_size));
-        VRFY((rc != 0), "POSIXWRITE");
-
-        /* Advance location in buffer */
-        buf_p += cont_size;
-
-    }
-done:
-    return ret_code;
-}
-
-/*
- * Function:        do_read
- * Purpose:         Read the required amount of data to the file.
- * Return:          SUCCESS or FAIL
- * Programmer:      Christian Chilan, April, 2008 
- * Modifications:
- */
-static herr_t
-do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
-{
-    int         ret_code = SUCCESS;
-    char        dname[64];
-    long        i;
-    /* HDF5 variables */
-    herr_t      hrc;                    /*HDF5 return code              */
-    hsize_t     h5dims[MAX_DIMS];       /*dataset dim sizes             */
-    hsize_t     h5chunk[MAX_DIMS];      /*dataset dim sizes             */
-    hsize_t     h5block[MAX_DIMS];      /*dataspace selection           */
-    hsize_t     h5stride[MAX_DIMS];     /*selection stride              */
-    hsize_t     h5start[MAX_DIMS];      /*selection start               */
-    int         rank;
-
-        /* Prepare buffer for verifying data */
-        for (i=0; i < linear_buf_size; i++)
-            buffer2[i]=i%128;
-
-    rank = parms->rank;
-    for (i=0; i<rank; i++) {
-        h5offset[i] = offset[i] = 0;
-    }
-
-    /* I/O Access specific setup */
-    switch (parms->io_type) {
-    case POSIXIO:
-            cont_dim = rank;
-            
-            for (i=rank-1; i>=0; i--) {
-                if (parms->buf_size[i]==parms->dset_size[i])
-                    cont_dim = i;
-                else
-                    break;
-            }
-            cont_size = (!cont_dim)? 1 : parms->buf_size[cont_dim-1];
-            for (i=cont_dim; i<rank; i++)
-                cont_size *= parms->buf_size[i];
-
-        break;
-
-    case HDF5: /* HDF5 setup */
-        for (i=0; i < rank; i++){
-            h5dims[i] = parms->dset_size[i];
-            h5start[i] = 0;
-            h5stride[i] = 1;
-            h5block[i] = 1;
-            h5count[i] = parms->buf_size[i];
-            h5chunk[i] = parms->chk_size[i];
-        }
-
-        h5dset_space_id = H5Screate_simple(rank, h5dims, NULL);
-        VRFY((h5dset_space_id >= 0), "H5Screate_simple");
-
-        hrc = H5Sselect_hyperslab(h5dset_space_id, H5S_SELECT_SET,
-                    h5start, h5stride, h5count, h5block); 
-        VRFY((hrc >= 0), "H5Sselect_hyperslab");
-
-        /* Create the memory dataspace that corresponds to the xfer buffer */
-        h5mem_space_id = H5Screate_simple(rank, h5count, NULL);
-        VRFY((h5mem_space_id >= 0), "H5Screate_simple");
-
-        /* Create the dataset transfer property list */
-        h5dxpl = H5Pcreate(H5P_DATASET_XFER);
-        if (h5dxpl < 0) {
-            fprintf(stderr, "HDF5 Property List Create failed\n");
-            GOTOERROR(FAIL);
-        }
-
-        break;        
-    } /* end switch */
-
-
-    /* create dataset */
-    switch (parms->io_type) {
-        case POSIXIO:
-        break;
-
-        case HDF5:
-        sprintf(dname, "Dataset_%ld", parms->num_bytes);
-        h5ds_id = H5Dopen2(fd->h5fd, dname, H5P_DEFAULT);
-        if (h5ds_id < 0) {
-            fprintf(stderr, "HDF5 Dataset open failed\n");
-            GOTOERROR(FAIL);
-        }
-
-        break;
-
-    } /* end switch */
-
-    /* Start "raw data" read timer */
-    set_time(res->timers, HDF5_RAW_READ_FIXED_DIMS, START);
-    hrc = dset_read(rank-1, fd, parms, buffer);
-
-    if (hrc < 0) {
-        fprintf(stderr, "Error in dataset read\n");
-        GOTOERROR(FAIL);
-    }
-
-    /* Stop "raw data" read timer */
-    set_time(res->timers, HDF5_RAW_READ_FIXED_DIMS, STOP);
-
-    /* Calculate read time */
-
-    /* Close dataset. Only HDF5 needs to do an explicit close. */
-    if (parms->io_type == HDF5) {
-        hrc = H5Dclose(h5ds_id);
-
-        if (hrc < 0) {
-        fprintf(stderr, "HDF5 Dataset Close failed\n");
-        GOTOERROR(FAIL);
-        }
-
-        h5ds_id = -1;
-    } /* end if */
-
-done:
-
-    /* release HDF5 objects */
-    if (h5dset_space_id != -1) {
-    hrc = H5Sclose(h5dset_space_id);
-    if (hrc < 0){
-        fprintf(stderr, "HDF5 Dataset Space Close failed\n");
-        ret_code = FAIL;
-    } else {
-        h5dset_space_id = -1;
-    }
-    }
-
-    if (h5mem_space_id != -1) {
-    hrc = H5Sclose(h5mem_space_id);
-    if (hrc < 0) {
-        fprintf(stderr, "HDF5 Memory Space Close failed\n");
-        ret_code = FAIL;
-    } else {
-        h5mem_space_id = -1;
-    }
-    }
-
-    if (h5dxpl != -1) {
-    hrc = H5Pclose(h5dxpl);
-    if (hrc < 0) {
-        fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
-        ret_code = FAIL;
-    } else {
-        h5dxpl = -1;
-    }
-    }
-
-    return ret_code;
-}
-
-/*
- * Function:        dset_read
- * Purpose:         Read buffer into the dataset.
- * Return:          SUCCESS or FAIL
- * Programmer:      Christian Chilan, April, 2008
- * Modifications:
- */
-
-static herr_t dset_read(int local_dim, file_descr *fd, parameters *parms, void *buffer)
-{
-    int cur_dim = order[local_dim]-1;
-    int         ret_code = SUCCESS;
-    long i,j;
-    herr_t hrc;
-
-    /* iterate on the current dimension */ 
-    for (i=0; i < parms->dset_size[cur_dim]; i += parms->buf_size[cur_dim]){
-
-        h5offset[cur_dim] = offset[cur_dim] = i;
-        
-        /* if traverse in order array is incomplete, recurse */     
-        if (local_dim > 0){
-
-            ret_code = dset_read(local_dim-1, fd, parms, buffer);
-
-        /* otherwise, write buffer into dataset */
-        }else{
-
-            switch (parms->io_type) {
-
-            case POSIXIO:
-                for (j=0; j<parms->rank; j++) {
-                   buf_offset[j] = 0;
-                }
-                buf_p = (unsigned char*)buffer;
-                buf2_p = (unsigned char*)buffer2;
-                posix_buffer_read(0, fd, parms, buffer);
-                break;
-
-            case HDF5:
-                hrc = H5Soffset_simple(h5dset_space_id, h5offset);
-                VRFY((hrc >= 0), "H5Soffset_simple");
-                /* Read the buffer out */
-                hrc = H5Dread(h5ds_id, ELMT_H5_TYPE, h5mem_space_id,
-                    h5dset_space_id, h5dxpl, buffer);
-                VRFY((hrc >= 0), "H5Dread");
-#if 0 
-                for (j=0; j<linear_buf_size; j++) {
-                     buf_p = (unsigned char*)buffer;
-                     if (buf_p[j]!=buffer2[j])
-                        printf("Inconsistent data in %d\n", j);
-                }
-#endif
-                break;
-            } /* switch (parms->io_type) */
-        }
-    }
-done:
-    return ret_code;
-}
-
-/*
- * Function:        posix_buffer_read
- * Purpose:         Read buffer into the POSIX file considering contiguity.
- * Return:          SUCCESS or FAIL
- * Programmer:      Christian Chilan, April, 2008
- * Modifications:
- */
-
-static herr_t posix_buffer_read(int local_dim, file_descr *fd, parameters *parms, void *buffer)
-{
-    int dtype_size = 1;
-    int         ret_code = SUCCESS;
-    long i;
-    size_t d_offset;
-    size_t linear_dset_offset = 0;
-    int j, rc;
-
-    /* if local dimension is not contiguous, recurse */
-    if (local_dim < parms->rank-1 && local_dim != cont_dim) {
-
-        for (i=0; i < parms->buf_size[local_dim]; i += dtype_size) {
-            buf_offset[local_dim] = i;
-            ret_code = posix_buffer_read(local_dim+1, fd, parms, buffer);
-            if (local_dim+1==cont_dim)
-                break;
-        }
-    /* otherwise, perform contiguous POSIX access */
-    } else {
-
-        buf_offset[local_dim] = 0;
-        /* determine offset in buffer */
-        for (i=0; i<parms->rank; i++){
-            d_offset=1;
-
-            for (j=i+1; j<parms->rank; j++)
-                d_offset *= parms->dset_size[j];
-
-            linear_dset_offset += (offset[i]+buf_offset[i])*d_offset;
-        }
-
-        /* only care if seek returns error */
-        rc = POSIXSEEK(fd->posixfd, linear_dset_offset) < 0 ? -1 : 0;
-        VRFY((rc==0), "POSIXSEEK");
-        /* check if all bytes are read */
-        rc = ((ssize_t)cont_size ==
-             POSIXREAD(fd->posixfd, buf_p, cont_size));
-        VRFY((rc != 0), "POSIXREAD");
-#if 0 
-        for (j=0; j<cont_size; j++) {
-            if (buf_p[j]!=buf2_p[j])
-                printf("Inconsistent data in %d\n", j);
-        }
-        buf2_p += cont_size;
-#endif
-
-        /* Advance location in buffer */
-        buf_p += cont_size;
-
-    }
-done:
-    return ret_code;
-}
-
-
-/*
- * Function:    do_fopen
- * Purpose:     Open the specified file.
- * Return:      SUCCESS or FAIL
- * Programmer:  Albert Cheng, Bill Wendling, 2001/12/13
- * Modifications: Support for file drivers, Christian Chilan, April, 2008
- */
-    static herr_t
-do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
-{
-    int ret_code = SUCCESS;
-
-    switch (param->io_type) {
-    case POSIXIO:
-        if (flags & (SIO_CREATE | SIO_WRITE))
-            fd->posixfd = POSIXCREATE(fname);
-        else
-            fd->posixfd = POSIXOPEN(fname, O_RDONLY);
-
-        if (fd->posixfd < 0 ) {
-            fprintf(stderr, "POSIX File Open failed(%s)\n", fname);
-            GOTOERROR(FAIL);
-        }
-
-        break;
-
-    case HDF5:
-
-        fapl = set_vfd(param);
-
-        if (fapl < 0) {
-            fprintf(stderr, "HDF5 Property List Create failed\n");
-            GOTOERROR(FAIL);
-        }
-
-        /* create the parallel file */
-        if (flags & (SIO_CREATE | SIO_WRITE)) {
-            fd->h5fd = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
-        } else {
-            fd->h5fd = H5Fopen(fname, H5F_ACC_RDONLY, fapl);
-        }
-
-
-        if (fd->h5fd < 0) {
-            fprintf(stderr, "HDF5 File Create failed(%s)\n", fname);
-            GOTOERROR(FAIL);
-        }
-        break;
-    } 
-
-done:
-    return ret_code;
-}
-
-/*
- * Function:    set_vfd 
- * Purpose:     Sets file driver. 
- * Return:      SUCCESS or FAIL
- * Programmer:  Christian Chilan, April, 2008 
- * Modifications: 
- */
-
-hid_t
-set_vfd(parameters *param)
-{
-    hid_t fapl = -1;
-    vfdtype  vfd;
-
-    vfd = param->vfd;
-
-    if ((fapl=H5Pcreate(H5P_FILE_ACCESS))<0) return -1;
-
-    if (vfd == sec2) {
-        /* Unix read() and write() system calls */
-        if (H5Pset_fapl_sec2(fapl)<0) return -1;
-    } else if (vfd == stdio) {
-        /* Standard C fread() and fwrite() system calls */
-        if (H5Pset_fapl_stdio(fapl)<0) return -1;
-    } else if (vfd == core) {
-        /* In-core temporary file with 1MB increment */
-        if (H5Pset_fapl_core(fapl, (size_t)1024*1024, TRUE)<0) return -1;
-    } else if (vfd == split) {
-        /* Split meta data and raw data each using default driver */
-        if (H5Pset_fapl_split(fapl,
-                              "-m.h5", H5P_DEFAULT,
-                              "-r.h5", H5P_DEFAULT)<0)
-            return -1;
-    } else if (vfd == multi) {
-        /* Multi-file driver, general case of the split driver */
-        H5FD_mem_t memb_map[H5FD_MEM_NTYPES];
-        hid_t memb_fapl[H5FD_MEM_NTYPES];
-        const char *memb_name[H5FD_MEM_NTYPES];
-        char sv[H5FD_MEM_NTYPES][1024];
-        haddr_t memb_addr[H5FD_MEM_NTYPES];
-        H5FD_mem_t      mt;
-
-        HDmemset(memb_map, 0, sizeof memb_map);
-        HDmemset(memb_fapl, 0, sizeof memb_fapl);
-        HDmemset(memb_name, 0, sizeof memb_name);
-        HDmemset(memb_addr, 0, sizeof memb_addr);
-
-        assert(HDstrlen(multi_letters)==H5FD_MEM_NTYPES);
-        for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) {
-            memb_fapl[mt] = H5P_DEFAULT;
-            sprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]);
-            memb_name[mt] = sv[mt];
-            memb_addr[mt] = MAX(mt-1,0)*(HADDR_MAX/10);
-        }
-
-        if (H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name,
-                              memb_addr, FALSE)<0) {
-            return -1;
-        }
-    } else if (vfd == family) {
-        hsize_t fam_size = 1*1024*1024; /*100 MB*/
-
-        /* Family of files, each 1MB and using the default driver */
-        /* if ((val=HDstrtok(NULL, " \t\n\r")))
-            fam_size = (hsize_t)(HDstrtod(val, NULL) * 1024*1024); */
-        if (H5Pset_fapl_family(fapl, fam_size, H5P_DEFAULT)<0)
-            return -1;
-    } else if (vfd == direct) {
-#ifdef H5_HAVE_DIRECT
-        /* Linux direct read() and write() system calls.  Set memory boundary, file block size,
-         * and copy buffer size to the default values. */
-        if (H5Pset_fapl_direct(fapl, 1024, 4096, 8*4096)<0) return -1;
-#endif
-    } else {
-        /* Unknown driver */
-        return -1;
-    }
-
-    return fapl;
-}
-
-/*
- * Function:    do_fclose
- * Purpose:     Close the specified file descriptor.
- * Return:      SUCCESS or FAIL
- * Programmer:  Albert Cheng, Bill Wendling, 2001/12/13
- * Modifications:
- */
-    static herr_t
-do_fclose(iotype iot, file_descr *fd /*out*/)
-{
-    herr_t ret_code = SUCCESS, hrc;
-    int  rc = 0;
-
-    switch (iot) {
-    case POSIXIO:
-        rc = POSIXCLOSE(fd->posixfd);
-
-        if (rc != 0){
-        fprintf(stderr, "POSIX File Close failed\n");
-        GOTOERROR(FAIL);
-        }
-
-        fd->posixfd = -1;
-        break;
-
-    case HDF5:
-        hrc = H5Fclose(fd->h5fd);
-
-        if (hrc < 0) {
-        fprintf(stderr, "HDF5 File Close failed\n");
-        GOTOERROR(FAIL);
-        }
-
-        fd->h5fd = -1;
-        break;
-    }
-
-done:
-    return ret_code;
-}
-
-
-/*
- * Function:    do_cleanupfile
- * Purpose:     Cleanup temporary file unless HDF5_NOCLEANUP is set.
- * Return:      void
- * Programmer:  Albert Cheng 2001/12/12
- * Modifications: Support for file drivers. Christian Chilan, April, 2008
- */
-    static void
-do_cleanupfile(iotype iot, char *filename)
-{
-    char        temp[2048];
-    int         j;
-    hid_t       driver;
-
-    if (clean_file_g == -1)
-    clean_file_g = (getenv("HDF5_NOCLEANUP")==NULL) ? 1 : 0;
-
-    if (clean_file_g){
-
-     switch (iot) {
-    case POSIXIO:
-          HDremove(filename);
-        break;
-
-    case HDF5:
-           driver = H5Pget_driver(fapl);
-
-            if (driver == H5FD_FAMILY) {
-                for (j = 0; /*void*/; j++) {
-                    HDsnprintf(temp, sizeof temp, filename, j);
-
-                    if (HDaccess(temp, F_OK) < 0)
-                        break;
-
-                    HDremove(temp);
-                }
-            } else if (driver == H5FD_CORE) {
-                hbool_t backing;        /* Whether the core file has backing store */
-
-                H5Pget_fapl_core(fapl,NULL,&backing);
-
-                /* If the file was stored to disk with bacing store, remove it */
-                if(backing)
-                    HDremove(filename);
-
-            } else if (driver == H5FD_MULTI) {
-                H5FD_mem_t mt;
-                assert(HDstrlen(multi_letters)==H5FD_MEM_NTYPES);
-
-                for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) {
-                    HDsnprintf(temp, sizeof temp, "%s-%c.h5",
-                               filename, multi_letters[mt]);
-                    HDremove(temp); /*don't care if it fails*/
-                }
-            } else {
-                HDremove(filename);
-            }
-            H5Pclose(fapl);
-            break;
-      }   
-}
-}
-
-#ifdef H5_HAVE_GPFS
-
-/* Descriptions here come from the IBM GPFS Manual */
-
-/*
- * Function:    gpfs_access_range
- * Purpose:     Declares an access range within a file for an
- *              application.
- *
- *              The application will access file offsets within the given
- *              range, and will not access offsets outside the range.
- *              Violating this hint may produce worse performance than if
- *              no hint was specified.
- *
- *              This hint is useful in situations where a file is
- *              partitioned coarsely among several nodes. If the ranges
- *              do not overlap, each node can specify which range of the
- *              file it will access, with a performance improvement in
- *              some cases, such as for sequential writing within a
- *              range.
- *
- *              Subsequent GPFS_ACCESS_RANGE hints will replace a hint
- *              passed earlier.
- *
- *                  START    - The start of the access range offset, in
- *                             bytes, from the beginning of the file
- *                  LENGTH   - Length of the access range. 0 indicates to
- *                             the end of the file
- *                  IS_WRITE - 0 indicates READ access, 1 indicates WRITE access
- * Return:      Nothing
- * Programmer:  Bill Wendling, 03. June 2002
- * Modifications:
- */
-    static void
-gpfs_access_range(int handle, off_t start, off_t length, int is_write)
-{
-    struct {
-    gpfsFcntlHeader_t hdr;
-    gpfsAccessRange_t access;
-    } access_range;
-
-    access_range.hdr.totalLength = sizeof(access_range);
-    access_range.hdr.fcntlVersion = GPFS_FCNTL_CURRENT_VERSION;
-    access_range.hdr.fcntlReserved = 0;
-    access_range.access.structLen = sizeof(gpfsAccessRange_t);
-    access_range.access.structType = GPFS_ACCESS_RANGE;
-    access_range.access.start = start;
-    access_range.access.length = length;
-    access_range.access.isWrite = is_write;
-
-    if (gpfs_fcntl(handle, &access_range) != 0) {
-    fprintf(stderr,
-        "gpfs_fcntl DS start directive failed. errno=%d errorOffset=%d\n",
-        errno, access_range.hdr.errorOffset);
-    exit(EXIT_FAILURE);
-    }
-}
-
-/*
- * Function:    gpfs_free_range
- * Purpose:     Undeclares an access range within a file for an
- *              application.
- *
- *              The application will no longer access file offsets within
- *              the given range. GPFS flushes the data at the file
- *              offsets and removes it from the cache.
- *
- *              Multi-node applications that have finished one phase of
- *              their computation may wish to use this hint before the
- *              file is accessed in a conflicting mode from another node
- *              in a later phase. The potential performance benefit is
- *              that GPFS can avoid later synchronous cache consistency
- *              operations.
- *
- *                  START  - The start of the access range offset, in
- *                           bytes from the beginning of the file.
- *                  LENGTH - Length of the access range. 0 indicates to
- *                           the end of the file.
- * Return:      Nothing
- * Programmer:  Bill Wendling, 03. June 2002
- * Modifications:
- */
-    static void
-gpfs_free_range(int handle, off_t start, off_t length)
-{
-    struct {
-    gpfsFcntlHeader_t hdr;
-    gpfsFreeRange_t range;
-    } free_range;
-
-    /* Issue the invalidate hint */
-    free_range.hdr.totalLength = sizeof(free_range);
-    free_range.hdr.fcntlVersion = GPFS_FCNTL_CURRENT_VERSION;
-    free_range.hdr.fcntlReserved = 0;
-    free_range.range.structLen = sizeof(gpfsFreeRange_t);
-    free_range.range.structType = GPFS_FREE_RANGE;
-    free_range.range.start = start;
-    free_range.range.length = length;
-
-    if (gpfs_fcntl(handle, &free_range) != 0) {
-    fprintf(stderr,
-        "gpfs_fcntl free range failed for range %d:%d. errno=%d errorOffset=%d\n",
-        start, length, errno, free_range.hdr.errorOffset);
-    exit(EXIT_FAILURE);
-    }
-}
-
-/*
- * Function:    gpfs_clear_file_cache
- * Purpose:     Indicates file access in the near future is not expected.
- *
- *              The application does not expect to make any further
- *              accesses to the file in the near future, so GPFS removes
- *              any data or metadata pertaining to the file from its
- *              cache.
- *
- *              Multi-node applications that have finished one phase of
- *              their computation may wish to use this hint before the
- *              file is accessed in a conflicting mode from another node
- *              in a later phase. The potential performance benefit is
- *              that GPFS can avoid later synchronous cache consistency
- *              operations.
- * Return:      Nothing
- * Programmer:  Bill Wendling, 03. June 2002
- * Modifications:
- */
-    static void
-gpfs_clear_file_cache(int handle)
-{
-    struct {
-    gpfsFcntlHeader_t hdr;
-    gpfsClearFileCache_t clear;
-    } clear_cache;
-
-    clear_cache.hdr.totalLength = sizeof(clear_cache);
-    clear_cache.hdr.fcntlVersion = GPFS_FCNTL_CURRENT_VERSION;
-    clear_cache.hdr.fcntlReserved = 0;
-    clear_cache.clear.structLen = sizeof(gpfsClearFileCache_t);
-    clear_cache.clear.structType = GPFS_CLEAR_FILE_CACHE;
-
-    if (gpfs_fcntl(handle, &clear_cache) != 0) {
-    fprintf(stderr,
-        "gpfs_fcntl clear file cache directive failed. errno=%d errorOffset=%d\n",
-        errno, clear_cache.hdr.errorOffset);
-    exit(EXIT_FAILURE);
-    }
-}
-
-/*
- * Function:    gpfs_cancel_hints
- * Purpose:     Indicates to remove any hints against the open file
- *              handle.
- *
- *              GPFS removes any hints that may have been issued against
- *              this open file handle:
- *
- *                  - The hint status of the file is restored ot what it
- *                    would have been immediately after being opened, but
- *                    does not affect the contents of the GPFS file
- *                    cache. Cancelling an earlier hint that resulted in
- *                    data being removed from the GPFS file cache does
- *                    not bring that data back int othe cache; data
- *                    re-enters the cache only pon access by the
- *                    application or by user-driven or automatic
- *                    prefetching.
- *                  - Only the GPFS_MULTIPLE_ACCESS_RANGE hint has a
- *                    state that might be removed by the
- *                    GPFS_CANCEL_HINTS directive.
- * Return:      Nothing
- * Programmer:  Bill Wendling, 03. June 2002
- * Modifications:
- */
-    static void
-gpfs_cancel_hints(int handle)
-{
-    struct {
-    gpfsFcntlHeader_t hdr;
-    gpfsCancelHints_t cancel;
-    } cancel_hints;
-
-    cancel_hints.hdr.totalLength = sizeof(cancel_hints);
-    cancel_hints.hdr.fcntlVersion = GPFS_FCNTL_CURRENT_VERSION;
-    cancel_hints.hdr.fcntlReserved = 0;
-    cancel_hints.cancel.structLen = sizeof(gpfsCancelHints_t);
-    cancel_hints.cancel.structType = GPFS_CANCEL_HINTS;
-
-    if (gpfs_fcntl(handle, &cancel_hints) != 0) {
-    fprintf(stderr,
-        "gpfs_fcntl cancel hints directive failed. errno=%d errorOffset=%d\n",
-        errno, cancel_hints.hdr.errorOffset);
-    exit(EXIT_FAILURE);
-    }
-}
-
-/*
- * Function:    gpfs_start_data_shipping
- * Purpose:     Initiates data shipping mode.
- *
- *              Once all participating threads have issued this directive
- *              for a file, GPFS enters a mode where it logically
- *              partitions the blocks of the file among a group of agent
- *              nodes. The agents are those nodes on which one or more
- *              threads have issued the GPFS_DATA_SHIP_START directive.
- *              Each thread that has issued a GPFS_DATA_SHIP_START
- *              directive and the associated agent nodes are referred to
- *              as the data shipping collective.
- *
- *              The second parameter is the total number of open
- *              instances on all nodes that will be operating on the
- *              file. Must be called for every such instance with the
- *              same value of NUM_INSTS.
- *
- *                  NUM_INSTS - The number of open file instances, on all
- *                              nodes, collaborating to operate on the file
- * Return:      Nothing
- * Programmer:  Bill Wendling, 28. May 2002
- * Modifications:
- */
-    static void
-gpfs_start_data_shipping(int handle, int num_insts)
-{
-    struct {
-    gpfsFcntlHeader_t hdr;
-    gpfsDataShipStart_t start;
-    } ds_start;
-
-    ds_start.hdr.totalLength = sizeof(ds_start);
-    ds_start.hdr.fcntlVersion = GPFS_FCNTL_CURRENT_VERSION;
-    ds_start.hdr.fcntlReserved = 0;
-    ds_start.start.structLen = sizeof(gpfsDataShipStart_t);
-    ds_start.start.structType = GPFS_DATA_SHIP_START;
-    ds_start.start.numInstances = num_insts;
-    ds_start.start.reserved = 0;
-
-    if (gpfs_fcntl(handle, &ds_start) != 0) {
-    fprintf(stderr,
-        "gpfs_fcntl DS start directive failed. errno=%d errorOffset=%d\n",
-        errno, ds_start.hdr.errorOffset);
-    exit(EXIT_FAILURE);
-    }
-}
-
-/*
- * Function:    gpfs_start_data_ship_map
- * Purpose:     Indicates which agent nodes are to be used for data
- *              shipping. GPFS recognizes which agent nodes to use for
- *              data shipping.
- *
- *                  PARTITION_SIZE - The number of contiguous bytes per
- *                                   server. This value must be a
- *                                   multiple of the number of bytes in a
- *                                   single file system block
- *                  AGENT_COUNT    - The number of entries in the
- *                                   agentNodeNumber array
- *                  AGENT_NODE_NUM - The data ship agent node numbers as
- *                                   listed in the SDT or the global ODM
- *
- * Return:      Nothing
- * Programmer:  Bill Wendling, 10. Jul 2002
- * Modifications:
- */
-    static void
-gpfs_start_data_ship_map(int handle, int partition_size, int agent_count,
-    int *agent_node_num)
-{
-    int i;
-    struct {
-    gpfsFcntlHeader_t hdr;
-    gpfsDataShipMap_t map;
-    } ds_map;
-
-    ds_map.hdr.totalLength = sizeof(ds_map);
-    ds_map.hdr.fcntlVersion = GPFS_FCNTL_CURRENT_VERSION;
-    ds_map.hdr.fcntlReserved = 0;
-    ds_map.map.structLen = sizeof(gpfsDataShipMap_t);
-    ds_map.map.structType = GPFS_DATA_SHIP_MAP;
-    ds_map.map.partitionSize = partition_size;
-    ds_map.map.agentCount = agent_count;
-
-    for (i = 0; i < agent_count; ++i)
-    ds_map.map.agentNodeNumber[i] = agent_node_num[i];
-
-    if (gpfs_fcntl(handle, &ds_map) != 0) {
-    fprintf(stderr,
-        "gpfs_fcntl DS map directive failed. errno=%d errorOffset=%d\n",
-        errno, ds_map.hdr.errorOffset);
-    exit(EXIT_FAILURE);
-    }
-}
-
-/*
- * Function:    gpfs_stop_data_shipping
- * Purpose:     Takes a file out of the data shipping mode.
- *
- *              - GPFS waits for all threads that issued the
- *                GPFS_DATA_SHIP_START directive to issue this directive,
- *                then flushes the dirty file data to disk.
- *
- *              - While a gpfs_cntl() call is blocked for other threads,
- *                the call can be interrupted by any signal. If a signal
- *                is delivered to any of the waiting calls, all waiting
- *                calls on every node will be interrupted and will return
- *                EINTR. GPFS will not cancel data shipping mode if such
- *                a signal occurs. It is the responsibility of the
- *                application to mask off any signals that might normally
- *                occur while waiting for another node in the data
- *                shipping collective. Several libraries use SIGALRM; the
- *                thread that makes the gpfs_fcntl() call should use
- *                sigthreadmask to mask off delivery of this signal while
- *                inside the call.
- * Return:      Nothing
- * Programmer:  Bill Wendling, 28. May 2002
- * Modifications:
- */
-    static void
-gpfs_stop_data_shipping(int handle)
-{
-    struct {
-    gpfsFcntlHeader_t hdr;
-    gpfsDataShipStop_t stop;
-    } ds_stop;
-
-    ds_stop.hdr.totalLength = sizeof(ds_stop);
-    ds_stop.hdr.fcntlVersion = GPFS_FCNTL_CURRENT_VERSION;
-    ds_stop.hdr.fcntlReserved = 0;
-    ds_stop.stop.structLen = sizeof(ds_stop.stop);
-    ds_stop.stop.structType = GPFS_DATA_SHIP_STOP;
-
-    if (gpfs_fcntl(handle, &ds_stop) != 0)
-    fprintf(stderr,
-        "gpfs_fcntl DS stop directive failed. errno=%d errorOffset=%d\n",
-        errno, ds_stop.hdr.errorOffset);
-}
-
-/*
- * Function:    gpfs_invalidate_file_cache
- * Purpose:     Invalidate all cached data held on behalf of a file on
- *              this node.
- * Return:      Nothing
- * Programmer:  Bill Wendling, 03. June 2002
- * Modifications:
- */
-    static void
-gpfs_invalidate_file_cache(const char *filename)
-{
-    int handle;
-    struct {
-    gpfsFcntlHeader_t hdr;
-    gpfsClearFileCache_t inv;
-    } inv_cache_hint;
-
-    /* Open the file.  If the open fails, the file cannot be cached. */
-    handle = open(filename, O_RDONLY, 0);
-
-    if (handle == -1)
-    return;
-
-    /* Issue the invalidate hint */
-    inv_cache_hint.hdr.totalLength = sizeof(inv_cache_hint);
-    inv_cache_hint.hdr.fcntlVersion = GPFS_FCNTL_CURRENT_VERSION;
-    inv_cache_hint.hdr.fcntlReserved = 0;
-    inv_cache_hint.inv.structLen = sizeof(gpfsClearFileCache_t);
-    inv_cache_hint.inv.structType = GPFS_CLEAR_FILE_CACHE;
-
-    if (gpfs_fcntl(handle, &inv_cache_hint) != 0) {
-    fprintf(stderr,
-        "gpfs_fcntl clear cache hint failed for file '%s'.",
-        filename);
-    fprintf(stderr, " errno=%d errorOffset=%d\n",
-        errno, inv_cache_hint.hdr.errorOffset);
-    exit(1);
-    }
-
-    /* Close the file */
-    if (close(handle) == -1) {
-    fprintf(stderr,
-        "could not close file '%s' after flushing file cache, ",
-        filename);
-    fprintf(stderr, "errno=%d\n", errno);
-    exit(1);
-    }
-}
-
-#else
-
-/* turn the stubs off since some compilers are warning they are not used */
-#if 0
-/* H5_HAVE_GPFS isn't defined...stub functions */
-
-    static void
-gpfs_access_range(int UNUSED handle, off_t UNUSED start, off_t UNUSED length,
-    int UNUSED is_write)
-{
-    return;
-}
-
-    static void
-gpfs_free_range(int UNUSED handle, off_t UNUSED start, off_t UNUSED length)
-{
-    return;
-}
-
-    static void
-gpfs_clear_file_cache(int UNUSED handle)
-{
-    return;
-}
-
-    static void
-gpfs_cancel_hints(int UNUSED handle)
-{
-    return;
-}
-
-    static void
-gpfs_start_data_shipping(int UNUSED handle, int UNUSED num_insts)
-{
-    return;
-}
-
-    static void
-gpfs_stop_data_shipping(int UNUSED handle)
-{
-    return;
-}
-
-    static void
-gpfs_start_data_ship_map(int UNUSED handle, int UNUSED partition_size,
-    int UNUSED agent_count, int UNUSED *agent_node_num)
-{
-    return;
-}
-
-    static void
-gpfs_invalidate_file_cache(const char UNUSED *filename)
-{
-    return;
-}
-
-#endif  /* 0 */
-
-#endif  /* H5_HAVE_GPFS */
-
-
diff --git a/perform/sio_perf.c b/perform/sio_perf.c
deleted file mode 100644
index 9e5ed23..0000000
--- a/perform/sio_perf.c
+++ /dev/null
@@ -1,1446 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
- * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Serial HDF5 Performance Testing Code
- * --------------------------------------
- *
- * Portable code to test performance on the different platforms we support.
- * This is what the report should look like:
- *
- *  nprocs = Max#Procs
- *      IO API = POSIXIO
- *          # Files = 1, # of dsets = 1000, Elements per dset = 37000
- *              Write Results = x MB/s
- *              Read Results = x MB/s
- *          # Files = 1, # of dsets = 3000, Elements per dset = 37000
- *              Write Results = x MB/s
- *              Read Results = x MB/s
- *
- *          . . .
- *
- *
- *      IO API = HDF5
- *          # Files = 1, # of dsets = 1000, Elements per dset = 37000
- *              Write Results = x MB/s
- *              Read Results = x MB/s
- *          # Files = 1, # of dsets = 3000, Elements per dset = 37000
- *              Write Results = x MB/s
- *              Read Results = x MB/s
- *
- *          . . .
- *
- *
- *      . . .
- *
- */
-
-/* system header files */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "hdf5.h"
-
-
-/* our header files */
-#include "sio_perf.h"
-
-/* useful macros */
-#define TAB_SPACE           4
-
-#define ONE_KB              1024
-#define ONE_MB              (ONE_KB * ONE_KB)
-#define ONE_GB              (ONE_MB * ONE_KB)
-
-#define SIO_POSIX           0x1
-#define SIO_HDF5            0x4
-
-/* report 0.0 in case t is zero too */
-#define MB_PER_SEC(bytes,t) (((t)==0.0) ? 0.0 : ((((double)bytes) / ONE_MB) / (t)))
-
-#ifndef TRUE
-#define TRUE    1
-#endif  /* TRUE */
-#ifndef FALSE
-#define FALSE   (!TRUE)
-#endif  /* FALSE */
-
-/* global variables */
-FILE       *output;             /* output file                          */
-int         sio_debug_level = 0;/* The debug level:
-                                 *   0 - Off
-                                 *   1 - Minimal
-                                 *   2 - Some more
-                                 *   3 - Maximal
-                                 *   4 - Maximal & then some
-                                 */
-
-/* local variables */
-static const char  *progname = "h5perf_serial";
-
-/*
- * Command-line options: The user can specify short or long-named
- * parameters. The long-named ones can be partially spelled. When
- * adding more, make sure that they don't clash with each other.
- */
-
-/*
- * It seems that only the options that accept additional information
- * such as dataset size (-e) require the colon next to it.
- */
-#if 1
-static const char *s_opts = "a:A:B:c:Cd:D:e:F:ghi:Imno:p:P:r:stT:v:wx:X:";
-#else
-static const char *s_opts = "a:A:bB:c:Cd:D:e:F:ghi:Imno:p:P:r:stT:wx:X:";
-#endif  /* 1 */
-static struct long_options l_opts[] = {
-    { "align", require_arg, 'a' },
-    { "alig", require_arg, 'a' },
-    { "ali", require_arg, 'a' },
-    { "al", require_arg, 'a' },
-    { "api", require_arg, 'A' },
-    { "ap", require_arg, 'A' },
-#if 0
-    /* a sighting of the elusive binary option */
-    { "binary", no_arg, 'b' },
-    { "binar", no_arg, 'b' },
-    { "bina", no_arg, 'b' },
-    { "bin", no_arg, 'b' },
-    { "bi", no_arg, 'b' },
-#endif  /* 0 */
-    { "block-size", require_arg, 'B' },
-    { "block-siz", require_arg, 'B' },
-    { "block-si", require_arg, 'B' },
-    { "block-s", require_arg, 'B' },
-    { "block-", require_arg, 'B' },
-    { "block", require_arg, 'B' },
-    { "bloc", require_arg, 'B' },
-    { "blo", require_arg, 'B' },
-    { "bl", require_arg, 'B' },
-    { "chunk", no_arg, 'c' },
-    { "chun", no_arg, 'c' },
-    { "chu", no_arg, 'c' },
-    { "ch", no_arg, 'c' },
-    { "collective", no_arg, 'C' },
-    { "collectiv", no_arg, 'C' },
-    { "collecti", no_arg, 'C' },
-    { "collect", no_arg, 'C' },
-    { "collec", no_arg, 'C' },
-    { "colle", no_arg, 'C' },
-    { "coll", no_arg, 'C' },
-    { "col", no_arg, 'C' },
-    { "co", no_arg, 'C' },
-    { "debug", require_arg, 'D' },
-    { "debu", require_arg, 'D' },
-    { "deb", require_arg, 'D' },
-    { "de", require_arg, 'D' },
-    { "file-driver", require_arg, 'v' },
-    { "file-drive", require_arg, 'v' },
-    { "file-driv", require_arg, 'v' },
-    { "file-dri", require_arg, 'v' },
-    { "file-dr", require_arg, 'v' },
-    { "file-d", require_arg, 'v' },
-    { "file-", require_arg, 'v' },
-    { "file", require_arg, 'v' },
-    { "fil", require_arg, 'v' },
-    { "fi", require_arg, 'v' },
-    { "geometry", no_arg, 'g' },
-    { "geometr", no_arg, 'g' },
-    { "geomet", no_arg, 'g' },
-    { "geome", no_arg, 'g' },
-    { "geom", no_arg, 'g' },
-    { "geo", no_arg, 'g' },
-    { "ge", no_arg, 'g' },
-    { "help", no_arg, 'h' },
-    { "hel", no_arg, 'h' },
-    { "he", no_arg, 'h' },
-    { "interleaved", require_arg, 'I' },
-    { "interleave", require_arg, 'I' },
-    { "interleav", require_arg, 'I' },
-    { "interlea", require_arg, 'I' },
-    { "interle", require_arg, 'I' },
-    { "interl", require_arg, 'I' },
-    { "inter", require_arg, 'I' },
-    { "inte", require_arg, 'I' },
-    { "int", require_arg, 'I' },
-    { "in", require_arg, 'I' },
-    { "max-num-processes", require_arg, 'P' },
-    { "max-num-processe", require_arg, 'P' },
-    { "max-num-process", require_arg, 'P' },
-    { "max-num-proces", require_arg, 'P' },
-    { "max-num-proce", require_arg, 'P' },
-    { "max-num-proc", require_arg, 'P' },
-    { "max-num-pro", require_arg, 'P' },
-    { "max-num-pr", require_arg, 'P' },
-    { "max-num-p", require_arg, 'P' },
-    { "min-num-processes", require_arg, 'p' },
-    { "min-num-processe", require_arg, 'p' },
-    { "min-num-process", require_arg, 'p' },
-    { "min-num-proces", require_arg, 'p' },
-    { "min-num-proce", require_arg, 'p' },
-    { "min-num-proc", require_arg, 'p' },
-    { "min-num-pro", require_arg, 'p' },
-    { "min-num-pr", require_arg, 'p' },
-    { "min-num-p", require_arg, 'p' },
-    { "max-xfer-size", require_arg, 'X' },
-    { "max-xfer-siz", require_arg, 'X' },
-    { "max-xfer-si", require_arg, 'X' },
-    { "max-xfer-s", require_arg, 'X' },
-    { "max-xfer", require_arg, 'X' },
-    { "max-xfe", require_arg, 'X' },
-    { "max-xf", require_arg, 'X' },
-    { "max-x", require_arg, 'X' },
-    { "min-xfer-size", require_arg, 'x' },
-    { "min-xfer-siz", require_arg, 'x' },
-    { "min-xfer-si", require_arg, 'x' },
-    { "min-xfer-s", require_arg, 'x' },
-    { "min-xfer", require_arg, 'x' },
-    { "min-xfe", require_arg, 'x' },
-    { "min-xf", require_arg, 'x' },
-    { "min-x", require_arg, 'x' },
-    { "mpi-posix", no_arg, 'm' },
-    { "mpi-posi", no_arg, 'm' },
-    { "mpi-pos", no_arg, 'm' },
-    { "mpi-po", no_arg, 'm' },
-    { "mpi-p", no_arg, 'm' },
-    { "mpi-", no_arg, 'm' },
-    { "mpi", no_arg, 'm' },
-    { "mp", no_arg, 'm' },
-    { "num-bytes", require_arg, 'e' },
-    { "num-byte", require_arg, 'e' },
-    { "num-byt", require_arg, 'e' },
-    { "num-by", require_arg, 'e' },
-    { "num-b", require_arg, 'e' },
-    { "num-dsets", require_arg, 'd' },
-    { "num-dset", require_arg, 'd' },
-    { "num-dse", require_arg, 'd' },
-    { "num-ds", require_arg, 'd' },
-    { "num-d", require_arg, 'd' },
-    { "num-files", require_arg, 'F' },
-    { "num-file", require_arg, 'F' },
-    { "num-fil", require_arg, 'F' },
-    { "num-fi", require_arg, 'F' },
-    { "num-f", require_arg, 'F' },
-    { "num-iterations", require_arg, 'i' },
-    { "num-iteration", require_arg, 'i' },
-    { "num-iteratio", require_arg, 'i' },
-    { "num-iterati", require_arg, 'i' },
-    { "num-iterat", require_arg, 'i' },
-    { "num-itera", require_arg, 'i' },
-    { "num-iter", require_arg, 'i' },
-    { "num-ite", require_arg, 'i' },
-    { "num-it", require_arg, 'i' },
-    { "num-i", require_arg, 'i' },
-    { "order", require_arg, 'r' },
-    { "orde", require_arg, 'r' },
-    { "ord", require_arg, 'r' },
-    { "or", require_arg, 'r' },
-    { "output", require_arg, 'o' },
-    { "outpu", require_arg, 'o' },
-    { "outp", require_arg, 'o' },
-    { "out", require_arg, 'o' },
-    { "ou", require_arg, 'o' },
-    { "extendable", no_arg, 't' },
-    { "extendabl", no_arg, 't' },
-    { "extendab", no_arg, 't' },
-    { "extenda", no_arg, 't' },
-    { "extend", no_arg, 't' },
-    { "exten", no_arg, 't' },
-    { "exte", no_arg, 't' },
-    { "ext", no_arg, 't' },
-    { "ex", no_arg, 't' },
-    { "threshold", require_arg, 'T' },
-    { "threshol", require_arg, 'T' },
-    { "thresho", require_arg, 'T' },
-    { "thresh", require_arg, 'T' },
-    { "thres", require_arg, 'T' },
-    { "thre", require_arg, 'T' },
-    { "thr", require_arg, 'T' },
-    { "th", require_arg, 'T' },
-    { "write-only", require_arg, 'w' },
-    { "write-onl", require_arg, 'w' },
-    { "write-on", require_arg, 'w' },
-    { "write-o", require_arg, 'w' },
-    { "write", require_arg, 'w' },
-    { "writ", require_arg, 'w' },
-    { "wri", require_arg, 'w' },
-    { "wr", require_arg, 'w' },
-    { NULL, 0, '\0' }
-};
-
-struct options {
-    long io_types;              /* bitmask of which I/O types to test   */
-    const char *output_file;    /* file to print report to              */
-    long num_dsets;             /* number of datasets                   */
-    long num_files;             /* number of files                      */
-    off_t num_bpp;              /* number of bytes per proc per dset    */
-    int num_iters;              /* number of iterations                 */
-    off_t dset_size[MAX_DIMS];  /* Dataset size                           */
-    size_t buf_size[MAX_DIMS];  /* Buffer size                           */
-    size_t chk_size[MAX_DIMS];  /* Chunk size                           */
-    int order[MAX_DIMS];  /* Dimension access order                           */
-    int dset_rank;             /* Rank                   */
-    int buf_rank;             /* Rank                   */
-    int order_rank;             /* Rank                   */
-    int chk_rank;             /* Rank                   */
-    int print_times;       	/* print times as well as throughputs   */
-    int print_raw;         	/* print raw data throughput info       */
-    off_t h5_alignment;         /* alignment in HDF5 file               */
-    off_t h5_threshold;         /* threshold for alignment in HDF5 file */
-    int h5_use_chunks;     	/* Make HDF5 dataset chunked            */
-    int h5_write_only;        	/* Perform the write tests only         */
-    int h5_extendable;        	/* Perform the write tests only         */
-    unsigned h5_use_mpi_posix;  /* Use MPI-posix VFD for HDF5 I/O (instead of MPI-I/O VFD) */
-    int verify;        		/* Verify data correctness              */
-    vfdtype     vfd;            /* File driver */
-
-};
-
-typedef struct _minmax {
-    double min;
-    double max;
-    double sum;
-    int num;
-} minmax;
-
-/* local functions */
-static off_t parse_size_directive(const char *size);
-static struct options *parse_command_line(int argc, char *argv[]);
-static void run_test_loop(struct options *options);
-static int run_test(iotype iot, parameters parms, struct options *opts);
-static void output_all_info(minmax *mm, int count, int indent_level);
-static void get_minmax(minmax *mm, double val);
-static minmax accumulate_minmax_stuff(minmax *mm, int count);
-static void output_results(const struct options *options, const char *name,
-                           minmax *table, int table_size, off_t data_size);
-static void output_report(const char *fmt, ...);
-static void print_indent(register int indent);
-static void usage(const char *prog);
-static void report_parameters(struct options *opts);
-
-/*
- * Function:    main
- * Purpose:     Start things up.
- * Return:      EXIT_SUCCESS or EXIT_FAILURE
- * Programmer:  Bill Wendling, 30. October 2001
- * Modifications:
- */
-int
-main(int argc, char **argv)
-{
-    int ret;
-    int exit_value = EXIT_SUCCESS;
-    struct options *opts = NULL;
-
-    output = stdout;
-
-    opts = parse_command_line(argc, argv);
-
-    if (!opts) {
-        exit_value = EXIT_FAILURE;
-        goto finish;
-    }
-
-    if (opts->output_file) {
-        if ((output = fopen(opts->output_file, "w")) == NULL) {
-            fprintf(stderr, "%s: cannot open output file\n", progname);
-            perror(opts->output_file);
-            goto finish;
-        }
-    }
-
-    report_parameters(opts);
-
-    run_test_loop(opts);
-
-finish:
-    free(opts);
-    return exit_value;
-}
-
-/*
- * Function:    run_test_loop
- * Purpose:     Run the I/O tests. Write the results to OUTPUT.
- *
- *            - The slowest changing part of the test is the number of
- *              processors to use. For each loop iteration, we divide that
- *              number by 2 and rerun the test.
- *
- *            - The second slowest is what type of IO API to perform. We have
- *              three choices: POSIXIO, and HDF5.
- *
- *            - Then we change the size of the buffer. This information is
- *              inferred from the number of datasets to create and the number
- *              of integers to put into each dataset. The backend code figures
- *              this out.
- *
- * Return:      Nothing
- * Programmer:  Bill Wendling, 30. October 2001
- * Modifications:
- *    Added 2D testing (Christian Chilan, 10. August 2005)
- */
-static void
-run_test_loop(struct options *opts)
-{
-    parameters parms;
-    int i;
-    int doing_sio;      /* if this process is doing SIO */
-    size_t      buf_bytes;     
-    /* load options into parameter structure */
-    parms.num_files = opts->num_files;
-    parms.num_dsets = opts->num_dsets;
-    parms.num_iters = opts->num_iters;
-    parms.rank = opts->dset_rank;
-    parms.h5_align = opts->h5_alignment;
-    parms.h5_thresh = opts->h5_threshold;
-    parms.h5_use_chunks = opts->h5_use_chunks;
-    parms.h5_extendable = opts->h5_extendable;
-    parms.h5_write_only = opts->h5_write_only;
-    parms.h5_use_mpi_posix = opts->h5_use_mpi_posix;
-    parms.verify = opts->verify;
-    parms.vfd = opts->vfd;
-
-    /* load multidimensional options */
-    parms.num_bytes = 1;
-    buf_bytes = 1;
-    for (i=0; i<parms.rank; i++){
-        parms.buf_size[i] = opts->buf_size[i];
-        parms.dset_size[i] = opts->dset_size[i];
-        parms.chk_size[i] = opts->chk_size[i];
-        parms.order[i] = opts->order[i];
-        parms.num_bytes *= opts->dset_size[i];
-        buf_bytes *= opts->buf_size[i];
-    }
-
-    /* print size information */
-    output_report("Transfer Buffer Size (bytes): %d\n", buf_bytes);
-    output_report("File Size(MB): %.2f\n",((double)parms.num_bytes) / ONE_MB);
-
-    print_indent(0);
-    if (opts->io_types & SIO_POSIX)
-        run_test(POSIXIO, parms, opts);
-
-    print_indent(0);
-    if (opts->io_types & SIO_HDF5)
-        run_test(HDF5, parms, opts);
-}
-
-/*
- * Function:    run_test
- * Purpose:     Inner loop call to actually run the I/O test.
- * Return:      Nothing
- * Programmer:  Bill Wendling, 18. December 2001
- * Modifications:
- */
-static int
-run_test(iotype iot, parameters parms, struct options *opts)
-{
-    results         res;
-    register int    i, ret_value = SUCCESS;
-    int             comm_size;
-    off_t           raw_size;
-    minmax         *write_sys_mm_table=NULL;
-    minmax         *write_mm_table=NULL;
-    minmax         *write_gross_mm_table=NULL;
-    minmax         *write_raw_mm_table=NULL;
-    minmax         *read_sys_mm_table=NULL;
-    minmax         *read_mm_table=NULL;
-    minmax         *read_gross_mm_table=NULL;
-    minmax         *read_raw_mm_table=NULL;
-    minmax          write_sys_mm = {0.0, 0.0, 0.0, 0};
-    minmax          write_mm = {0.0, 0.0, 0.0, 0};
-    minmax          write_gross_mm = {0.0, 0.0, 0.0, 0};
-    minmax          write_raw_mm = {0.0, 0.0, 0.0, 0};
-    minmax          read_sys_mm = {0.0, 0.0, 0.0, 0};
-    minmax          read_mm = {0.0, 0.0, 0.0, 0};
-    minmax          read_gross_mm = {0.0, 0.0, 0.0, 0};
-    minmax          read_raw_mm = {0.0, 0.0, 0.0, 0};
-
-    raw_size = (off_t)parms.num_bytes;
-    parms.io_type = iot;
-    print_indent(2);
-    output_report("IO API = ");
-
-    switch (iot) {
-        case POSIXIO:
-            output_report("POSIX\n");
-            break;
-        case HDF5:
-            output_report("HDF5\n");
-            break;
-    }
-
-    /* allocate space for tables minmax and that it is sufficient */
-    /* to initialize all elements to zeros by calloc.             */
-    write_sys_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
-    write_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
-    write_gross_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
-    write_raw_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
-
-    if (!parms.h5_write_only) {
-        read_sys_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
-        read_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
-        read_gross_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
-        read_raw_mm_table = calloc((size_t)parms.num_iters , sizeof(minmax));
-    }
-
-    /* Do IO iteration times, collecting statistics each time */
-    for (i = 0; i < parms.num_iters; ++i) {
-        double t;
-        res = do_sio(parms);
-
-        /* gather all of the "sys write" times */
-        t = get_time(res.timers, HDF5_MPI_WRITE);
-        get_minmax(&write_sys_mm, t);
-
-        write_sys_mm_table[i] = write_sys_mm;
-
-        /* gather all of the "write" times */
-        t = get_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS);
-        get_minmax(&write_mm, t);
-
-        write_mm_table[i] = write_mm;
-
-        /* gather all of the "write" times from open to close */
-        t = get_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS);
-        get_minmax(&write_gross_mm, t);
-
-        write_gross_mm_table[i] = write_gross_mm;
-
-        /* gather all of the raw "write" times */
-        t = get_time(res.timers, HDF5_RAW_WRITE_FIXED_DIMS);
-        get_minmax(&write_raw_mm, t);
-
-        write_raw_mm_table[i] = write_raw_mm;
-
-        if (!parms.h5_write_only) {
-            /* gather all of the "mpi read" times */
-            t = get_time(res.timers, HDF5_MPI_READ);
-            get_minmax(&read_sys_mm, t);
-
-            read_sys_mm_table[i] = read_sys_mm;
-
-            /* gather all of the "read" times */
-            t = get_time(res.timers, HDF5_FINE_READ_FIXED_DIMS);
-            get_minmax(&read_mm, t);
-
-            read_mm_table[i] = read_mm;
-
-            /* gather all of the "read" times from open to close */
-            t = get_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS);
-            get_minmax(&read_gross_mm, t);
-
-            read_gross_mm_table[i] = read_gross_mm;
-
-            /* gather all of the raw "read" times */
-            t = get_time(res.timers, HDF5_RAW_READ_FIXED_DIMS);
-            get_minmax(&read_raw_mm, t);
-
-            read_raw_mm_table[i] = read_gross_mm;
-        }
-        sio_time_destroy(res.timers);
-    }
-
-    /*
-     * Show various statistics
-     */
-    /* Write statistics	*/
-    /* Print the raw data throughput if desired */
-    if (opts->print_raw) {
-        /* accumulate and output the max, min, and average "raw write" times */
-        if (sio_debug_level >= 3) {
-            /* output all of the times for all iterations */
-            print_indent(3);
-            output_report("Raw Data Write details:\n");
-            output_all_info(write_raw_mm_table, parms.num_iters, 4);
-        }
-
-        output_results(opts,"Raw Data Write",write_raw_mm_table,parms.num_iters,raw_size);
-    } /* end if */
-
-    /* show sys write statics */
-#if 0
-    if (sio_debug_level >= 3) {
-        /* output all of the times for all iterations */
-        print_indent(3);
-        output_report("MPI Write details:\n");
-        output_all_info(write_sys_mm_table, parms.num_iters, 4);
-    }
-#endif
-    /* We don't currently output the MPI write results */
-
-    /* accumulate and output the max, min, and average "write" times */
-    if (sio_debug_level >= 3) {
-        /* output all of the times for all iterations */
-        print_indent(3);
-        output_report("Write details:\n");
-        output_all_info(write_mm_table, parms.num_iters, 4);
-    }
-
-    output_results(opts,"Write",write_mm_table,parms.num_iters,raw_size);
-
-    /* accumulate and output the max, min, and average "gross write" times */
-    if (sio_debug_level >= 3) {
-        /* output all of the times for all iterations */
-        print_indent(3);
-        output_report("Write Open-Close details:\n");
-        output_all_info(write_gross_mm_table, parms.num_iters, 4);
-    }
-
-    output_results(opts,"Write Open-Close",write_gross_mm_table,parms.num_iters,raw_size);
-
-    if (!parms.h5_write_only) {
-        /* Read statistics	*/
-        /* Print the raw data throughput if desired */
-        if (opts->print_raw) {
-            /* accumulate and output the max, min, and average "raw read" times */
-            if (sio_debug_level >= 3) {
-                /* output all of the times for all iterations */
-                print_indent(3);
-                output_report("Raw Data Read details:\n");
-                output_all_info(read_raw_mm_table, parms.num_iters, 4);
-            }
-
-            output_results(opts, "Raw Data Read", read_raw_mm_table,
-                           parms.num_iters, raw_size);
-        } /* end if */
-
-        /* show mpi read statics */
-#if 0
-        if (sio_debug_level >= 3) {
-            /* output all of the times for all iterations */
-            print_indent(3);
-            output_report("MPI Read details:\n");
-            output_all_info(read_sys_mm_table, parms.num_iters, 4);
-        }
-#endif
-        /* We don't currently output the MPI read results */
-
-        /* accumulate and output the max, min, and average "read" times */
-        if (sio_debug_level >= 3) {
-            /* output all of the times for all iterations */
-            print_indent(3);
-            output_report("Read details:\n");
-            output_all_info(read_mm_table, parms.num_iters, 4);
-        }
-
-        output_results(opts, "Read", read_mm_table, parms.num_iters, raw_size);
-
-        /* accumulate and output the max, min, and average "gross read" times */
-        if (sio_debug_level >= 3) {
-            /* output all of the times for all iterations */
-            print_indent(3);
-            output_report("Read Open-Close details:\n");
-            output_all_info(read_gross_mm_table, parms.num_iters, 4);
-        }
-
-        output_results(opts, "Read Open-Close", read_gross_mm_table,
-                       parms.num_iters, raw_size);
-    }
-
-    /* clean up our mess */
-    free(write_sys_mm_table);
-    free(write_mm_table);
-    free(write_gross_mm_table);
-    free(write_raw_mm_table);
-
-    if (!parms.h5_write_only) {
-        free(read_sys_mm_table);
-        free(read_mm_table);
-        free(read_gross_mm_table);
-        free(read_raw_mm_table);
-    }
-
-    return ret_value;
-}
-
-/*
- * Function:    output_all_info
- * Purpose:
- * Return:      Nothing
- * Programmer:  Bill Wendling, 29. January 2002
- * Modifications:
- */
-static void
-output_all_info(minmax *mm, int count, int indent_level)
-{
-    int i;
-
-    for (i = 0; i < count; ++i) {
-        print_indent(indent_level);
-        output_report("Iteration %d:\n", i + 1);
-        print_indent(indent_level + 1);
-        output_report("Minimum Time: %.2fs\n", mm[i].min);
-        print_indent(indent_level + 1);
-        output_report("Maximum Time: %.2fs\n", mm[i].max);
-    }
-}
-
-/*
- * Function:    get_minmax
- * Purpose:     Gather all the min, max and total of val.
- * Return:      Nothing
- * Programmer:  Bill Wendling, 21. December 2001
- * Modifications:
- *    Use MPI_Allreduce to do it. -akc, 2002/01/11
- */
-
-static void
-get_minmax(minmax *mm, double val)
-{
-    mm->max = val;
-    mm->min = val;
-    mm->sum = val;
-}
-
-/*
- * Function:    accumulate_minmax_stuff
- * Purpose:     Accumulate the minimum, maximum, and average of the times
- *              across all processes.
- * Return:      TOTAL_MM - the total of all of these.
- * Programmer:  Bill Wendling, 21. December 2001
- * Modifications:
- *              Changed to use seconds instead of MB/s - QAK, 5/9/02
- */
-static minmax
-accumulate_minmax_stuff(minmax *mm, int count)
-{
-    int i;
-    minmax total_mm;
-
-    total_mm.sum = 0.0;
-    total_mm.max = -DBL_MAX;
-    total_mm.min = DBL_MAX;
-    total_mm.num = count;
-
-    for (i = 0; i < count; ++i) {
-        double m = mm[i].max;
-
-        total_mm.sum += m;
-
-        if (m < total_mm.min)
-            total_mm.min = m;
-
-        if (m > total_mm.max)
-            total_mm.max = m;
-    }
-
-    return total_mm;
-}
-
-
-/*
- * Function:    output_results
- * Purpose:     Print information about the time & bandwidth for a given
- *                  minmax & # of iterations.
- * Return:      Nothing
- * Programmer:  Quincey Koziol, 9. May 2002
- * Modifications:
- */
-static void
-output_results(const struct options *opts, const char *name, minmax *table,
-    int table_size,off_t data_size)
-{
-    minmax          total_mm;
-
-    total_mm = accumulate_minmax_stuff(table, table_size);
-
-    print_indent(3);
-    output_report("%s (%d iteration(s)):\n", name,table_size);
-
-    /* Note: The maximum throughput uses the minimum amount of time & vice versa */
-
-    print_indent(4);
-    output_report("Maximum Throughput: %6.2f MB/s", MB_PER_SEC(data_size,total_mm.min));
-    if(opts->print_times)
-        output_report(" (%7.3f s)\n", total_mm.min);
-    else
-        output_report("\n");
-
-    print_indent(4);
-    output_report("Average Throughput: %6.2f MB/s",
-                  MB_PER_SEC(data_size,total_mm.sum / total_mm.num));
-    if(opts->print_times)
-        output_report(" (%7.3f s)\n", (total_mm.sum / total_mm.num));
-    else
-        output_report("\n");
-
-    print_indent(4);
-    output_report("Minimum Throughput: %6.2f MB/s", MB_PER_SEC(data_size,total_mm.max));
-    if(opts->print_times)
-        output_report(" (%7.3f s)\n", total_mm.max);
-    else
-        output_report("\n");
-}
-
-/*
- * Function:    output_report
- * Purpose:     Print a line of the report. Only do so if I'm the 0 process.
- * Return:      Nothing
- * Programmer:  Bill Wendling, 19. December 2001
- * Modifications:
- */
-static void
-output_report(const char *fmt, ...)
-{
-        va_list ap;
-
-        va_start(ap, fmt);
-        vfprintf(output, fmt, ap);
-        va_end(ap);
-}
-
-/*
- * Function:    print_indent
- * Purpose:     Print spaces to indent a new line of text for pretty printing
- *              things.
- * Return:      Nothing
- * Programmer:  Bill Wendling, 29. October 2001
- * Modifications:
- */
-static void
-print_indent(register int indent)
-{
-	indent *= TAB_SPACE;
-
-	for (; indent > 0; --indent)
-	    fputc(' ', output);
-}
-
-static void
-recover_size_and_print(long_long val, const char *end)
-{
-    if (val >= ONE_KB && (val % ONE_KB) == 0) {
-        if (val >= ONE_MB && (val % ONE_MB) == 0) {
-            if (val >= ONE_GB && (val % ONE_GB) == 0)
-                HDfprintf(output, "%HdGB%s", val / ONE_GB, end);
-            else
-                HDfprintf(output, "%HdMB%s", val / ONE_MB, end);
-        } else {
-            HDfprintf(output, "%HdKB%s", val / ONE_KB, end);
-        }
-    } else {
-        HDfprintf(output, "%Hd%s", val, end);
-    }
-}
-
-static void
-print_io_api(long io_types)
-{
-    if (io_types & SIO_POSIX)
-	HDfprintf(output, "posix ");
-    if (io_types & SIO_HDF5)
-	HDfprintf(output, "hdf5 ");
-    HDfprintf(output, "\n");
-}
-
-static void
-report_parameters(struct options *opts)
-{
-    int i, rank;
-    rank = opts->dset_rank;
-
-    print_version("HDF5 Library");	/* print library version */
-    HDfprintf(output, "==== Parameters ====\n");
-
-    HDfprintf(output, "IO API=");
-    print_io_api(opts->io_types);
-
-    HDfprintf(output, "Number of iterations=%Hd\n",
-              (long_long)opts->num_iters);
-
-    HDfprintf(output, "Dataset size=");
-
-    for (i=0; i<rank; i++)
-        recover_size_and_print((long_long)opts->dset_size[i], " ");
-    HDfprintf(output, "\n");
-
-
-    HDfprintf(output, "Transfer buffer size=");
-    for (i=0; i<rank; i++)
-        recover_size_and_print((long_long)opts->buf_size[i], " ");
-    HDfprintf(output, "\n");
-
-    HDfprintf(output, "Dimension access order=");
-    for (i=0; i<rank; i++)
-        recover_size_and_print((long_long)opts->order[i], " ");
-    HDfprintf(output, "\n");
-
-    if (opts->io_types & SIO_HDF5) {
-
-        HDfprintf(output, "HDF5 data storage method=");
-
-        if (opts->h5_use_chunks){
-
-            HDfprintf(output, "Chunked\n");
-            HDfprintf(output, "HDF5 chunk size=");
-            for (i=0; i<rank; i++)
-                recover_size_and_print((long_long)opts->chk_size[i], " ");
-            HDfprintf(output, "\n");
-
-            HDfprintf(output, "HDF5 dataset dimensions=");
-            if (opts->h5_extendable) {
-                HDfprintf(output, "Extendable\n");
-            }
-            else {
-                HDfprintf(output, "Fixed\n");
-            }
-        }
-        else {
-            HDfprintf(output, "Contiguous\n");
-        }
-        
-        HDfprintf(output, "HDF5 file driver=");
-        if (opts->vfd==sec2) {
-            HDfprintf(output, "sec2\n");
-        } else if (opts->vfd==stdio) {
-            HDfprintf(output, "stdio\n");
-        } else if (opts->vfd==core) {
-            HDfprintf(output, "core\n");
-        } else if (opts->vfd==split) {
-            HDfprintf(output, "split\n");
-        } else if (opts->vfd==multi) {
-            HDfprintf(output, "multi\n");
-        } else if (opts->vfd==family) {
-            HDfprintf(output, "family\n");
-        } else if (opts->vfd==direct) {
-            HDfprintf(output, "direct\n");
-        }
-    }
-    HDfprintf(output, "==== End of Parameters ====\n");
-    HDfprintf(output, "\n");
-}
-
-/*
- * Function:    parse_command_line
- * Purpose:     Parse the command line options and return a STRUCT OPTIONS
- *              structure which will need to be freed by the calling function.
- * Return:      Pointer to an OPTIONS structure
- * Programmer:  Bill Wendling, 31. October 2001
- * Modifications:
- *    Added 2D testing (Christian Chilan, 10. August 2005)
- */
-static struct options *
-parse_command_line(int argc, char *argv[])
-{
-    register int opt;
-    struct options *cl_opts;
-    int i, default_rank, actual_rank, ranks[4];
-    cl_opts = (struct options *)malloc(sizeof(struct options));
-
-    cl_opts->output_file = NULL;
-    cl_opts->io_types =  0;    /* will set default after parsing options */
-    cl_opts->num_iters = 1;
- 
-    default_rank = 2;
-
-    cl_opts->dset_rank = 0;
-    cl_opts->buf_rank = 0;
-    cl_opts->chk_rank = 0;
-    cl_opts->order_rank = 0;
-
-    for (i=0; i<MAX_DIMS; i++){
-        cl_opts->buf_size[i]=(i+1)*10;
-        cl_opts->dset_size[i]=(i+1)*100;
-        cl_opts->chk_size[i]=(i+1)*10;
-        cl_opts->order[i]=i+1;
-    }
-
-    cl_opts->vfd = sec2;
-   
-    cl_opts->print_times = FALSE;   /* Printing times is off by default */
-    cl_opts->print_raw = FALSE;     /* Printing raw data throughput is off by default */
-    cl_opts->h5_alignment = 1;      /* No alignment for HDF5 objects by default */
-    cl_opts->h5_threshold = 1;      /* No threshold for aligning HDF5 objects by default */
-    cl_opts->h5_use_chunks = FALSE; /* Don't chunk the HDF5 dataset by default */
-    cl_opts->h5_write_only = FALSE; /* Do both read and write by default */
-    cl_opts->h5_extendable = FALSE; /* Use extendable dataset */
-    cl_opts->h5_use_mpi_posix = FALSE; /* Don't use MPI-posix VFD for HDF5 I/O by default */
-    cl_opts->verify = FALSE;        /* No Verify data correctness by default */
-
-    while ((opt = get_option(argc, (const char **)argv, s_opts, l_opts)) != EOF) {
-        switch ((char)opt) {
-        case 'a':
-            cl_opts->h5_alignment = parse_size_directive(opt_arg);
-            break;
-        case 'A':
-            {
-                const char *end = opt_arg;
-                while (end && *end != '\0') {
-                    char buf[10];
-                    int i;
-
-                    memset(buf, '\0', sizeof(buf));
-
-                    for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
-                            buf[i++] = *end;
-
-                    if (!strcasecmp(buf, "hdf5")) {
-                        cl_opts->io_types |= SIO_HDF5;
-                    } else if (!strcasecmp(buf, "posix")) {
-                        cl_opts->io_types |= SIO_POSIX;
-                    } else {
-                        fprintf(stderr, "sio_perf: invalid --api option %s\n",
-                                buf);
-                        exit(EXIT_FAILURE);
-                    }
-
-                    if (*end == '\0')
-                        break;
-
-                    end++;
-                }
-            }
-
-            break;
-#if 0
-        case 'b':
-            /* the future "binary" option */
-            break;
-#endif  /* 0 */
-        case 'c':
-            /* Turn on chunked HDF5 dataset creation */
-            cl_opts->h5_use_chunks = 1;
-            {
-                const char *end = opt_arg;
-                int j = 0;
-
-                while (end && *end != '\0') {
-                    char buf[10];
-                    int i;
-
-                    memset(buf, '\0', sizeof(buf));
-
-                    for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
-                            buf[i++] = *end;
-
-                    cl_opts->chk_size[j] = parse_size_directive(buf);
-
-                    j++;
-
-                    if (*end == '\0')
-                        break;
-
-                    end++;
-                }
-                cl_opts->chk_rank = j;
-            }
-
-            break;
-
-
-        case 'D':
-            {
-                const char *end = opt_arg;
-
-                while (end && *end != '\0') {
-                    char buf[10];
-                    int i;
-
-                    memset(buf, '\0', sizeof(buf));
-
-                    for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
-                            buf[i++] = *end;
-
-                    if (strlen(buf) > 1 || isdigit(buf[0])) {
-                        size_t j;
-
-                        for (j = 0; j < 10 && buf[j] != '\0'; ++j)
-                            if (!isdigit(buf[j])) {
-                                fprintf(stderr, "sio_perf: invalid --debug option %s\n",
-                                        buf);
-                                exit(EXIT_FAILURE);
-                            }
-
-                        sio_debug_level = atoi(buf);
-
-                        if (sio_debug_level > 4)
-                            sio_debug_level = 4;
-                        else if (sio_debug_level < 0)
-                            sio_debug_level = 0;
-                    } else {
-                        switch (*buf) {
-                        case 'r':
-                            /* Turn on raw data throughput info */
-                            cl_opts->print_raw = TRUE;
-                            break;
-                        case 't':
-                            /* Turn on time printing */
-                            cl_opts->print_times = TRUE;
-                            break;
-            case 'v':
-                            /* Turn on verify data correctness*/
-                cl_opts->verify = TRUE;
-                break;
-                        default:
-                            fprintf(stderr, "sio_perf: invalid --debug option %s\n", buf);
-                            exit(EXIT_FAILURE);
-                        }
-                    }
-
-                    if (*end == '\0')
-                        break;
-
-                    end++;
-                }
-            }
-
-            break;
-        case 'e':
-            {
-                const char *end = opt_arg;
-                int j = 0;
-
-                while (end && *end != '\0') {
-                    char buf[10];
-                    int i;
-
-                    memset(buf, '\0', sizeof(buf));
-
-                    for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
-                            buf[i++] = *end;
-
-                    cl_opts->dset_size[j] = parse_size_directive(buf);
-
-                    j++;
-
-                    if (*end == '\0')
-                        break;
-
-                    end++;
-                }
-                cl_opts->dset_rank = j;
-            }
-
-            break;
-
-        case 'i':
-            cl_opts->num_iters = atoi(opt_arg);
-            break;
-        case 'm':
-            /* Turn on MPI-posix VFL driver for HDF5 I/O */
-            cl_opts->h5_use_mpi_posix = TRUE;
-            break;
-        case 'o':
-            cl_opts->output_file = opt_arg;
-            break;
-        case 'T':
-            cl_opts->h5_threshold = parse_size_directive(opt_arg);
-            break;
-        case 'v':
-            if (!strcasecmp(opt_arg, "sec2")) {
-                cl_opts->vfd=sec2;
-            } else if (!strcasecmp(opt_arg, "stdio")) {
-                cl_opts->vfd=stdio;
-            } else if (!strcasecmp(opt_arg, "core")) {
-                cl_opts->vfd=core;
-            } else if (!strcasecmp(opt_arg, "split")) {
-                cl_opts->vfd=split;
-            } else if (!strcasecmp(opt_arg, "multi")) {
-                cl_opts->vfd=multi;
-            } else if (!strcasecmp(opt_arg, "family")) {
-                cl_opts->vfd=family;
-            } else if (!strcasecmp(opt_arg, "direct")) {
-                cl_opts->vfd=direct;
-            } else {
-                fprintf(stderr, "sio_perf: invalid --api option %s\n",
-                                opt_arg);
-                exit(EXIT_FAILURE);
-            }
-            break;
-        case 'w':
-            cl_opts->h5_write_only = TRUE;
-            break;
-        case 't':
-            cl_opts->h5_extendable = TRUE;
-            break;
-        case 'x':
-            {
-                const char *end = opt_arg;
-                int j = 0;
-
-                while (end && *end != '\0') {
-                    char buf[10];
-                    int i;
-
-                    memset(buf, '\0', sizeof(buf));
-
-                    for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
-                            buf[i++] = *end;
-
-                    cl_opts->buf_size[j] = parse_size_directive(buf);
-
-                    j++;
-
-                    if (*end == '\0')
-                        break;
-
-                    end++;
-                }
-                cl_opts->buf_rank = j;
-            }
-
-            break;
-
-        case 'r':
-            {
-                const char *end = opt_arg;
-                int j = 0;
-
-                while (end && *end != '\0') {
-                    char buf[10];
-                    int i;
-
-                    memset(buf, '\0', sizeof(buf));
-
-                    for (i = 0; *end != '\0' && *end != ','; ++end)
-                        if (isalnum(*end) && i < 10)
-                            buf[i++] = *end;
-
-                    cl_opts->order[j] = parse_size_directive(buf);
-
-                    j++;
-
-                    if (*end == '\0')
-                        break;
-
-                    end++;
-                }
-
-                cl_opts->order_rank = j;
-            }
-
-            break;
-
-        case 'h':
-        case '?':
-        default:
-            usage(progname);
-            free(cl_opts);
-            return NULL;
-        }
-    }
-
-    /* perform rank consistency analysis */
-    actual_rank = 0;
-
-    ranks[0] = cl_opts->dset_rank;
-    ranks[1] = cl_opts->buf_rank;
-    ranks[2] = cl_opts->order_rank;
-    ranks[3] = cl_opts->chk_rank;
-
-    for (i=0; i<4; i++) {
-        if (ranks[i]>0) {
-            if (!actual_rank) {
-                actual_rank = ranks[i];
-            }
-            else {
-                if (actual_rank != ranks[i])
-                    exit(EXIT_FAILURE);
-            }
-        }
-    }
-
-    if (!actual_rank)
-        actual_rank = default_rank;
-
-    cl_opts->dset_rank = actual_rank;
-    cl_opts->buf_rank = actual_rank;
-    cl_opts->order_rank = actual_rank;
-    cl_opts->chk_rank = actual_rank;
-
-
-    /* set default if none specified yet */
-    if (!cl_opts->io_types)
-        cl_opts->io_types = SIO_HDF5 | SIO_POSIX; /* run all API */
-
-    /* verify parameters sanity.  Adjust if needed. */
-    /* cap xfer_size with bytes per process */
-    if (cl_opts->num_iters <= 0)
-        cl_opts->num_iters = 1;
-
-    return cl_opts;
-}
-
-/*
- * Function:    parse_size_directive
- * Purpose:     Parse the size directive passed on the commandline. The size
- *              directive is an integer followed by a size indicator:
- *
- *                  K, k - Kilobyte
- *                  M, m - Megabyte
- *                  G, g - Gigabyte
- *
- * Return:      The size as a off_t because this is related to file size.
- *              If an unknown size indicator is used, then the program will
- *              exit with EXIT_FAILURE as the return value.
- * Programmer:  Bill Wendling, 18. December 2001
- * Modifications:
- */
-
-static off_t
-parse_size_directive(const char *size)
-{
-    off_t s;
-    char *endptr;
-
-    s = strtol(size, &endptr, 10);
-
-    if (endptr && *endptr) {
-        while (*endptr != '\0' && (*endptr == ' ' || *endptr == '\t'))
-            ++endptr;
-
-        switch (*endptr) {
-            case 'K':
-            case 'k':
-                s *= ONE_KB;
-                break;
-            case 'M':
-            case 'm':
-                s *= ONE_MB;
-                break;
-            case 'G':
-            case 'g':
-                s *= ONE_GB;
-                break;
-            default:
-                fprintf(stderr, "Illegal size specifier '%c'\n", *endptr);
-                exit(EXIT_FAILURE);
-        }
-    }
-
-    return s;
-}
-
-/*
- * Function:    usage
- * Purpose:     Print a usage message and then exit.
- * Return:      Nothing
- * Programmer:  Bill Wendling, 31. October 2001
- * Modifications:
- * 	Added 2D testing (Christian Chilan, 10. August 2005)
- */
-static void
-usage(const char *prog)
-{
-
-
-	print_version(prog);
-        printf("usage: %s [OPTIONS]\n", prog);
-        printf("  OPTIONS\n");
-        printf("     -h, --help                  Print a usage message and exit\n");
-        printf("     -a S, --align=S             Alignment of objects in HDF5 file [default: 1]\n");
-        printf("     -A AL, --api=AL             Which APIs to test [default: all of them]\n");
-#if 0
-        printf("     -b, --binary                The elusive binary option\n");
-#endif  /* 0 */
-        printf("     -B S, --block-size=S        Block size within transfer buffer\n");
-        printf("                                 (see below for description)\n");
-        printf("                                 [default: half the number of bytes per processor per dataset]\n");
-        printf("     -c, --chunk                 Create HDF5 datasets chunked [default: off]\n");
-        printf("     -C, --collective            Use collective I/O for MPI and HDF5 APIs\n");
-        printf("                                 [default: off (i.e. independent I/O)]\n");
-        printf("     -d N, --num-dsets=N         Number of datasets per file [default:1]\n");
-        printf("     -D DL, --debug=DL           Indicate the debugging level\n");
-        printf("                                 [default: no debugging]\n");
-        printf("     -e S, --num-bytes=S         Number of bytes per process per dataset\n");
-        printf("                                 [default: 256K for 1D, 8K for 2D]\n");
-        printf("     -F N, --num-files=N         Number of files [default: 1]\n");
-        printf("     -g, --geometry              Use 2D geometry [default: 1D]\n");
-        printf("     -i N, --num-iterations=N    Number of iterations to perform [default: 1]\n");
-        printf("     -I, --interleaved           Interleaved block I/O (see below for example)\n");
-        printf("                                 [default: Contiguous block I/O]\n");
-        printf("     -m, --mpi-posix             Use MPI-posix driver for HDF5 I/O\n");
-        printf("                                 [default: use MPI-I/O driver]\n");
-        printf("     -o F, --output=F            Output raw data into file F [default: none]\n");
-        printf("     -p N, --min-num-processes=N Minimum number of processes to use [default: 1]\n");
-        printf("     -P N, --max-num-processes=N Maximum number of processes to use\n");
-        printf("                                 [default: all MPI_COMM_WORLD processes ]\n");
-        printf("     -T S, --threshold=S         Threshold for alignment of objects in HDF5 file\n");
-        printf("                                 [default: 1]\n");
-        printf("     -w, --write-only            Perform write tests not the read tests\n");
-        printf("     -x S, --min-xfer-size=S     Minimum transfer buffer size\n");
-        printf("                                 [default: half the number of bytes per processor per dataset]\n");
-        printf("     -X S, --max-xfer-size=S     Maximum transfer buffer size\n");
-        printf("                                 [default: the number of bytes per processor per dataset]\n");
-        printf("\n");
-        printf("  F  - is a filename.\n");
-        printf("  N  - is an integer >=0.\n");
-        printf("  S  - is a size specifier, an integer >=0 followed by a size indicator:\n");
-        printf("          K - Kilobyte (%d)\n", ONE_KB);
-        printf("          M - Megabyte (%d)\n", ONE_MB);
-        printf("          G - Gigabyte (%d)\n", ONE_GB);
-        printf("\n");
-        printf("      Example: '37M' is 37 megabytes or %d bytes\n", 37*ONE_MB);
-        printf("\n");
-        printf("  AL - is an API list. Valid values are:\n");
-        printf("          phdf5 - Parallel HDF5\n");
-        printf("          mpiio - MPI-I/O\n");
-        printf("          posix - POSIX\n");
-        printf("\n");
-        printf("      Example: --api=mpiio,phdf5\n");
-        printf("\n");
-        printf("  Block size vs. Transfer buffer size:\n");
-        printf("      The transfer buffer size is the size of a buffer in memory, which is\n");
-        printf("      broken into 'block size' pieces and written to the file.  The pattern\n");
-        printf("      of the blocks in the file is described below in the 'Interleaved vs.\n");
-        printf("      Contiguous blocks' example.\n");
-        printf("\n");
-        printf("      If the collective I/O option is given, the blocks in each transfer buffer\n");
-        printf("      are written at once with an MPI derived type, for the MPI-I/O and PHDF5\n");
-        printf("      APIs.\n");
-        printf("\n");
-        printf("  Interleaved vs. Contiguous blocks:\n");
-        printf("      When contiguous blocks are written to a dataset, the dataset is divided\n");
-        printf("      into '# processes' regions and each process writes data to its own region.\n");
-        printf("      When interleaved blocks are written to a dataset, space for the first\n");
-        printf("      block of the first process is allocated in the dataset, then space is\n");
-        printf("      allocated for the first block of the second process, etc. until space is\n");
-        printf("      allocated for the first block of each process, then space is allocated for\n");
-        printf("      the second block of the first process, the second block of the second\n");
-        printf("      process, etc.\n");
-        printf("\n");
-        printf("      For example, with a 4 process run, 1MB bytes-per-process, 256KB transfer\n");
-        printf("        buffer size, and 64KB block size,\n");
-        printf("          16 contiguous blocks per process are written to the file like so:\n");
-        printf("              1111111111111111222222222222222233333333333333334444444444444444\n");
-        printf("          16 interleaved blocks per process are written to the file like so:\n");
-        printf("              1234123412341234123412341234123412341234123412341234123412341234\n");
-        printf("        If collective I/O is turned on, all of the four blocks per transfer\n");
-        printf("        buffer will be written in one collective I/O call.\n");
-        printf("\n");
-        printf("  DL - is a list of debugging flags. Valid values are:\n");
-        printf("          1 - Minimal\n");
-        printf("          2 - Not quite everything\n");
-        printf("          3 - Everything\n");
-        printf("          4 - The kitchen sink\n");
-        printf("          r - Raw data I/O throughput information\n");
-        printf("          t - Times as well as throughputs\n");
-        printf("          v - Verify data correctness\n");
-        printf("\n");
-        printf("      Example: --debug=2,r,t\n");
-        printf("\n");
-        printf("  Environment variables:\n");
-        printf("  HDF5_NOCLEANUP   Do not remove data files if set [default remove]\n");
-        printf("  HDF5_MPI_INFO    MPI INFO object key=value separated by ;\n");
-        printf("  HDF5_PARAPREFIX  Paralllel data files prefix\n");
-        fflush(stdout);
-}
-
diff --git a/perform/sio_perf.h b/perform/sio_perf.h
deleted file mode 100644
index b038661..0000000
--- a/perform/sio_perf.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef SIO_PERF_H__
-#define SIO_PERF_H__
-
-#include "sio_timer.h"
-#ifndef STANDALONE
-#include "H5private.h"
-#include "h5test.h"
-#include "h5tools_utils.h"
-#else
-#include "sio_standalone.h"
-#endif
-
-/* setup the dataset no fill option if this is v1.5 or more */
-#if H5_VERS_MAJOR > 1 || H5_VERS_MINOR > 4
-#define H5_HAVE_NOFILL 1
-#endif
-
-#define MAX_DIMS 32
-
-typedef enum iotype_ {
-    POSIXIO,
-    HDF5
-    /*NUM_TYPES*/
-} iotype;
-
-typedef enum vfdtype_ {
-    sec2,
-    stdio,
-    core,
-    split,
-    multi,
-    family,
-    direct
-    /*NUM_TYPES*/
-} vfdtype;
-
-typedef struct parameters_ {
-    iotype	io_type;        /* The type of IO test to perform       */
-    vfdtype     vfd;
-    long	num_files;      /* Number of files to create            */
-    long	num_dsets;      /* Number of datasets to create         */
-    off_t	num_bytes;      /* Number of bytes in each dset         */
-    int         num_iters;      /* Number of times to loop doing the IO */
-    int         rank;           /* Rank of dataset */
-    off_t 	dset_size[MAX_DIMS]; /* Dataset size             */
-    size_t 	buf_size[MAX_DIMS]; /* Buffer size               */
-    size_t 	chk_size[MAX_DIMS]; /* Chunk size               */
-    int  	order[MAX_DIMS]; /* Buffer size               */
-    hsize_t 	h5_align;       /* HDF5 object alignment                */
-    hsize_t 	h5_thresh;      /* HDF5 object alignment threshold      */
-    int 	h5_use_chunks;  /* Make HDF5 dataset chunked            */
-    int 	h5_extendable;  /* Make HDF5 dataset chunked            */
-    int    	h5_write_only;  /* Perform the write tests only         */
-    unsigned    h5_use_mpi_posix;   /* VFD for HDF5 I/O  */
-    int 	verify;    	/* Verify data correctness              */
-} parameters;
-
-typedef struct results_ {
-    herr_t      ret_code;
-    sio_time   *timers;
-} results;
-
-#ifndef SUCCESS
-#define SUCCESS     0
-#endif  /* !SUCCESS */
-
-#ifndef FAIL
-#define FAIL        -1
-#endif  /* !FAIL */
-
-extern FILE     *output;            /* output file                          */
-extern sio_time *timer_g;           /* timer: global for stub functions     */
-extern int      sio_debug_level;    /* The debug level:
-                                     *   0 - Off
-                                     *   1 - Minimal
-                                     *   2 - Some more
-                                     *   3 - Maximal
-                                     *   4 - Even More Debugging (timer stuff)
-                                     */
-#ifdef __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-
-extern results do_sio(parameters param);
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif  /* PIO_PERF_H__ */
diff --git a/perform/sio_standalone.c b/perform/sio_standalone.c
deleted file mode 100644
index 8a93541..0000000
--- a/perform/sio_standalone.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-/* This file contains the definition of functions required to build h5perf in
- * STANDALONE mode.
- * Created: Christian Chilan, 2005/5/18.
- */
-
-#include "sio_perf.h"
-
-
-/** From h5tools_utils.c **/
-
-/* global variables */
-int   nCols = 80;
-
-/* ``get_option'' variables */
-int         opt_err = 1;    /*get_option prints errors if this is on */
-int         opt_ind = 1;    /*token pointer                          */
-const char *opt_arg;        /*flag argument (or value)               */
-
-
-int
-get_option(int argc, const char **argv, const char *opts, const struct long_options *l_opts)
-{
-    static int sp = 1;    /* character index in current token */
-    int opt_opt = '?';    /* option character passed back to user */
-
-    if (sp == 1) {
-        /* check for more flag-like tokens */
-        if (opt_ind >= argc || argv[opt_ind][0] != '-' || argv[opt_ind][1] == '\0') {
-            return EOF;
-        } else if (HDstrcmp(argv[opt_ind], "--") == 0) {
-            opt_ind++;
-            return EOF;
-        }
-    }
-
-    if (sp == 1 && argv[opt_ind][0] == '-' && argv[opt_ind][1] == '-') {
-        /* long command line option */
-        const char *arg = &argv[opt_ind][2];
-        int i;
-
-        for (i = 0; l_opts && l_opts[i].name; i++) {
-            size_t len = HDstrlen(l_opts[i].name);
-
-            if (HDstrncmp(arg, l_opts[i].name, len) == 0) {
-                /* we've found a matching long command line flag */
-                opt_opt = l_opts[i].shortval;
-
-                if (l_opts[i].has_arg != no_arg) {
-                    if (arg[len] == '=') {
-                        opt_arg = &arg[len + 1];
-                    } else if (opt_ind < (argc - 1) && argv[opt_ind + 1][0] != '-') {
-                        opt_arg = argv[++opt_ind];
-                    } else if (l_opts[i].has_arg == require_arg) {
-                        if (opt_err)
-                            HDfprintf(stderr,
-                                    "%s: option required for \"--%s\" flag\n",
-                                    argv[0], arg);
-
-                        opt_opt = '?';
-                    }
-                } else {
-                    if (arg[len] == '=') {
-                        if (opt_err)
-                            HDfprintf(stderr,
-                                    "%s: no option required for \"%s\" flag\n",
-                                    argv[0], arg);
-
-                        opt_opt = '?';
-                    }
-
-                    opt_arg = NULL;
-                }
-
-                break;
-            }
-        }
-
-        if (l_opts[i].name == NULL) {
-            /* exhausted all of the l_opts we have and still didn't match */
-            if (opt_err)
-                HDfprintf(stderr, "%s: unknown option \"%s\"\n", argv[0], arg);
-
-            opt_opt = '?';
-        }
-
-        opt_ind++;
-        sp = 1;
-    } else {
-        register char *cp;    /* pointer into current token */
-
-        /* short command line option */
-        opt_opt = argv[opt_ind][sp];
-
-        if (opt_opt == ':' || (cp = strchr(opts, opt_opt)) == 0) {
-
-            if (opt_err)
-                HDfprintf(stderr, "%s: unknown option \"%c\"\n",
-                        argv[0], opt_opt);
-
-            /* if no chars left in this token, move to next token */
-            if (argv[opt_ind][++sp] == '\0') {
-                opt_ind++;
-                sp = 1;
-            }
-
-            return '?';
-        }
-
-        if (*++cp == ':') {
-            /* if a value is expected, get it */
-            if (argv[opt_ind][sp + 1] != '\0') {
-                /* flag value is rest of current token */
-                opt_arg = &argv[opt_ind++][sp + 1];
-            } else if (++opt_ind >= argc) {
-                if (opt_err)
-                    HDfprintf(stderr,
-                            "%s: value expected for option \"%c\"\n",
-                            argv[0], opt_opt);
-
-                opt_opt = '?';
-            } else {
-                /* flag value is next token */
-                opt_arg = argv[opt_ind++];
-            }
-
-            sp = 1;
-        } else {
-            /* set up to look at next char in token, next time */
-            if (argv[opt_ind][++sp] == '\0') {
-                /* no more in current token, so setup next token */
-                opt_ind++;
-                sp = 1;
-            }
-
-            opt_arg = NULL;
-        }
-    }
-
-    /* return the current flag character found */
-    return opt_opt;
-}
-
-
-void
-print_version(const char *progname)
-{
-    printf("%s: Version %u.%u.%u%s%s\n",
-           progname, H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE,
-           H5_VERS_SUBRELEASE[0] ? "-" : "", H5_VERS_SUBRELEASE);
-}
-
-
-
-/** From h5test.c **/
-
-#ifdef H5_HAVE_PARALLEL
-MPI_Info    h5_io_info_g=MPI_INFO_NULL;/* MPI INFO object for IO */
-#endif
-
-#if 0
-int
-h5_set_info_object(void)
-{
-    char	*envp;			/* environment pointer */
-    int		ret_value=0;
-
-    /* handle any MPI INFO hints via $HDF5_MPI_INFO */
-    if ((envp = getenv("HDF5_MPI_INFO")) != NULL){
-        char *next, *valp;
-
-
-        valp = envp = next = HDstrdup(envp);
-
-        /* create an INFO object if not created yet */
-        if (h5_io_info_g == MPI_INFO_NULL)
-            MPI_Info_create(&h5_io_info_g);
-
-        do {
-            size_t len;
-            char *key_val, *endp, *namep;
-
-            if (*valp == ';')
-                valp++;
-
-            /* copy key/value pair into temporary buffer */
-            len = strcspn(valp, ";");
-            next = &valp[len];
-            key_val = calloc(1, len + 1);
-
-            /* increment the next pointer past the terminating semicolon */
-            if (*next == ';')
-                ++next;
-
-            namep = HDstrncpy(key_val, valp, len);
-
-            /* pass up any beginning whitespaces */
-            while (*namep && (*namep == ' ' || *namep == '\t'))
-                namep++;
-
-            /* eat up any ending white spaces */
-            endp = &namep[strlen(namep) - 1];
-
-            while (endp && (*endp == ' ' || *endp == '\t'))
-                *endp-- = '\0';
-
-            /* find the '=' */
-
-            valp = HDstrchr(namep, '=');
-
-            if (valp != NULL) {     /* it's a valid key/value pairing */
-                char *tmp_val = valp + 1;
-
-                /* change '=' to \0, move valp down one */
-                *valp-- = '\0';
-
-                /* eat up ending whitespace on the "key" part */
-                while (*valp == ' ' || *valp == '\t')
-                    *valp-- = '\0';
-
-                valp = tmp_val;
-
-                /* eat up beginning whitespace on the "value" part */
-                while (*valp == ' ' || *valp == '\t')
-                    *valp++ = '\0';
-
-                /* actually set the darned thing */
-                if (MPI_SUCCESS != MPI_Info_set(h5_io_info_g, namep, valp)) {
-                    printf("MPI_Info_set failed\n");
-                    ret_value = -1;
-                }
-            }
-
-            valp = next;
-            HDfree(key_val);
-        } while (next && *next);
-
-        HDfree(envp);
-    }
-
-    return ret_value;
-}
-
-
-void
-h5_dump_info_object(MPI_Info info)
-{
-    char	key[MPI_MAX_INFO_KEY+1];
-    char	value[MPI_MAX_INFO_VAL+1];
-    int  	flag;
-    int		i, nkeys;
-
-    printf("Dumping MPI Info Object(%d) (up to %d bytes per item):\n", (int)info,
-	MPI_MAX_INFO_VAL);
-    if (info==MPI_INFO_NULL){
-	printf("object is MPI_INFO_NULL\n");
-    }
-    else {
-	MPI_Info_get_nkeys(info, &nkeys);
-	printf("object has %d items\n", nkeys);
-	for (i=0; i<nkeys; i++){
-	    MPI_Info_get_nthkey(info, i, key);
-	    MPI_Info_get(info, key, MPI_MAX_INFO_VAL, value, &flag);
-	    printf("%s=%s\n", key, value);
-	}
-
-    }
-}
-
-#endif
-
diff --git a/perform/sio_standalone.h b/perform/sio_standalone.h
deleted file mode 100644
index 1f83f61..0000000
--- a/perform/sio_standalone.h
+++ /dev/null
@@ -1,544 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef SIO_STANDALONE_H__
-#define SIO_PERF_H__
-
-/* Header file for building h5perf by standalone mode.
- * Created: Christian Chilan, 2005/5/18.
- */
-
-/** From H5private.h **/
-
-#include "H5public.h"		 /* Include Public Definitions		*/
-
-
-/*
- * Include ANSI-C header files.
- */
-#ifdef H5_STDC_HEADERS
-#   include <assert.h>
-#   include <ctype.h>
-#   include <errno.h>
-#   include <fcntl.h>
-#   include <float.h>
-#   include <limits.h>
-#   include <math.h>
-#   include <signal.h>
-#   include <stdarg.h>
-#   include <stdio.h>
-#   include <stdlib.h>
-#   include <string.h>
-#endif
-
-/* maximum of two, three, or four values */
-#undef MAX
-#define MAX(a,b)                (((a)>(b)) ? (a) : (b))
-#define MAX2(a,b)               MAX(a,b)
-#define MAX3(a,b,c)             MAX(a,MAX(b,c))
-#define MAX4(a,b,c,d)           MAX(MAX(a,b),MAX(c,d))
-
-/*
- * A macro to portably increment enumerated types.
- */
-#ifndef H5_INC_ENUM
-#  define H5_INC_ENUM(TYPE,VAR) (VAR)=((TYPE)((VAR)+1))
-#endif
-
-/*
- * Redefine all the POSIX functions.  We should never see a POSIX
- * function (or any other non-HDF5 function) in the source!
- */
-#define HDabort()               abort()
-#define HDabs(X)                abs(X)
-#define HDaccess(F,M)           access(F, M)
-#define HDacos(X)               acos(X)
-#ifdef H5_HAVE_ALARM
-#define HDalarm(N)              alarm(N)
-#else /* H5_HAVE_ALARM */
-#define HDalarm(N)              (0)
-#endif /* H5_HAVE_ALARM */
-#define HDasctime(T)            asctime(T)
-#define HDasin(X)               asin(X)
-#define HDassert(X)             assert(X)
-#define HDatan(X)               atan(X)
-#define HDatan2(X,Y)            atan2(X,Y)
-#define HDatexit(F)             atexit(F)
-#define HDatof(S)               atof(S)
-#define HDatoi(S)               atoi(S)
-#define HDatol(S)               atol(S)
-#define HDBSDgettimeofday(S,P)  BSDgettimeofday(S,P)
-#define HDbsearch(K,B,N,Z,F)    bsearch(K,B,N,Z,F)
-#define HDcalloc(N,Z)           calloc(N,Z)
-#define HDceil(X)               ceil(X)
-#define HDcfgetispeed(T)        cfgetispeed(T)
-#define HDcfgetospeed(T)        cfgetospeed(T)
-#define HDcfsetispeed(T,S)      cfsetispeed(T,S)
-#define HDcfsetospeed(T,S)      cfsetospeed(T,S)
-#define HDchdir(S)              chdir(S)
-#define HDchmod(S,M)            chmod(S,M)
-#define HDchown(S,O,G)          chown(S,O,G)
-#define HDclearerr(F)           clearerr(F)
-#define HDclock()               clock()
-#define HDclose(F)              close(F)
-#define HDclosedir(D)           closedir(D)
-#define HDcos(X)                cos(X)
-#define HDcosh(X)               cosh(X)
-#define HDcreat(S,M)            creat(S,M)
-#define HDctermid(S)            ctermid(S)
-#define HDctime(T)              ctime(T)
-#define HDcuserid(S)            cuserid(S)
-#ifdef H5_HAVE_DIFFTIME
-#define HDdifftime(X,Y)         difftime(X,Y)
-#else
-#define HDdifftime(X,Y)         ((double)(X)-(double)(Y))
-#endif
-#define HDdiv(X,Y)              div(X,Y)
-#define HDdup(F)                dup(F)
-#define HDdup2(F,I)             dup2(F,I)
-/* execl() variable arguments */
-/* execle() variable arguments */
-/* execlp() variable arguments */
-#define HDexecv(S,AV)           execv(S,AV)
-#define HDexecve(S,AV,E)        execve(S,AV,E)
-#define HDexecvp(S,AV)          execvp(S,AV)
-#define HDexit(N)               exit(N)
-#if defined __MWERKS__
-#include <abort_exit.h>
-#define HD_exit(N)              __exit(N)
-#else /* __MWERKS __ */
-#define HD_exit(N)              _exit(N)
-#endif /* __MWERKS __ */
-#define HDexp(X)                exp(X)
-#define HDfabs(X)               fabs(X)
-/* use ABS() because fabsf() fabsl() are not common yet. */
-#define HDfabsf(X)              ABS(X)
-#define HDfabsl(X)              ABS(X)
-#define HDfclose(F)             fclose(F)
-/* fcntl() variable arguments */
-#define HDfdopen(N,S)           fdopen(N,S)
-#define HDfeof(F)               feof(F)
-#define HDferror(F)             ferror(F)
-#define HDfflush(F)             fflush(F)
-#define HDfgetc(F)              fgetc(F)
-#define HDfgetpos(F,P)          fgetpos(F,P)
-#define HDfgets(S,N,F)          fgets(S,N,F)
-#ifdef _WIN32
-#define HDfileno(F)             _fileno(F)
-#else /* _WIN32 */
-#define HDfileno(F)             fileno(F)
-#endif /* _WIN32 */
-#define HDfloor(X)              floor(X)
-#define HDfmod(X,Y)             fmod(X,Y)
-#define HDfopen(S,M)            fopen(S,M)
-#define HDfork()                fork()
-#define HDfpathconf(F,N)        fpathconf(F,N)
-H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...);
-#define HDfputc(C,F)            fputc(C,F)
-#define HDfputs(S,F)            fputs(S,F)
-#define HDfread(M,Z,N,F)        fread(M,Z,N,F)
-#define HDfree(M)               free(M)
-#define HDfreopen(S,M,F)        freopen(S,M,F)
-#define HDfrexp(X,N)            frexp(X,N)
-/* Check for Cray-specific 'frexpf()' and 'frexpl()' routines */
-#ifdef H5_HAVE_FREXPF
-#define HDfrexpf(X,N)           frexpf(X,N)
-#else /* H5_HAVE_FREXPF */
-#define HDfrexpf(X,N)           frexp(X,N)
-#endif /* H5_HAVE_FREXPF */
-#ifdef H5_HAVE_FREXPL
-#define HDfrexpl(X,N)           frexpl(X,N)
-#else /* H5_HAVE_FREXPL */
-#define HDfrexpl(X,N)           frexp(X,N)
-#endif /* H5_HAVE_FREXPL */
-/* fscanf() variable arguments */
-#ifdef H5_HAVE_FSEEKO
-     #define HDfseek(F,O,W)     fseeko(F,O,W)
-#else
-     #define HDfseek(F,O,W)     fseek(F,O,W)
-#endif
-#define HDfsetpos(F,P)          fsetpos(F,P)
-/* definitions related to the file stat utilities.
- * Windows have its own function names.
- * For Unix, if off_t is not 64bit big, try use the pseudo-standard
- * xxx64 versions if available.
- */
-#ifdef _WIN32
-    #ifdef __MWERKS__
-    #define HDfstat(F,B)        fstat(F,B)
-    #define HDstat(S,B)         stat(S,B)
-    typedef struct stat         h5_stat_t;
-    typedef off_t               h5_stat_size_t;
-    #else /*MSVC*/
-    #define HDfstat(F,B)        _fstati64(F,B)
-    #define HDstat(S,B)         _stati64(S,B)
-    typedef struct _stati64     h5_stat_t;
-    typedef __int64             h5_stat_size_t;
-    #endif
-#elif H5_SIZEOF_OFF_T!=8 && H5_SIZEOF_OFF64_T==8 && defined(H5_HAVE_STAT64)
-    #define HDfstat(F,B)        fstat64(F,B)
-    #define HDstat(S,B)         stat64(S,B)
-    typedef struct stat64       h5_stat_t;
-    typedef off64_t             h5_stat_size_t;
-#else
-    #define HDfstat(F,B)        fstat(F,B)
-    #define HDstat(S,B)         stat(S,B)
-    typedef struct stat         h5_stat_t;
-    typedef off_t               h5_stat_size_t;
-#endif
-
-#define HDftell(F)              ftell(F)
-#define HDftruncate(F,L)        ftruncate(F,L)
-#define HDfwrite(M,Z,N,F)       fwrite(M,Z,N,F)
-#define HDgetc(F)               getc(F)
-#define HDgetchar()             getchar()
-#define HDgetcwd(S,Z)           getcwd(S,Z)
-#define HDgetegid()             getegid()
-#define HDgetenv(S)             getenv(S)
-#define HDgeteuid()             geteuid()
-#define HDgetgid()              getgid()
-#define HDgetgrgid(G)           getgrgid(G)
-#define HDgetgrnam(S)           getgrnam(S)
-#define HDgetgroups(Z,G)        getgroups(Z,G)
-#define HDgetlogin()            getlogin()
-#define HDgetpgrp()             getpgrp()
-#define HDgetpid()              getpid()
-#define HDgetppid()             getppid()
-#define HDgetpwnam(S)           getpwnam(S)
-#define HDgetpwuid(U)           getpwuid(U)
-#define HDgetrusage(X,S)        getrusage(X,S)
-#define HDgets(S)               gets(S)
-#define HDgettimeofday(S,P)     gettimeofday(S,P)
-#define HDgetuid()              getuid()
-#define HDgmtime(T)             gmtime(T)
-#define HDisalnum(C)            isalnum((int)(C)) /*cast for solaris warning*/
-#define HDisalpha(C)            isalpha((int)(C)) /*cast for solaris warning*/
-#define HDisatty(F)             isatty(F)
-#define HDiscntrl(C)            iscntrl((int)(C)) /*cast for solaris warning*/
-#define HDisdigit(C)            isdigit((int)(C)) /*cast for solaris warning*/
-#define HDisgraph(C)            isgraph((int)(C)) /*cast for solaris warning*/
-#define HDislower(C)            islower((int)(C)) /*cast for solaris warning*/
-#define HDisprint(C)            isprint((int)(C)) /*cast for solaris warning*/
-#define HDispunct(C)            ispunct((int)(C)) /*cast for solaris warning*/
-#define HDisspace(C)            isspace((int)(C)) /*cast for solaris warning*/
-#define HDisupper(C)            isupper((int)(C)) /*cast for solaris warning*/
-#define HDisxdigit(C)           isxdigit((int)(C)) /*cast for solaris warning*/
-#define HDkill(P,S)             kill(P,S)
-#define HDlabs(X)               labs(X)
-#define HDldexp(X,N)            ldexp(X,N)
-#define HDldiv(X,Y)             ldiv(X,Y)
-#define HDlink(OLD,NEW)         link(OLD,NEW)
-#define HDlocaleconv()          localeconv()
-#define HDlocaltime(T)          localtime(T)
-#define HDlog(X)                log(X)
-#define HDlog10(X)              log10(X)
-#define HDlongjmp(J,N)          longjmp(J,N)
-#ifdef _WIN32
-     #ifdef __MWERKS__
-        #define HDlseek(F,O,W)  lseek(F,O,W)
-     #else /*MSVS */
-        #define HDlseek(F,O,W)  _lseeki64(F,O,W)
-     #endif
-#else
-     #ifdef H5_HAVE_FSEEK64
-        #define HDlseek(F,O,W)  lseek64(F,O,W)
-     #else
-        #define HDlseek(F,O,W)  lseek(F,O,W)
-     #endif
-#endif
-#define HDmalloc(Z)             malloc(Z)
-#define HDposix_memalign(P,A,Z) posix_memalign(P,A,Z)
-#define HDmblen(S,N)            mblen(S,N)
-#define HDmbstowcs(P,S,Z)       mbstowcs(P,S,Z)
-#define HDmbtowc(P,S,Z)         mbtowc(P,S,Z)
-#define HDmemchr(S,C,Z)         memchr(S,C,Z)
-#define HDmemcmp(X,Y,Z)         memcmp(X,Y,Z)
-/*
- * The (char*) casts are required for the DEC when optimizations are turned
- * on and the source and/or destination are not aligned.
- */
-#define HDmemcpy(X,Y,Z)         memcpy((char*)(X),(const char*)(Y),Z)
-#define HDmemmove(X,Y,Z)        memmove((char*)(X),(const char*)(Y),Z)
-/*
- * The (void*) cast just avoids a compiler warning in _WIN32
- */
-#ifdef _WIN32
-#define HDmemset(X,C,Z)         memset((void*)(X),C,Z)
-#else /* _WIN32 */
-#define HDmemset(X,C,Z)         memset(X,C,Z)
-#endif /* _WIN32 */
-#ifdef _WIN32
-#define HDmkdir(S,M)            _mkdir(S)
-#else /* _WIN32 */
-#define HDmkdir(S,M)            mkdir(S,M)
-#endif /* _WIN32 */
-#define HDmkfifo(S,M)           mkfifo(S,M)
-#define HDmktime(T)             mktime(T)
-#define HDmodf(X,Y)             modf(X,Y)
-#ifdef _O_BINARY
-#define HDopen(S,F,M)           open(S,F|_O_BINARY,M)
-#else
-#define HDopen(S,F,M)           open(S,F,M)
-#endif
-#define HDopendir(S)            opendir(S)
-#define HDpathconf(S,N)         pathconf(S,N)
-#define HDpause()               pause()
-#define HDperror(S)             perror(S)
-#define HDpipe(F)               pipe(F)
-#define HDpow(X,Y)              pow(X,Y)
-/* printf() variable arguments */
-#define HDputc(C,F)             putc(C,F)
-#define HDputchar(C)            putchar(C)
-#define HDputs(S)               puts(S)
-#define HDqsort(M,N,Z,F)        qsort(M,N,Z,F)
-#define HDraise(N)              raise(N)
-
-#ifdef H5_HAVE_RAND_R
-#define HDrandom()              HDrand()
-H5_DLL int HDrand(void);
-#elif H5_HAVE_RANDOM
-#define HDrand()                random()
-#define HDrandom()              random()
-#else
-#define HDrand()                rand()
-#define HDrandom()              rand()
-#endif
-
-#define HDread(F,M,Z)           read(F,M,Z)
-#define HDreaddir(D)            readdir(D)
-#define HDrealloc(M,Z)          realloc(M,Z)
-#ifdef H5_VMS
-#ifdef __cplusplus
-extern "C" {
-#endif
-int HDremove_all(const char * fname);
-#ifdef __cplusplus
-}
-#endif
-#define HDremove(S)             HDremove_all(S)
-#else
-#define HDremove(S)             remove(S)
-#endif /*H5_VMS*/
-#define HDrename(OLD,NEW)       rename(OLD,NEW)
-#define HDrewind(F)             rewind(F)
-#define HDrewinddir(D)          rewinddir(D)
-#define HDrmdir(S)              rmdir(S)
-/* scanf() variable arguments */
-#define HDsetbuf(F,S)           setbuf(F,S)
-#define HDsetgid(G)             setgid(G)
-#define HDsetjmp(J)             setjmp(J)
-#define HDsetlocale(N,S)        setlocale(N,S)
-#define HDsetpgid(P,PG)         setpgid(P,PG)
-#define HDsetsid()              setsid()
-#define HDsetuid(U)             setuid(U)
-/* Windows does not permit setting the buffer size to values
-   less than 2.  */
-#ifndef _WIN32
-#define HDsetvbuf(F,S,M,Z)      setvbuf(F,S,M,Z)
-#else
-#define HDsetvbuf(F,S,M,Z)  setvbuf(F,S,M,(Z>1?Z:2))
-#endif
-#define HDsigaction(N,A)        sigaction(N,A)
-#define HDsigaddset(S,N)        sigaddset(S,N)
-#define HDsigdelset(S,N)        sigdelset(S,N)
-#define HDsigemptyset(S)        sigemptyset(S)
-#define HDsigfillset(S)         sigfillset(S)
-#define HDsigismember(S,N)      sigismember(S,N)
-#define HDsiglongjmp(J,N)       siglongjmp(J,N)
-#define HDsignal(N,F)           signal(N,F)
-#define HDsigpending(S)         sigpending(S)
-#define HDsigprocmask(H,S,O)    sigprocmask(H,S,O)
-#define HDsigsetjmp(J,N)        sigsetjmp(J,N)
-#define HDsigsuspend(S)         sigsuspend(S)
-#define HDsin(X)                sin(X)
-#define HDsinh(X)               sinh(X)
-#define HDsleep(N)              sleep(N)
-#ifdef _WIN32
-#define HDsnprintf              _snprintf /*varargs*/
-#else
-#define HDsnprintf              snprintf /*varargs*/
-#endif
-/* sprintf() variable arguments */
-#define HDsqrt(X)               sqrt(X)
-#ifdef H5_HAVE_RAND_R
-H5_DLL void HDsrand(unsigned int seed);
-#define HDsrandom(S)            HDsrand(S)
-#elif H5_HAVE_RANDOM
-#define HDsrand(S)              srandom(S)
-#define HDsrandom(S)            srandom(S)
-#else
-#define HDsrand(S)              srand(S)
-#define HDsrandom(S)            srand(S)
-#endif
-/* sscanf() variable arguments */
-
-#define HDstrcat(X,Y)           strcat(X,Y)
-#define HDstrchr(S,C)           strchr(S,C)
-#define HDstrcmp(X,Y)           strcmp(X,Y)
-#define HDstrcoll(X,Y)          strcoll(X,Y)
-#define HDstrcpy(X,Y)           strcpy(X,Y)
-#define HDstrcspn(X,Y)          strcspn(X,Y)
-#define HDstrerror(N)           strerror(N)
-#define HDstrftime(S,Z,F,T)     strftime(S,Z,F,T)
-#define HDstrlen(S)             strlen(S)
-#define HDstrncat(X,Y,Z)        strncat(X,Y,Z)
-#define HDstrncmp(X,Y,Z)        strncmp(X,Y,Z)
-#define HDstrncpy(X,Y,Z)        strncpy(X,Y,Z)
-#define HDstrpbrk(X,Y)          strpbrk(X,Y)
-#define HDstrrchr(S,C)          strrchr(S,C)
-#define HDstrspn(X,Y)           strspn(X,Y)
-#define HDstrstr(X,Y)           strstr(X,Y)
-#define HDstrtod(S,R)           strtod(S,R)
-#define HDstrtok(X,Y)           strtok(X,Y)
-#define HDstrtol(S,R,N)         strtol(S,R,N)
-H5_DLL int64_t HDstrtoll (const char *s, const char **rest, int base);
-#define HDstrtoul(S,R,N)        strtoul(S,R,N)
-#define HDstrxfrm(X,Y,Z)        strxfrm(X,Y,Z)
-#define HDsysconf(N)            sysconf(N)
-#define HDsystem(S)             system(S)
-#define HDtan(X)                tan(X)
-#define HDtanh(X)               tanh(X)
-#define HDtcdrain(F)            tcdrain(F)
-#define HDtcflow(F,A)           tcflow(F,A)
-#define HDtcflush(F,N)          tcflush(F,N)
-#define HDtcgetattr(F,T)        tcgetattr(F,T)
-#define HDtcgetpgrp(F)          tcgetpgrp(F)
-#define HDtcsendbreak(F,N)      tcsendbreak(F,N)
-#define HDtcsetattr(F,O,T)      tcsetattr(F,O,T)
-#define HDtcsetpgrp(F,N)        tcsetpgrp(F,N)
-#define HDtime(T)               time(T)
-#define HDtimes(T)              times(T)
-#define HDtmpfile()             tmpfile()
-#define HDtmpnam(S)             tmpnam(S)
-#define HDtolower(C)            tolower(C)
-#define HDtoupper(C)            toupper(C)
-#define HDttyname(F)            ttyname(F)
-#define HDtzset()               tzset()
-#define HDumask(N)              umask(N)
-#define HDuname(S)              uname(S)
-#define HDungetc(C,F)           ungetc(C,F)
-#ifdef _WIN32
-#define HDunlink(S)             _unlink(S)
-#else
-#define HDunlink(S)             unlink(S)
-#endif
-#define HDutime(S,T)            utime(S,T)
-#define HDva_arg(A,T)           va_arg(A,T)
-#define HDva_end(A)             va_end(A)
-#define HDva_start(A,P)         va_start(A,P)
-#define HDvasprintf(RET,FMT,A)  vasprintf(RET,FMT,A)
-#define HDvfprintf(F,FMT,A)     vfprintf(F,FMT,A)
-#define HDvprintf(FMT,A)        vprintf(FMT,A)
-#define HDvsprintf(S,FMT,A)     vsprintf(S,FMT,A)
-#ifdef _WIN32
-#   define HDvsnprintf(S,N,FMT,A) _vsnprintf(S,N,FMT,A)
-#else
-#   define HDvsnprintf(S,N,FMT,A) vsnprintf(S,N,FMT,A)
-#endif
-#define HDwait(W)               wait(W)
-#define HDwaitpid(P,W,O)        waitpid(P,W,O)
-#define HDwcstombs(S,P,Z)       wcstombs(S,P,Z)
-#define HDwctomb(S,C)           wctomb(S,C)
-
-#if defined (__MWERKS__)
-/* workaround for a bug in the Metrowerks version 6.0 header file for write
- which is not defined as const void*
- */
-#define HDwrite(F,M,Z)          write(F,(void*)M,Z)
-#else
-#define HDwrite(F,M,Z)          write(F,M,Z)
-#endif
-
-/*
- * And now for a couple non-Posix functions...  Watch out for systems that
- * define these in terms of macros.
- */
-#ifdef _WIN32
-#define HDstrdup(S)    _strdup(S)
-#else /* _WIN32 */
-
-#if !defined strdup && !defined H5_HAVE_STRDUP
-extern char *strdup(const char *s);
-#endif
-
-#define HDstrdup(S)     strdup(S)
-
-#endif /* _WIN32 */
-
-/*
- * HDF Boolean type.
- */
-#ifndef FALSE
-#   define FALSE 0
-#endif
-#ifndef TRUE
-#   define TRUE 1
-#endif
-
-/*
- * Although `long long' is part of the revised ANSI-C some compilers don't
- * support it yet.  We define `long_long' as the longest integral integer type
- * supported by the compiler, usually 64 bits.	It must be legal to qualify
- * `long_long' with `unsigned'.
- */
-#if H5_SIZEOF_LONG_LONG>0
-#   define long_long	long long
-#elif H5_SIZEOF___INT64>0
-#   define long_long	__int64	/*Win32*/
-#   undef H5_SIZEOF_LONG_LONG
-#   define H5_SIZEOF_LONG_LONG H5_SIZEOF___INT64
-#else
-#   define long_long	long int
-#   undef H5_SIZEOF_LONG_LONG
-#   define H5_SIZEOF_LONG_LONG H5_SIZEOF_LONG
-#endif
-
-/** From h5test.h **/
-
-#ifdef H5_HAVE_PARALLEL
-extern MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
-#endif
-
-#ifdef H5_HAVE_PARALLEL
-H5TEST_DLL int h5_set_info_object(void);
-H5TEST_DLL void h5_dump_info_object(MPI_Info info);
-#endif
-
-
-
-/** From h5tools_utils.h **/
-
-extern int         opt_err;     /* getoption prints errors if this is on    */
-extern int         opt_ind;     /* token pointer                            */
-extern const char *opt_arg;     /* flag argument (or value)                 */
-
-
-enum {
-    no_arg = 0,         /* doesn't take an argument     */
-    require_arg,        /* requires an argument	        */
-    optional_arg        /* argument is optional         */
-};
-
-
-typedef struct long_options {
-    const char  *name;          /* name of the long option              */
-    int          has_arg;       /* whether we should look for an arg    */
-    char         shortval;      /* the shortname equivalent of long arg
-                                 * this gets returned from get_option   */
-} long_options;
-
-extern int    get_option(int argc, const char **argv, const char *opt,
-                         const struct long_options *l_opt);
-#endif
diff --git a/perform/sio_timer.c b/perform/sio_timer.c
deleted file mode 100644
index 55031ba..0000000
--- a/perform/sio_timer.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Purpose:
- *
- * This is a module of useful timing functions for performance testing.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "sio_timer.h"
-
-
-#include "sio_perf.h"
-
-/*
- * The number to divide the tv_usec field with to get a nice decimal to add to
- * the number of seconds.
- */
-#define MICROSECOND     1000000.0
-
-/* global variables */
-sio_time   *timer_g;            /* timer: global for stub functions     */
-
-/*
- * Function:  sub_time
- * Purpose:   Struct two time values, and return the difference, in microseconds
- *
- * 	      Note that the function assumes that a > b
- * Programmer: Leon Arber, 1/27/06
- */
-static double sub_time(struct timeval* a, struct timeval* b)
-{
-    return (((double)a->tv_sec +
-     ((double)a->tv_usec) / MICROSECOND) -
-	((double)b->tv_sec +
-	 ((double)b->tv_usec) / MICROSECOND));
-}
-
-
-/*
- * Function:    sio_time_new
- * Purpose:     Build us a brand, spankin', new performance time object.
- *              The object is a black box to the user.
- * Return:      Pointer to sio_time object
- * Programmer:  Bill Wendling, 01. October 2001
- * Modifications:
- */
-sio_time *
-sio_time_new(void)
-{
-    sio_time *pt = (sio_time *)calloc(1, sizeof(struct sio_time_));
-
-    /* set global timer variable */
-    timer_g = pt;
-
-    return pt;
-}
-
-/*
- * Function:    sio_time_destroy
- * Purpose:     Remove the memory allocated for the sio_time object. Only
- *              need to call on a pointer allocated with the ``sio_time_new''
- *              function.
- * Return:      Nothing
- * Programmer:  Bill Wendling, 01. October 2001
- * Modifications:
- */
-void
-sio_time_destroy(sio_time *pt)
-{
-    free(pt);
-    /* reset the global timer pointer too. */
-    timer_g = NULL;
-}
-
-
-
-/*
- * Function:    set_time
- * Purpose:     Set the time in a ``sio_time'' object.
- * Return:      Pointer to the passed in ``sio_time'' object.
- * Programmer:  Bill Wendling, 01. October 2001
- * Modifications:
- */
-sio_time *
-set_time(sio_time *pt, timer_type t, int start_stop)
-{
-    if (pt) {
-            if (start_stop == START) {
-                gettimeofday(&pt->sys_timer[t], NULL);
-
-		/* When we start the timer for HDF5_FINE_WRITE_FIXED_DIMS or HDF5_FINE_READ_FIXED_DIMS
-		 * we compute the time it took to only open the file */
-		if(t == HDF5_FINE_WRITE_FIXED_DIMS)
-		    pt->total_time[HDF5_FILE_WRITE_OPEN] += sub_time(&(pt->sys_timer[t]), &(pt->sys_timer[HDF5_GROSS_WRITE_FIXED_DIMS]));
-		else if(t == HDF5_FINE_READ_FIXED_DIMS)
-		    pt->total_time[HDF5_FILE_READ_OPEN] += sub_time(&(pt->sys_timer[t]), &(pt->sys_timer[HDF5_GROSS_READ_FIXED_DIMS]));
-
-
-            } else {
-                struct timeval sys_t;
-
-                gettimeofday(&sys_t, NULL);
-                pt->total_time[t] += sub_time(&sys_t, &(pt->sys_timer[t]));
-
-/*                    ((double)sys_t.tv_sec +
-                                ((double)sys_t.tv_usec) / MICROSECOND) -
-                    ((double)pt->sys_timer[t].tv_sec +
-                            ((double)pt->sys_timer[t].tv_usec) / MICROSECOND);*/
-
-		/* When we stop the timer for HDF5_GROSS_WRITE_FIXED_DIMS or HDF5_GROSS_READ_FIXED_DIMS
-		 * we compute the time it took to close the file after the last read/write finished */
-		if(t == HDF5_GROSS_WRITE_FIXED_DIMS)
-		    pt->total_time[HDF5_FILE_WRITE_CLOSE] += sub_time(&(pt->sys_timer[t]), &(pt->sys_timer[HDF5_FINE_WRITE_FIXED_DIMS]));
-		else if(t == HDF5_GROSS_READ_FIXED_DIMS)
-		    pt->total_time[HDF5_FILE_READ_CLOSE] += sub_time(&(pt->sys_timer[t]), &(pt->sys_timer[HDF5_FINE_READ_FIXED_DIMS]));
-
-            }
-
-        if (sio_debug_level >= 4) {
-            const char *msg;
-
-            switch (t) {
-            case HDF5_FILE_OPENCLOSE:
-                msg = "File Open/Close";
-                break;
-            case HDF5_DATASET_CREATE:
-                msg = "Dataset Create";
-                break;
-            case HDF5_MPI_WRITE:
-                msg = "MPI Write";
-                break;
-            case HDF5_MPI_READ:
-                msg = "MPI Read";
-                break;
-            case HDF5_FINE_WRITE_FIXED_DIMS:
-                msg = "Fine Write";
-                break;
-            case HDF5_FINE_READ_FIXED_DIMS:
-                msg = "Fine Read";
-                break;
-            case HDF5_GROSS_WRITE_FIXED_DIMS:
-                msg = "Gross Write";
-                break;
-            case HDF5_GROSS_READ_FIXED_DIMS:
-                msg = "Gross Read";
-                break;
-            case HDF5_RAW_WRITE_FIXED_DIMS:
-                msg = "Raw Write";
-                break;
-            case HDF5_RAW_READ_FIXED_DIMS:
-                msg = "Raw Read";
-                break;
-            default:
-                msg = "Unknown Timer";
-                break;
-            }
-
-            fprintf(output, "    %s %s: %.2f\n", msg,
-                    (start_stop == START ? "Start" : "Stop"),
-                    pt->total_time[t]);
-        }
-    }
-
-    return pt;
-}
-
-/*
- * Function:    get_time
- * Purpose:     Get the time from a ``sio_time'' object.
- * Return:      The number of seconds as a DOUBLE.
- * Programmer:  Bill Wendling, 01. October 2001
- * Modifications:
- */
-double
-get_time(sio_time *pt, timer_type t)
-{
-    return pt->total_time[t];
-}
-#ifdef STANDALONE
-#include "sio_standalone.c"
-#endif
-
diff --git a/perform/sio_timer.h b/perform/sio_timer.h
deleted file mode 100644
index d991be7..0000000
--- a/perform/sio_timer.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef SIO_TIMER__
-#define SIO_TIMER__
-
-#include "hdf5.h"
-
-#if defined(H5_TIME_WITH_SYS_TIME)
-#   include <sys/time.h>
-#   include <time.h>
-#elif defined(H5_HAVE_SYS_TIME_H)
-#   include <sys/time.h>
-#else
-#   include <time.h>
-#endif
-
-/* The different types of timers we can have */
-typedef enum timer_type_ {
-    HDF5_FILE_OPENCLOSE,
-    HDF5_DATASET_CREATE,
-    HDF5_MPI_WRITE,
-    HDF5_MPI_READ,
-    HDF5_FILE_READ_OPEN,
-    HDF5_FILE_READ_CLOSE,
-    HDF5_FILE_WRITE_OPEN,
-    HDF5_FILE_WRITE_CLOSE,
-    HDF5_FINE_WRITE_FIXED_DIMS,
-    HDF5_FINE_READ_FIXED_DIMS,
-    HDF5_GROSS_WRITE_FIXED_DIMS,
-    HDF5_GROSS_READ_FIXED_DIMS,
-    HDF5_RAW_WRITE_FIXED_DIMS,
-    HDF5_RAW_READ_FIXED_DIMS,
-    NUM_TIMERS
-} timer_type;
-
-
-/* Miscellaneous identifiers */
-enum {
-    START,          /* Start a specified timer              */
-    STOP            /* Stop a specified timer               */
-};
-
-/* The performance time structure */
-typedef struct sio_time_ {
-    double total_time[NUM_TIMERS];
-    struct timeval sys_timer[NUM_TIMERS];
-} sio_time;
-
-/* External function declarations */
-#ifdef __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-extern sio_time    *sio_time_new(void);
-extern void         sio_time_destroy(sio_time *pt);
-extern void         set_timer_type(sio_time *pt);
-extern sio_time    *set_time(sio_time *pt, timer_type t, int start_stop);
-extern double       get_time(sio_time *pt, timer_type t);
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif  /* SIO_TIMER__ */
diff --git a/release_docs/HISTORY-1_9.txt b/release_docs/HISTORY-1_9.txt
deleted file mode 100644
index 8e7648a..0000000
--- a/release_docs/HISTORY-1_9.txt
+++ /dev/null
@@ -1,6 +0,0 @@
- HDF5 HISTORY
- ============
- This file contains history of the HDF5 1.9 branch
- 
- CONTENTS
-
diff --git a/release_docs/HISTORY-1_0-1_8_0_rc3.txt b/release_docs/HISTORY.txt
index 964d374..1327827 100644
--- a/release_docs/HISTORY-1_0-1_8_0_rc3.txt
+++ b/release_docs/HISTORY.txt
@@ -1,14 +1,9 @@
 HDF5 HISTORY
 ============
-This file contains history of the HDF5 libraries releases starting with
-HDF5-1.0.0 and ending with HDF5-1.8.0-rc3 (the state of the code before i
-the HDF5 1.8.0 release).
+This file contains history of the HDF5 libraries releases
 
 CONTENTS
 
-22.     Changes from 1.6.0 to 1.8.0-rc3
-21.     Release Information for hdf5-1.6.7
-20.     Release Information for hdf5-1.6.6
 19.     Release Information for hdf5-1.6.5
 18.     Release Information for hdf5-1.6.4
 17.     Release Information for hdf5-1.6.3
@@ -32,2549 +27,6 @@ CONTENTS
 
 [Search on the string '%%%%' for per-release section breaks.]
 
-%%%%1.8.0-rc3%%%%   Changes from 1.6.0 to 1.8.0-rc3
-
-
-HDF5 version 1.8.0-rc3 
-================================================================================
-
-
-INTRODUCTION
-
-This document describes the differences between HDF5-1.6.* and
-Hdf5 1.8.0 release candidate "HDF5-1.8.0-rc3", and contains information 
-on the platforms tested and known problems in HDF5-1.8.0-rc3. 
-For more details check the HISTORY.txt file in the HDF5 source.
-
-
-Links to HDF5 1.8.0-rc3 source code, documentation, and additional materials
-can be found on THG's development server (www.hdfgroup.uiuc.edu) at the
-following location:
-     http://www.hdfgroup.uiuc.edu/HDF5/release/beta/obtain518.html
-User documentation for the beta can be accessed directly at this location: 
-     http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/doc/
-
-New features of the upcoming 1.8.0 release are described in
-the "What's New in 1.8.0?" document:
-     http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/WhatsNew180.html
-
-New and modified APIs are described briefly in
-     http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/WhatsNew180.html
-and will be listed in the "HDF5 Software Changes" document:
-     http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/doc/ADGuide/Changes.html
-
-
-
-For more information, see the HDF5 home page:
-   
-    http://www.hdfgroup.org/HDF5/
-
-If you have any questions or comments, please send them to the HDF Help Desk:
-
-    help@hdfgroup.org
-
-
-CONTENTS
-
-- New Features
-- Support for new platforms and languages
-- Bug Fixes since HDF5-1.6.0
-- Platforms Tested
-- Known Problems
-
-
-New Features
-============
-
-    Configuration:
-    --------------
-        - Removed stream-vfd from the HDF5 library. - AKC 2007/11/19.
-        - Updated versions of autotools. HDF5 now uses automake 1.10.0, 
-          autoconf 2.61, and libtool 1.5.22. MAM - 2007/7/25.
-        - Changed default fortran compiler to g95 when gcc is used. - AKC
-          2007/2/17.
-        - 'make check-vfd' can now be run from the top level directory. Not all
-          tests that 'make check' invokes work with certain Virtual File Drivers,
-          so those tests have been skipped. - MAM 2006/7/17  
-        - Added the variable HDF5TestExpress to control how long tests run.
-          Setting it to a value between 0 and 3 controls how thoroughly the
-          library is tested, with 0 being an "exhaustive run" and 3 being a
-          very quick "smoke test."  1 (a "full run") is the default.
-          -JML 2006/6/21
-        - If both shared and static libraries are installed, now both will be
-          tested during 'make install'. -MAM 2006/06/21
-        - Added support to explicity enable stream_vfd or shared libraries
-          when using parallel via the '--enable-stream_vfd' and
-          '--enable-shared' options, respectively. If not explicity defined, 
-          These settings default to enabled when parallel is not used, 
-          and disabled when parallel is used. -MAM 2006/06/17
-        - Remove the flexible parallel code and the --enable-fphdf5
-          configure option, it was never up to production standards
-          anyway.  -QAK 2006/4/20
-        - Added a macro hdf5_mpi_special_collective_io_works to filter out
-          some mpi-io packages that don't support collective IO for no IO
-          contributions in some processes. -KY 2006/2/16
-	- Added -shlib option to link against installed shared libraries to
-	  h5c++ and h5fc.  -JML 2005/11/1
-	- Added --enable-build-all option to configure, which only developers
-	  should need to use.  -JML 2005/10/24
-	- Configure uses the 'TR' variable to let the user override the path
-          to the 'tr' utility. -JML 2005/10/17
-	- Configure can recognize -lmpich as a form of MPI library. -AKC-
-	  2005/9/28.
-        - MD5 checksumming has been added to snapshot releases.  Release
-          tarballs will be accompanied by .md5 checksum files, which can
-          be verified using the md5sum utility.  -JML 2005/9/6
-        - Some configure flags are incompatible (e.g., the C++ APIs cannot
-          be built using the parallel version of HDF5).  configure will now
-          output errors when some common incompatible features are used
-          together.  -JML 2005/9/6
-        - A new API function, H5Tis_hard(), was added to the library.  It
-          checks if a conversion function is a compiler (hard) conversion.
-          SLU - 2005/9/6
-	- t_mpi will run the test_mpio_derived_dtype by default unless it is
-	  known not working (indicated by macro H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
-	  not defined.)  -AKC- 2005/8/23.
-	- Test execution has changed in a number of ways:
-	  When make is invoked in parallel (using -j), sequential tests
-	  are now executed as parallel make targets.  This should make them
-	  finish more quickly on machines with multiple processors.
-	  Since test output is garbled when they are executed by parallel make,
-	  tests now dump their output to foo.log files and foo.logsh files
-	  (for test scripts).  These logs are printed to the screen only
-	  when a test fails or when all tests in the current directory have
-	  completed successfully.
-	  When tests pass, they will create a foo.chkexe file.
-	  This prevents the test from executing again until the test or
-	  main library changes.
-	  All files generated by tests (*.chkexe, *.log, and any *.h5 files
-	  created) can be removed by invoking 'make check-clean'.
-	  Sequential and parallel library tests can now be invoked separately.
-	  'make check-s' will execute only sequential tests, and 'make check-p'
-	  will execute only parallel tests.  'make check' will still execute
-	  all tests.
-	    -JML 2005/08/03
-        - On windows, all.zip is deprecated. users should
-             read INSTALL_Windows.txt to know the details.
-             Reasons to deprecate all.zip:
-		1. Avoid confliction for windows programmers
-                2. Decrease size of CVS tree by adding all.zip
-	        3. Avoid using winzip as the intermediate step
-             --KY 2005/04/22
-	- When HDF5 is created as a shared library, it now uses libtool's
-	  shared library versioning scheme. -JML 2005/04/18
-	- HDF5 now uses automake 1.9.5 to generate Makefiles.in.
-	  This has a number of effects on users:
-          The Fortran compiler should be set using the environment
-          variable $FC, not $F9X.  F9X still works, but is depreciated.
-	  The output of make may be different.  This should be only a
-          cosmetic effect.
-	  make depened (or make dep) is no longer recognized, since automake
-	  handles dependency tracking.
-	  Some new configure options exist.  --enable-dependency-tracking
-          and --disable-dependency-tracking are used to control automake's
-	  dependency tracking.  Dependencies are on by default *on most
-	  platforms and compilers*.  If --enable-dependency-tracking is
-	  used, they will be enabled on any platform.  However, this can
-	  slow down builds or even cause build errors in some cases.
-	  Likewise, --disable-dependency-tracking can speed up builds and
-	  avoid some build errors.
-	  Some make targets have alternate names.  make check-install and
-	  make installcheck do the same thing, for instance.
-	  pmake on IRIX can be invoked from the root directory, but the
-	  -V flag must be used to invoke it in any subdirectory or it
-	  will give an error about undefined variables.
-	  JML 2005/01 - 2005/03
-        - Hardware conversion between long double and integers is also added.
-          SLU 2005/02/10
-        - Started to support software conversion between long double and 
-          integers.  Hardware conversion will come very soon.  SLU - 2005/1/6
-	- Intel v8.0 compiler would infinite loop when compiling some test
-	  code with -O3 option.  Changed enable-production default compiler
-	  option to -O2. AKC - 2004/12/06
-	- Long double is assumed to be a supported C data type.  It is a
-	  stanadard C89 type. AKC - 2004/10/22
-	- The IA64 will use ecc as the C++ compiler by default.
-        - Added some initial support for making valgrind/Purify (or similar
-            memory checking products) happier by initializing buffers to zero
-            and disabling the internal free list code.  To take advantage of
-            this, use the "--enable-using-memchecker" configure option when
-            building the library.  QAK - 2004/07/23
-        - Fixed the long compile time of H5detect.c when v7.x Intel Compiler
-	    is used with optimization NOT off.  AKC - 2004/05/20
-	- Fixed configure setting of C++ for OSF1 platform. AKC - 2004/01/06
-        - Prefix default is changed from /usr/local to `pwd`/hdf5.
-            AKC - 2003/07/09
-
-    Library:
-    --------
-       - Removed size restrictions on attributes, when using the "latest"
-            version of the file format. - QAK - 2007/02/21
-       - Relaxed restrictions on attribute operations to allow a file ID to
-            be used as the "location ID".  If a file ID is used, the attribute
-            operation will occur on the root group of the file.
-            - QAK - 2007/02/09
-       - Enabled the CORE driver to read an existing file depending on 
-            the setting of the backing_store for H5Pset_fapl_core and file 
-            open flags. - SLU - 2006/11/30
-       - Added new H5Gget_info_by_idx() routine to query the information about
-            a group according to the order within an index.
-            - QAK - 2006/11/27
-       - Added new H5Gget_info() routine to query the information about a
-            group by name.
-            - QAK - 2006/11/27
-       - Added new H5Oget_info_by_idx() routine to query the information about
-            an object in a group according to the order within an index.
-            - QAK - 2006/11/26
-       - Added new H5Oget_info() routine to query the information about an
-            object in a group by name.
-            - QAK - 2006/11/26
-       - Added new H5Oopen_by_idx() routine to open an object in a group
-            according to the order within an index.
-            - QAK - 2006/11/20
-       - Added new H5Literate() routine to iterate over links in a group
-            according to the order within an index.
-            - QAK - 2006/11/20
-       - Added new H5Ldelete_by_idx() routine to delete a link according to
-            the order within an index.
-            - QAK - 2006/11/13
-       - Added new H5Lget_val_by_idx() routine to query the value of a soft link
-            according to the order within an index.
-            - QAK - 2006/11/13
-       - Added new H5Lget_name_by_idx() routine to query the name of a link
-            according to the order within an index.
-            - QAK - 2006/11/12
-       - Added new H5Rget_name() routine to determine the name of the object
-            that a reference points to, as long as the object is still
-            reachable in the group hierarchy.
-            - QAK - 2006/11/10
-       - Added new H5Lget_info_by_idx() routine to query the link information
-            according to the order within an index.
-            - QAK - 2006/11/10
-       - Added feature to H5Iget_name to allow retrieving the name of any
-            object's ID, as long as the object is still reachable in the
-            group hierarchy.
-            - LA - 2006/11/01
-       - Added External and User-defined links.
-            External links are links from one HDF5 file to another; they
-            require both the name of the file and a path within that file.
-            User-defined links allow users to supply callback functions
-            for link traversals, allowing links to exhibit essentially
-            any behavior.
-            External links are a kind of user-defined link, so their default
-            behavior can be overridden by the user.
-            -JML 2006/8/23
-       - Added H5Oopen and H5Oclose for opening objects of unknown type
-            (as link callback functions do).
-            -JML 2006/8/23
-       - Added H5Oopen_by_addr, H5Oincr_refcount, and H5Odecr_refcount for
-            opening objects by address.  Be very careful with these!
-            -JML 2006/8/23
-       - Added H5Fget_intent to get the "intent" of a file (whether it
-            was opened with read-write access or read-only.
-            -JML 2006/8/23
-       - Added Link Access Property Lists. They currently contain two
-            properties, nlinks (H5Pget/set_nlinks) and elink_prefix
-            (H5Pget/set_elink_prefix). nlinks controls how many soft and
-            user-defined traversals are allowed before HDF5 assumes it has
-            found a cycle (previously this defaulted to 16).
-            The elink_prefix is a filesystem path that is prefixed to the
-            names of any external link files opened using this LAPL.
-            -JML 2006/8/23
-       - Add H5L link APIs.  Old APIs (H5Glink, H5Gmove, etc.) are still
-         supported but deprecated.
-         New APIs are:
-            H5Llink - create a link to an object given its ID
-            H5Lmove - just like H5Gmove2
-            H5Lcopy - copy a link without copying the underlying object
-            H5Lcreate_hard - like H5Glink2 for hard links
-            H5Lcreate_soft - like H5Glink2 for soft links
-            H5Ldelete - just like H5Gunlink
-            H5Lget_val - just like H5Gget_linkval
-            H5Lget_info - gets link-specific info (like H5Gget_objinfo)
-
-         In addition, H5Gcreate_anon, H5Tcommit_anon, and H5Dcreate_anon
-         no longer create links to objects; objects must be manually linked
-         using H5Llink or they will be deleted when the ID is closed.
-
-         Link Creation Property Lists can be used to pass character
-         encoding (ASCII or UTF-8) for link names and to set the Intermediate
-         Group Creation Flag:
-            H5Pset_char_encoding, H5Pget_char_encoding
-            H5Pset_copy_object, H5Pget_copy_object
-         -JML 2006/7/5
-       - Added managements of collective IO supports for chunking storage
-         inside parallel HDF5
-         1) Implemented One IO with collective mode for all chunks in the
-            application by building one MPI derived datatype accross all
-            chunks.
-         2) Implemented the decision-making support to do collective IO inside
-            MPI-IO per chunk. 
-         3) Added the decision-making support to do one IO accross all chunks
-            or to do multiple IOs with each IO per chunk.
-         4) Added the support to handle the case some processes won't do any IOs in 
-            collectively.
-         5) Some MPI-IO package(mpich 1.2.6 or lower, e.g.) cannot handle
-            collective IO correctly for the case when some processes have no
-            contributions to IOs, a special macro is added to change
-            collective IO mode to independent IO mode inside HDF5 library.
-
-            Currently we find that MPICH at Linux and vender MPI-IO package at NCSA
-            Altix cannot handle this case. 
-            
-             "hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}"
-              has been added at the end of file <ia64-linux-gnui> and
-                                                 <linux-gnulibc1>.
-
-             If MPI-IO packages at your Linux and Altix support this case,
-             please comment out the last line and report to us at
-             help@hdfgroup.org. We can tune in our configuration to
-             support this.                                                     
- 
-             KY - 2006/02/16
-       - Added character encoding to attribute creation property lists.
-            JML - 2006/01/02
-       - Added H5Gcopy() routine to copy objects between while keeping
-         data in compressed form.  QAK - 2005/11/06
-       - Added H5Sextent_equal() routine.  QAK - 2005/11/06
-       - Added HSYS_ERROR which retrieves the system error message and pushes
-         it to the error stack.  This gives more information of the failed
-	 system call. AKC - 2005/08/04
-       - Added H5F_OBJ_LOCAL flag to H5Fget_obj_count() & H5Fget_obj_ids(), to
-         allow querying for objects in file that were opened with a particular
-         file ID, instead of all objects opened in file with any file ID.
-         QAK - 2005/06/01
-       - Added H5T_CSET_UTF8 character set to mark datatypes that use the
-         UTF-8 Unicode character encoding.  Added tests to ensure that
-         library handles UTF-8 object names, attributes, etc. -JL 2005/05/13
-       - HDF5 supports collective MPI-IO for irregular selection with HDF5
-         dataset. Irregular selection is when users use H5Sselect_hyperslab
-         more than once for the same dataset.
-         Currently, not all MPI-IO packages support complicated MPI derived
-                     datatype used in the implementation of irregular
-                     selection INSIDE HDF5. 
-                     1) DEC 5.x is not supporting complicated derived datatype.
-                     2) For AIX 5.1,
-                     if your poe version number is 3.2.0.19 or lower,
-                     please edit powerpc-ibm-aix5.x under hdf5/config,
-                     Find the line with
-                            << hdf5_mpi_complex_derived_datatype_works>>
-                     and UNCOMMENT this line before the configure.
-                     check poe version with the following command:
-                     lpp -l all | grep ppe.poe
-                     3) For Linux cluster, 
-                        if mpich version is 1.2.5 or lower, collective irregular selection
-                        IO is not supported, internally independent IO is used.
-                     4) For IRIX 6.5,
-                        if C compiler version is 7.3 or lower, collective irregular selection
-                        IO is not supported, internally independent IO is used.
-                     5) For platforms which internally used mpich, if the
-                        mpich version is 1.2.5 or lower, please find the 
-                        corresponding config file and add
-                        hdf5_mpi_complex_derived_datatype_works='no' at the
-                        end of the configuration file. For example, at NCSA
-                        SGI Altix, the internal mpich library is 1.2.5. So 
-                        hdf5_mpi_complex_derived_datatype_works='no' should be
-                        added at the end of the config file ia64-linux-gnu.
-                     KY - 2005/09/12
-        We also found not all MPI-IO packages support collective IO with one
-                    or more processes to have no contributions to IO.
-                     For mpich version 1.2.6 or lower and all IRIX machine, 
-                     if the library  checks that there are no IO contributions for some
-                     processes, collective IO request is replaced with
-                     independent inside HDF5.
-                     KY - 2006/05/04
-                    
-        - HDF5 N-bit filter 
-          HDF5 support N-bit filter from this version,  
-          The N-Bit filter is used effectively for compressing data of N-Bit
-          datatype as well as compound and array datatype with N-Bit fields. 
-          KY - 2005/04/15
-        - HDF5 scaleoffset filter
-          HDF5 supports scaleoffset filter for users to do data
-          compression through HDF5 library. 
-          Scale-Offset compression performs a scale and/or offset operation
-          on each data value and truncates the resulting value to a minimum 
-          number of bits and then stores the data.
-          Scaleoffset filter supports floating-point and integer datatype.
-          Please check the HDF5 reference manual for this.
-          KY - 2005/06/06
-        - Retired SRB vfd (--with-srb). Functions H5Pset_fapl_srb and
-          H5Pget_fapl_srb were removed.  EIP - 2005/04/07
-	- Retired GASS vfd (--with-gass).  Functions H5Pset_fapl_gass and
-	  H5Pget_fapl_gass are removed too.  AKC - 2005/3/3
-        - Pablo was removed from the source code EIP - 2005/01/21
-        - Modified registration of SZIP to dynamically detect the presence
-            or absence of the encoder.  Changed configure and Makefiles,
-            and tests to dynamically detect encoder. BEM - 2004/11/02
-	- Added function H5Pget_data_transform, together with the previously
-	    added H5Pset_data_transform, to support the data transform
-	    feature. AKC - 2004/10/26
-        - Compound datatype has been enhanced with a new feature of size 
-            adjustment.  The size can be increased and decreased(without
-            cutting the last member) as long as it doesn't go down to zero.  
-            No API change is involved.  SLU - 2004/10/1
-        - Put back 6 old error API functions to be backward compatible with
-            version 1.6.  They are H5Epush, H5Eprint, H5Ewalk, H5Eclear,
-            H5Eset_auto, H5Eget_auto.  Their new equivalent functions are
-            called H5Epush_stack, H5Eprint_stack, H5Ewalk_stack,
-            H5Eclear_stack, H5Eset_auto_stack, H5Eget_auto_stack.  SLU -
-            2004/9/2
-        - 4 new API functions, H5Tencode, H5Tdecode, H5Sencode, H5Sdecode were
-            added to the library.  Given object ID, these functions encode and 
-            decode HDF5 objects(data type and space) information into and from 
-            binary buffer.        SLU - 2004/07/21
-        - Modified the way how HDF5 calculates 'pixels_per_scanline' parameter for 
-            SZIP compression. Now there is no restriction on the size and shape of the
-            chunk except that the total number of elements in the chunk cannot be 
-            bigger than 'pixels_per_block' parameter provided by the user.  
-                                                                     EIP - 2004/07/21  
-        - Added support for SZIP without encoder.  Added H5Zget_filter_info
-            and changed H5Pget_filter and H5Pget_filter_by_id to support this
-            change.  JL/NF - 2004/06/30
-        - SZIP always uses K13 compression.  This flag no longer needs to
-            be set when calling H5Pset_szip.  If the flag for CHIP
-            compression is set, it will be ignored (since the two are mutually
-            exclusive).  JL/NF - 2004/6/30
-        - A new API function H5Fget_name was added.  It returns the name
-            of the file by object(file, group, data set, named data type,
-            attribute) ID.  SLU - 2004/06/29
-        - Added support for user defined identifier types.  NF/JL - 2004/06/29
-        - A new API function H5Fget_filesize was added.  It returns the
-            actual file size of the opened file.  SLU - 2004/06/24
-	- New Feature of Data transformation is added.  AKC - 2004/05/03.
-        - New exception handler for datatype conversion is put in to 
-            replace the old overflow callback function.  This exception
-            handler is set through H5Pset_type_conv_cb function.
-            SLU - 2004/4/27
-        - Added option that if $HDF5_DISABLE_VERSION_CHECK is set to 2,
-	    will suppress all library version mismatch warning messages.
-	    AKC - 2004/4/14
-	- A new type of dataspace, null dataspace(dataspace without any 
-            element) was added.  SLU - 2004/3/24
-        - Data type conversion(software) from integer to float was added.
-            SLU - 2004/3/13 
-        - Data type conversion(software) from float to integer was added.
-            Conversion from integer to float will be added later.  
-            SLU -2004/2/4
-        - Added new H5Premove_filter routine to remove I/O pipeline filters
-            from dataset creation property lists.  PVN - 2004/01/26
-        - Added new 'compare' callback parameter to H5Pregister & H5Pinsert
-            routines.  QAK - 2004/01/07
-        - Data type conversion(hardware) between integers and floats was added.
-            SLU 2003/11/21
-        - New function H5Iget_file_id() was added.  It returns file ID given
-            an object(dataset, group, or attribute) ID.  SLU 2003/10/29
-        - Added new fields to the H5G_stat_t for more information about an
-            object's object header.  QAK 2003/10/06
-        - Added new H5Fget_freespace() routine to query the free space in a
-            given file.  QAK 2003/10/06
-        - Added backward compatability with v1.6 for new Error API. SLU - 
-            2003/09/24
-        - Changed 'objno' field in H5G_stat_t structure from 'unsigned long[2]'
-            to 'haddr_t'.  QAK - 2003/08/08
-        - Changed 'fileno' field in H5G_stat_t structure from 'unsigned long[2]'
-            to 'unsigned long'.  QAK - 2003/08/08
-        - Changed 'hobj_ref_t' type from structure with array field to 'haddr_t'.
-            QAK - 2003/08/08
-        - Object references (hobj_ref_t) can now be compared with the 'objno'
-            field in the H5G_stat_t struct for testing if two objects are the
-            same within a file.  QAK - 2003/08/08
-        - Switched over to new error API. SLU - 2003/07/25
-
-    Parallel Library:
-    -----------------
-	- Added mpich2 as a testing "platform" informally. AKC - 2005/9/28.
-	- A dataset created in serial mode with H5D_ALLOC_TIME_INCR allocation
-	  setting was not extendible, either explicitly by H5Dextend or
-	  implicitly by writing to unallocated chunks.	Library now allocates
-	  more space when needed or directed if the file is opened by parallel
-	  mode, independent of what the dataset allocation mode is.
-	  CC/AKC - 2005/08/29.
-        - Allow compressed, chunked datasets to be read in parallel.
-            QAK - 2004/10/04
-        - Add options of using atomicity and file-sync to test_mpio_1wMr.
-            AKC - 2003/11/13
-        - Added parallel test, test_mpio_1wMr, which tests if the
-            underlaying parallel I/O system is conforming to the POSIX
-            write/read requirement.  AKC - 2003/11/12
-
-    Fortran Library:
-    ----------------
-         - added support for shared Fortran libraries.  -JML 2005/09/20
-         - added missing h5tget_member_class_f function
-                                                 EIP 2005/04/06         
-         - added new functions h5fget_name_f and h5fget_filesize_f 
-                                                 EIP 2004/07/08
-         - h5dwrite/read_f and h5awrite/read_f functions only accept dims parameter
-            of the type INTEGER(HSIZE_T).
-         - added support for native integers of 8 bytes (i.e. when special
-           compiler flag is specified to set native fortran integers to 8 bytes,
-           for example, -i8 flag for PGI and Absoft Fortran compilers, 
-           -qintsize=8 flag for IBM xlf compiler).
-                                                 EIP 2005/06/20
-         - added support for "big" REAL and DOUBLE PRECISION types
-           (usually the size is specified by compilers flags like 
-            -r8, -r16, etc.)
-           Known problem: multi file test fails when REAL is 16 bytes.
-                                                EIP 2005/09/8
-
-    C++ Library:
-    ----------------
-        - added support for shared C++ libraries.  -JML 2005/09/20
-        - Added missing member functions
-                H5::CompType::getMemberArrayType
-                H5::CompType::getMemberVarLenType
-                H5::AbstractDs::getArrayType
-                H5::AbstractDs::getVarLenType
-                H5::CommonFG::openArrayType
-                H5::CommonFG::openVarLenType
-                H5::PropList::copyProp -- this will replace the current
-                        H5::PropList::copyProp in later releases due
-                        to incorrect prototype.
-                H5::IdComponent::getHDFObjType
-                BMR - 2005/08/08
-
-
-    Tools:
-    ------
-        - h5repack and h5diff changed command line parameter syntax to be
-           similar to h5dump, adding also long switch names. PVN - 2008/1/16
-        - h5repack now supports adding multiple filters to all objects. 
-	     PVN - 2008/1/16
-        - h5dump lists groups and attributes in requested orders (by name and 
-           creation order, both ascending and descending). PVN - 2007/10/5
-        - h5import imports string (text) data. PVN - 2007/10/5
-        - h52gif and gif2h5: Both these tools were revised to include the High
-          Level Image API support, and tests were added to /hl/tools/gif2h5.
-           PVN - 2007/04/13
-        - h5dump: added support for double long type H5T_NATIVE_LDOUBLE. PVN
-           2007/03/13
-        - h5dump: added support for binary output, see usage. PVN 2007/03/13
-        - h5repack: added support for the new nbit and scaleoffset filters.
-           PVN - 2007/05/07
-        - h5repack: now uses the API function H5Ocopy (of the tool h5copy) to
-           recreate objects if there is not a user input for changes. PVN -
-           2007/05/07
-        - h5repack: added support for reading and repacking  by hyperslabs for
-           large files. PVN - 2007/03/01
-        - h5repack: a new option allows the copy using the file type (default)
-           instead of the previous conversion to native type. PVN - 2007/03/01
-        - h5repack: output the percentage of compression used. PVN - 2007/03/01
-        - h5diff: added support for -p option for unsigned long_long data. PVN
-          - 2007/02/26
-        - h5diff: added support for comparing dataset regions. PVN - 2007/02/20
-        - h5diff: added support for reading and comparing by hyperslabs for large files.
-           PVN - 2007/02/20
-        - h5diff: printing of dataset dimensions along with dataset name. PVN -2007/02/19
-        - h5dump now uses the new API function H5Rget_name to display the name
-          of the dataset referenced instead of its ID. PVN - 2007/02/19
-        - Added new tool, h5mkgrp. QAK - 2007/02/14
-        - Added new tool, h5copy. PVN - 2006/7/15
-	- Removed obsolete pdb2hdf5 tool from tools/misc  -JML 2005/10/24
-	- Added build_h5perf_alone.sh that builds h5perf by standalone mode.
-	  AKC - 2005/09/18.
-        - Sped up h5dump on files with large numbers of objects.
-            QAK - 2005/08/25
-        - Added a standalone mode for building h5perf.  AKC - 2005/08/12
-        - new tool, h5jam. See reference manual.  2004/10/08
-        - h5repack.sh did not report errors encountered during tests.  It does
-            now.  AKC - 2004/04/02
-        - Added the MPI-I/O and MPI-POSIX drivers to the list of VFL drivers
-            available for h5dump and h5ls.  RPM & QAK - 2004/02/01
-        - Added option --vfd= to h5ls to allow a VFL driver to be selected
-            by a user.  RPM & QAK - 2004/02/01
-	- Added option -showconfig to compiler tools (h5cc,h5fc,h5c++).
-	    AKC - 2004/01/08
-        - Install the "h5cc" and "h5fc" tools as "h5pcc" and "h5pfc"
-            respectively if library is built in parallel mode.
-            WCW - 2003/11/04
-        - Added metadata benchmark (perform/perf_meta).  SLU - 2003/10/03
-        - Changed output of "OID"s from h5dump from "<number>-<number>" to
-            "<number".  This affects both the "regular" and XML output.
-            QAK - 2003/08/08
-        - Changed output of file IDs and "OID"s from h5ls from
-            "<number>:<number>:<number>:<number>" to "<number>:<number>"
-            QAK - 2003/08/08
-
-    High-Level APIs:
-    ------
-        - Fortran interfaces for the Image, Table and Lite APIs. PVN - 2007/5/1
-        - New HDF5 Dimension Scale API (H5DS) allows dimension scales to be
-          created in an HDF5 file and associated with specific datasets. PVN - 2007/5/1
-        - There are two new functions in the Lite library, H5LTtext_to_dtype
-            and H5LTdtype_to_text.  H5LTtext_to_dtype creates a HDF5 data type
-            given a text description; H5LTdtype_to_text converts a data type
-            to text description.  Only DDL definition is supported as text 
-            desciption now. SLU - 2006/05/17
-        - Added Packet Table API for creating tables with less overhead than
-            H5TB API.  Added C++ wrapper for Packet Tables.  See documentation.
-            JML - 2004/03/28
-    
-    Documentation 
-    ------------- 
-        - The documentation for this release is largely complete, but 
-            trails the source code.  A few of the newer functions are 
-            not yet documented.                       FMB - 2007/04/18
-        - The user documents for this release can be accessed directly at
-            this location:
-               http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/doc/
-            The most recent document versions (updated daily) in the 
-            1.8 development branch can be accessed at this location:
-               http://www.hdfgroup.uiuc.edu/HDF5/doc_dev_snapshot/H5_dev/
-                                                      FMB - 2007/04/18
-
-
-Support for new platforms, languages and compilers.
-=======================================
-        - Added support for Free-BSD on amd64 with GNU C and Fortran compilers
-          4.2.1
-                                                     EIP - 2007/06/25
-        - Added support for sequential and parallel libraries for Intel 64 Linux
-          cluster (abe.ncsa.uiuc.edu).  Among three MPICH packages available on
-          this machine, only Open MPI works.  The VMI has seg fault in hyperslab.c
-          and bittests.c tests.  The MVAPICH2 complained about mpd not running 
-          the parallel test.  (see Known Problems section for more info)
-                                                     EIP - 2007/06/25
-        - Added support for HPUX11.23 for both 32 and 64-bit; HDF5 C++
-        - Added support for 64-bit Windows with Visual Studio .NET and 2005.
-            SJW - 2007/06/25
-        - Added suport for HPUX11.23 for both 32 and 64-bit; HDF5 C++
-          shared library is not supported with +DD64 flag.
-                                                     EIP - 2006/06/22
-        - Added support for VAX floating numbers for Alpha Open VMS 7.3.2
-                                                     EIP - 2006/05/05
-        - Fixed broken make.com files in tools directories
-                                                     EIP - 2006/05/05
-        - Added support for Alpha Open VMS 7.3.2 EIP - 2006/04/15
-        - Added support for Cray X1.  JML - 2005/10/03
-        - PGI Fortran compiler is supported on Linux64 systems (x86_64)
-                            EIP - 2004/08/19
-        - Absoft compiler f95 v9.0 supported on Linux 2.4
-                            EIP - 2004/07/29
-        - HDF5 Fortran APIs are supported on Mac OSX with IBM XL Fortran
-            compiler version 8.1. This is a default compiler.
-        - HDF5 Fortran APIs are supported on MAC OSX with Absoft F95 compiler
-            version 8.2; set F9X environment varibale to f95, for example
-            setenv F9X f95
-            Use --disable-shared --enable-static configure flags when Absoft
-            compiler is used.
-                             EIP - 2004/07/27
-        - HDF5 Fortran APIs are supported on MAC OSX with IBM XL Fortran
-            Compiler version 8.1 Use "--disable-shared --enable-static"
-            configure flags along with the "--enable-fortran" flag to build
-            Fortran library.  EIP - 2004/01/07
-
-Bug Fixes since HDF5-1.6.0 release
-==================================
-
-    Library
-    -------
-        - Changed library's behavior for reading files that might have
-            corrupted object header information from a previous (buggy)
-            version of the library.  By default, the library now rebuilds the
-            correct object header information instead of issuing an error.
-            Previous "strict" file format interpretation can be enabled with
-            the "--enable-strict-format-checks" configure option.
-            QAK - 2008/01/13
-        - Fixed several bugs with writing fill values for datasets that have
-            a variable-length datatype or component datatype.  QAK - 2007/06/19
-        - STDIO driver didn't support files bigger than 2GB because the OFFSET
-            parameter of fseek is of type LONG INT, not big enough for big files.
-            Use fseeko instead for big files if it's available on the system.
-            SLU - 2007/4/5
-        - Fixed a bug in H5Sselect_valid() that caused an incorrect value to
-            be returned (0) instead of FAIL on error conditions such as the
-            selection or extent not being defined. CMC - 2007/01/17
-        - Fixed the MULTI driver problem (Bug #731) that corruptted the data.
-            SLU - 2007/1/12
-        - Fixed file corruption bug which could write an incorrect number of
-            messages to an object's header under certain circumstances.
-            Generally, the sequence of actions to generate this bug looks
-            like this:
-                - Create an object
-                - Close the file
-                - Re-open the file
-                - Add 2 (or more) attributes to the object
-                - Close the file
-                - Re-open the file
-                - Delete one of the attributes on the object
-                - Add a smaller attribute to the object
-                - Delete the smaller atttribute on the object
-                - Add a larger attribute on the object
-
-            After this, the number of header messages stored for the object
-            will be off by one.  Other sequences of modifying attributes on an
-            object could also trigger this bug.  If you are opening an
-            object and the bottom few messages of the HDF5 error stack
-            resembles this, the object has been affected by this bug:
-
-              #007: ../../hdf5_v1.6/src/H5C.c line 3887 in H5C_load_entry(): unable to load entry
-                major(08): Meta data cache layer
-                minor(40): Unable to load metadata into cache
-              #008: ../../hdf5_v1.6/src/H5Ocache.c line 332 in H5O_load(): corrupt object header - too few messages
-                major(12): Object header layer
-                minor(40): Unable to load metadata into cache
-
-            Specifically, "corrupt object header" is the best string to search
-            for in the HDF5 error stack output.
-
-            If your files have been affected by this bug, or you are concerned
-            that your files might have been, please contact the HDF Helpdesk
-            at help@hdfgroup.org for a tool to detect and repair files
-            affected by this problem.  QAK - 2006/6/16
-        - Fixed various problems with retrieving names of objects, especially
-            with mounted files.  QAK - 2005/12/25
-        - Fixed core dump when closing root groups opened through two different
-            file handles that operate on the same actual file.  QAK - 2005/10/02
-        - Corrected errors when performing various operations on a group opened
-            by dereferencing an object reference.  QAK - 2005/07/30
-        - Fixed a bug with named datatypes where a copy of a named datatype
-            used to create a dataset would accidentally use the original
-            named datatype for the dataset's datatype.  QAK - 2005/07/23
-        - Made H5Fget_name() be consistent and always return name of actual
-            file the ID is in.  (Instead of the name of the top file in a
-            file mounting hierarchy).  QAK - 2005/07/19
-        - Reworked internal file mounting semantics to hopefully eliminate
-            mounting problems.  We now require that files that are mounting
-            together all have the same "file close degree".  QAK - 2005/07/19
-        - More bug fixes on holding open files that are mounted and have
-            IDs open.  QAK - 2005/07/14
-        - Don't unmount child files until the parent file actually closes.
-            (Previously, if an object is holding open a file, the child files
-            would get unmounted too early).  QAK - 2005/07/05
-        - Fixed bug where unmounted files could cause the library to go into
-            an infinite loop when shutting down.  QAK - 2005/06/30
-        - The library didn't save the information of family driver in file.
-          The original file member size was lost after file was closed (see
-          bug #213).  This has been fixed by saving driver name and member
-          file size in the superblock.  SLU - 2005/6/24
-        - Fixed bug with hyperslab selections that use selection offsets and
-            operate on chunked datasets going into infinite loop or dumping
-            core.  QAK - 2005/06/17
-        - Corrected memory leak and possible corruption when opening a group.
-            QAK - 2005/06/17
-        - Added check for opaque datatype tags being too long (check against
-            H5T_OPAQUE_TAG_MAX, currently set to 256).  QAK - 2005/06/14
-        - Fixed various errors in maintaining names for open objects in the
-            face of unusual mount & unmount operations.  QAK - 2005/06/08
-        - "SEMI" and "STRONG" file close degree settings now apply only to the
-            particular file ID being closed, instead of operating on all open
-            file IDs for a given file.  QAK - 2005/06/01
-        - For family driver, the library didn't save member size in file.
-          When file is reopened, the size of 1st member file determine the 
-          member size.  Now member size is saved in file and is used to 
-          define member file size.  Wrong file access property of member size
-          will result in a failure.  Using any other driver except family 
-          will cause library to return error.  So is multi driver. SLU - 
-          2005/05/24  
-        - Fixed error in opening object in group that was opened in mounted
-          file which has been unmounted.  QAK - 2005/03/17
-        - Fixed a racing condition in MPIPOSIX virtual file drive close
-	  function.  Now all processes must completed the close before any
-	  of them is returned.  This prevents some "faster" processes start
-	  accessing the file for another purpose (e.g., open with truncate)
-	  while other "slower" processes have not closed the same file with
-	  the previous purpose.  AKC - 2005/03/01
-        - H5Tget_member_value calls for enum datatype didn't return correct 
-            value if H5Tenum_valueof was called first.  It's fixed.  SLU - 
-            2005/02/08
-        - For variable-length string, H5Tget_class returned H5T_STRING as its
-            class.  But H5Tdetect_class and H5Tget_member_class considered it
-            as H5T_VLEN.  This is fixed to let all these 3 functions treat it
-            as H5T_STRING.  SLU - 2005/02/08
-        - The byte order of 1-byte integer types was fixed as little endian
-            even on a big-endian machine.  This has been corrected.  SLU -
-            2005/02/07 
-        - Fix segmentation fault when calling H5Fflush with an attribute that
-            hasn't had a value written to it open.  QAK - 2004/10/18
-        - Back up supporting bitfield and time types in H5Tget_native_type.  
-            Leave it to future support.  The function simply returns error 
-            message of "not support" for bitfield and time types.  
-            SLU - 2004/10/5
-        - Fixed address check in Core VFL driver to avoid spurious address/size
-            overflows for odd valued addresses and/or sizes.  QAK - 2004/09/27
-	- Fixed parallel bug in which some processes attempted collective
-	    I/O while others did independent I/O.  Bug appeared when some
-	    processes used point selections, and others didn't.  JRM - 2004/9/15
-        - Corrected error where dataset region references were written in an
-            incorrect way on Cray machines.  PVN & QAK - 2004/09/13
-        - The H5Tget_native_type now determines the native type for integers 
-	    based on the precision. This is to avoid cases of wrongly converting 
-            an int to a short in machines that have a short of 8 bytes but with 
-	    32bit precision (e.g Cray SV1). PVN - 2004/09/07  
-        - Changed H5Dread() to not overwrite data in an application's buffer
-            with garbage when accessing a chunked dataset with an undefined
-            fill value and an unwritten chunk is uncountered.  QAK - 2004/08/25
-        - Fixed error which could cause a core dump when a type conversion
-            routine was registered after a compound datatype had been
-            converted and then an equivalment compound datatype was converted
-            again.  QAK - 2004/08/07
-        - Fixed memory overwrite when encoding "multi" file driver information
-            for file's superblock.  QAK - 2004/08/05
-        - Fixed obscure bug where a filter which failed during chunk allocation
-            could allow library to write uncompressed data to disk but think
-            the data was compressed.  QAK - 2004/07/29
-        - Fixed bug where I/O to an extendible chunked dataset with zero-sized
-            dimensions would cause library to fail an assertion.
-            QAK - 2004/07/27
-        - Fixed bug where chunked datasets which have filters defined,
-            allocation time set to "late" and whose chunks don't align with
-            the dataspace bounds could have incorrect data stored when
-            overwriting the entire dataset on the first write.  QAK - 2004/07/27
-        - Added check to ensure that dataspaces have extents set. JML-2004/07/26
-        - Fixed bug on some Solaris systems where HDF5 would try to use
-            gettimeofday() when that function didn't work properly.
-            JML - 2004/07/23
-        - Fixed bug in H5Sset_extent_simple where setting maximum size to
-            non-zero, then to zero would cause an error.  JML - 2004/07/20
-        - Allow NULL pointer for buffer parameter to H5Dread & H5Dwrite
-            when not writing data ("none" selection or hyperslab or point
-            selection with no elements defined).  QAK - 2004/07/20
-        - Calling H5Gcreate() on "/" or "." throws an error instead of
-            failing quietly. JML - 2004/07/19
-        - Fixed bug where setting file address size to be very small could
-            trigger an assert if the file grew to more than 64 KB.  Now throws
-            an error and data can be recovered. JL/NF - 2004/07/14
-        - Fixed bug where "resurrecting" a dataset was failing.
-            QAK - 2004/07/14
-        - Fixed bug where incorrect data could be read from a chunked dataset
-            after it was extended.  QAK - 2004/07/12
-        - Fixed failure to read data back from file of compound type with
-            variable-length string as field.  SLU - 2004/06/10
-        - Fixed potential file corruption bug when a block of metadata could
-            overlap the end of the internal metadata accumulator buffer and
-            the buffer would be extended correctly, but would incorrectly 
-            change it's starting address.  QAK - 2004/06/09
-        - Opaque datatype with no tag failed for some operations.  Fixed.
-            SLU - 2004/6/3 
-        - Fixed potential file corruption bug where dimensions that were
-            too large (a value greater than could be represented in 32-bits)
-            could cause the incorrect amount of space to be allocated in a
-            file for the raw data for the dataset.  QAK - 2004/06/01
-	- Fixed dtypes "sw long double -> double" failure in QSC class
-            machines.  AKC - 2004/4/16
-        - Fixed problem with fletcher32 filter when converting data of different
-	    endianess. PVN - 2004/03/10
-        - Fixed problem with H5Tget_native_type() not handling opaque fields
-            correctly.  QAK - 2004/01/31
-        - Fixed several errors in B-tree deletion code which could cause a
-            B-tree (used with groups and chunked datasets) to become corrupt
-            with the right sequence of deleted objects.  QAK - 2004/01/19
-        - Fixed small internal memory leaks of fill-value information.
-            QAK - 2004/01/13
-        - Fixed bug that caused variable-length datatypes (strings or sequences)
-            used for datasets in files with objects that were unlinked to
-            fail to be read/written to a file.  QAK - 2004/01/13
-        - Detect situation where szip 'pixels per block' is larger than the
-            fastest changing dimension of a dataset's chunk size and disallow
-            this (due to limits in szip library).  QAK - 2003/12/31
-        - Fixed bug with flattened hyperslab selections that would generate
-            incorrect hyperslab information with certain high-dimensionality
-            combinations of start/stride/count/block information.
-            QAK - 2003/12/31
-        - Fixed bug with variable-length datatypes used in compound datatypes.
-            SLU - 2003/12/29
-        - Fixed bug in parallel I/O routines that would cause reads from
-            "short datasets" (datasets which were only partially written out)
-            to return invalid data.  QAK & AKC - 2003/12/19
-        - Fixed bug where scalar dataspaces for attributes were reporting as
-            simple dataspaces.  QAK - 2003/12/13
-        - Fixed problem with selection offsets of hyperslab selections in
-            chunked datasets causing the library to go into an infinite loop.
-            QAK - 2003/12/13
-        - Fixed H5Giterate to avoid re-using index parameter after iteration
-            callback has been called (allows iteration callback to modify the
-            index parameter itself).  QAK - 2003/12/06
-        - Fixed various floating-point conversion problems, including a
-            change which could corrupt data when converting from double->float.
-            QAK - 2003/11/24
-        - Changed "single process" metadata writing in library to collective
-            I/O by all processes, in order to guarantee correct data being
-            written with MPI-I/O.  QAK - 2003/11/20
-        - Fixed problems with fill values and variable-length types and also
-            I/O on VL values that were set to NULL.  QAK - 2003/11/08
-        - Fixed problems with MPI datatypes that caused ASCI Q machine to
-            hang.  QAK - 2003/10/28
-        - Removed HDF5_MPI_PREFER_DERIVED_TYPES environment variable support,
-            since it had no benefit.  QAK - 2003/10/28
-        - Single hyperslab selections (which were set with only one call to
-            H5Sselect_hyperslab) that had dimensions that could be "flattened"
-            but were interspersed with dimensions that could not be flattened
-            were not correctly handled, causing core dumps.  QAK - 2003/10/25
-        - Fixed incorrect datatype of the third parameter to the Fortran90
-            h5pset(get)_cache_f subroutine (INTEGER to INTEGER(SIZE_T)) 
-            EIP - 2003/10/13
-        - Fixed problems with accessing variable-length data datatypes on
-            Crays.  QAK - 2003/10/10
-        - Fixed potential file corruption bug when too many object header
-            messages (probably attributes, from a user perspective) were
-            inserted into an object header and certain other conditions were
-            met.  QAK - 2003/10/08
-        - Changed implementation of internal ID searching algorithm to avoid
-            O(n) behavior for many common cases.  QAK - 2003/10/06
-        - Allow partial parallel writing to compact datasets.  QAK - 2003/10/06
-        - Correctly create reference to shared datatype in attribute, instead
-            of making a copy of the shared datatype in the attribute.
-            QAK - 2003/10/01
-        - Revert changes which caused files >2GB to fail when created with
-            MPI-I/O file driver on certain platforms.  QAK - 2003/09/16
-        - Allow compound datatypes to grow in size.  SLU - 2003/09/10
-        - Detect if a type is already packed before attempting to pack it
-            again or check if it is locked.  SLU - 2003/09/10
-        - Corrected bug when opening a file twice with read-only permission
-            for one open and then closing the read-only access file ID would
-            generate an error.  QAK - 2003/09/10
-        - Corrected bug in repeated calls to H5Pget_access_plist() which would
-            incorrectly manage reference counts of internal information and
-            eventually blow up.  QAK - 2003/09/02
-        - Return rank of the array datatype on successful call to
-            H5Tget_array_dims().  QAK - 2003/08/30
-        - Corrected bug in H5Tdetect_class which was not correctly detecting
-            datatype classes of fields in nested compound datatypes in some
-            circumstances.  QAK - 2003/08/30
-        - Corrected bug in sieve buffer code which could cause loss of data
-            when a small dataset was created and deleted in quick succession.
-            QAK - 2003/08/27
-        - Corrected bug in H5Gget_objname_by_idx which was not allowing NULL
-            for the name when just querying for the object name's length.
-            QAK - 2003/08/25
-        - Corrected bug in variable-length string handling which could
-            generate a core dump on writing variable-length strings as part
-            of a compound datatype on certain architectures.  QAK - 2003/08/25
-        - Corrected bug in H5Tget_native_type which would incorrectly compute
-            the size of certain compound datatypes and also incorrectly
-            compute the offset of the last field for those compound datatypes.
-            QAK - 2003/08/25
-        - Corrected bug in H5Tget_native_type which would drop string datatype
-            metadata (padding, etc.)  QAK - 2003/08/25
-        - Corrected bugs in H5Gget_num_objs, H5Gget_objname_by_idx and
-            H5Gget_objtype_by_idx to allow them to accept location IDs, not just
-            group IDs.  QAK - 2003/08/21
-        - Corrected bug when using scalar dataspace for memory selection and
-            operating on chunked dataset.  QAK - 2003/08/18
-        - Corrected bugs with multiple '/' characters in names for H5Glink
-            and H5Gunlink.  QAK - 2003/08/16
-        - Corrected bug with user blocks that didn't allow a user block to
-            be inserted in front of a file after the file was created.
-            QAK - 2003/08/13
-        - Corrected errors with using point selections to access data in
-            chunked datasets.  QAK - 2003/07/23
-        - Corrected error with variable-length datatypes and chunked datasets
-            caused H5Dwrite to fail sometimes.  QAK - 2003/07/19
-        - Modified library and file format to support storing indexed storage
-            (chunked dataset) B-tree's with non-default internal 'K' values.
-            QAK - 2003/07/15
-        - Returned H5T_BKG_TEMP support to library after it was accidentally
-            removed.  QAK - 2003/07/14
-
-    Configuration
-    -------------
-	- Configure can now use any tr command.  No more need for
-	  defining variable TR nor is it supported. -AKC 2006/05/19
-        - Parallel I/O with the MPI-I/O driver will no longer work if the
-            filesystem is not POSIX compliant.  The "HDF5_MPI_1_METAWRITE"
-            environment variable has been removed.  QAK - 2004/01/30
-        - Fixed the error that cause "make install" to fail because of the
-            macro definition syntax of "prefix?=..."  AKC - 2003/07/22
-
-    Performance
-    -------------
-        - Optimized I/O for enumerated datatypes that are a superset of source
-            enumerated datatype.  QAK - 2005/03/19
-        - More optimizations to inner loops of datatype conversions for
-            integers and floats which give a 10-50% speedup.  QAK - 2003/11/07
-        - Hoisted invariant 'if/else's out of inner datatype conversion loop for
-            integer and floating-point values, giving about a 20% speedup.
-            QAK - 2003/10/20
-
-    Tools
-    -----
-        - Fixed h5dump regarding the display of blocks in hyperslab
-           selections. PVN 2008/01/16
-        - Fixed h5diff regarding the display of NaN (Not a Number)
-           values. PVN 2008/01/16
-	- Fixed h5dump regarding the parsing of binary output parameters. 
-           PVN 2008/01/16
-	- Fixed memory problems in h52gif and gif2h5. PVN 2008/01/16
-	- Fixed h5repack dealing with NULL references. PVN 2008/01/16 
-        - Fixed h5dump & h5ls to display attributes in "name" order, rather
-           than the order they are encountered in the object header.
-           QAK - 2007/10/04
-        - Fixed h5dump regarding the display of named datatypes
-           attributes. PVN 2007/03/13
-        - Fixed h5dump regarding the display of group comments. PVN
-           2007/03/13
-        - Fixed h5dump regarding the display of hardlinks pointing 
-           to the root group. PVN 2007/03/13
-        - Fixed h5diff percentage option -p. PVN 2007/03/05
-        - Fixed h5dump that caused array indices greater than 2 ^32-1
-           not to be printed correctly - PVN 2007/2/19
-        - Fixed h5dump to print attributes data in ASCII if -r option is used.
-	    AKC - 2004/11/18
-        - Fixed space utilization reported in h5ls to correct error in formula
-            used.  QAK - 2004/10/22
-        - Fixed h5redeploy which sometimes complain too many argument for the
-            test command. (The complain did not hinder the h5redploy to
-            proceed correctly.) AKC - 2003/11/03
-        - Fixed a segmentation fault of h5diff when percentage option is used.
-            AKC - 2003/08/27
-        - Switched away from tools using internal "fixtype" function(s) to use
-            H5Tget_native_type() internally.  QAK - 2003/08/25
-
-
-    Documentation 
-    ------------- 
-
-
-    F90 APIs
-    --------
-        - h5pget_driver_f was returning information that could not be
-          interpreted by fortran application program; fixed. EIP - 2005/04/10 
-
-
-Platforms Tested
-================
-Platforms marked with * were not tested for hdf5-1.8.0-rc* release
-(This information is somewhat out of date and may be inaccurate.  It will be
-    updated for a later release)
-
-*   AIX 5.2 (32/64 bit)           xlc 8.0.0.11
-                                  xlC 8.0
-                                  xlf 10.01.0000.0 
-                                  mpcc_r 6.0.0.8
-                                  mpxlf_r 8.1.1.7
-*    AIX 5.3 (32/64 bit)           xlc 7.0.0.8
-                                  xlC 7.0.0.8
-                                  xlf  09.01.0000.0007
-*   Cray X1 water 3.0.35          Cray Standard C Version 5.4.0.7.4
-                                  Cray Fortran 5.4.0.7.3
-                                  Cray C++ 5.4.0.7.4
-    FreeBSD 6.2-STABLE i386       gcc 3.4.6 [FreeBSD] 20060305
-    (duty)                        g++ 3.4.6 [FreeBSD] 20060305
-                                  gcc 4.2.1 20080123
-                                  g++ 4.2.1 20080123
-                                  gfortran 4.2.1 20070620
-    FreeBSD 6.2-STABLE amd64      gcc 3.4.6 [FreeBSD] 20060305
-    (liberty)                     g++ 3.4.6 [FreeBSD] 20060305
-                                  gcc 4.2.1 20080123
-                                  g++ 4.2.1 20080123
-                                  gfortran 4.2.1 20080123
-
-*   HP-UX B.11.23                 HP aC++/ANSI C B3910B A.06.00
-                                  HP F90 v2.9.2
-                                  HP aC++/ANSI C B3910B A.06.00
-    IRIX64 6.5 (64 & n32)         MIPSpro cc 7.4.4m
-                                  F90 MIPSpro 7.4.4m 
-                                  C++ MIPSpro cc 7.4.4m
-				 
-*   Linux 2.6.9 (RHEL4)           Intel 10.0 compilers
-    (abe.ncsa.uiuc.edu)
-    Linux 2.4.21-47               gcc 3.2.3 20030502
-    (osage)
-    Linux 2.6.9-42.0.10           gcc 3.4.6 20060404
-    (kagiso)                      PGI 7.0-7 (pgcc, pgf90, pgCC)
-                                  Intel 9.1 (icc, ifort, icpc)
-    Linux 2.6.16.27 x86_64 AMD    gcc 4.1.0 (SuSE Linux), g++ 4.1.0, g95 (GCC 4.0.3)
-    (smirom)                      PGI 6.2-5 (pgcc, pgf90, pgCC)
-                         	  Intel 9.1 (icc, iort, icpc)
-    Linux 2.6.5-7.252.1-rtgfx #1 
-          SMP ia64                Intel(R) C++ Version 9.0
-    (cobalt)                      Intel(R) Fortran Itanium(R) Version 9.0 
-                                  SGI MPI
-    SunOS 5.8 32,46               Sun WorkShop 6 update 2 C 5.3
-     (Solaris 2.8)                Sun WorkShop 6 update 2 Fortran 95 6.2
-                                  Sun WorkShop 6 update 2 C++ 5.3
-*   SunOS 5.10 i86pc              Sun C 5.7
-                                  Sun Fortran 95 8.1
-                                  Sun C++ 5.7
-    SunOS 5.10                    cc: Sun C 5.8 
-    (linew)                       f90: Sun Fortran 95 8.2 
-                                  CC: Sun C++ 5.8 
-    Xeon Linux 2.4.21-32.0.1.ELsmp-perfctr-lustre
-    (tungsten)	                  gcc 3.2.2 20030222
-                                  Intel(R) C++ Version 9.0
-                                  Intel(R) Fortran Compiler Version 9.0
-    IA-64 Linux 2.4.21.SuSE_292.til1 ia64
-    (NCSA tg-login)               gcc 3.2.2
-                                  Intel(R) C++ Version 8.1
-                                  Intel(R) Fortran Compiler Version 8.1
-				  mpich-gm-1.2.5..10-intel-r2
-    Windows XP                    
-				  Visual Studio .NET
-                                  Visual Studio 2005 w/ Intel Fortran 9.1
-                                  Cygwin(native gcc compiler and g95)
-				  MinGW(native gcc compiler and g95)
-    Windows XP x64                
-			          Visual Studio 2005 w/ Intel Fortran 9.1
-    Windows Vista			
-			          Visual Studio 2005
-
-    MAC OS  10.4 (Intel)          gcc i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 
-                                  G95 (GCC 4.0.3 (g95 0.91!) Nov 21 2006)
-*    Alpha Open VMS 7.3
-
-
-Supported Configuration Features Summary
-(This table was not modified for 1.8.0-rc* release; for information contact help@hdfgroup.org)
-========================================
-
-    In the tables below
-          y   = tested and supported
-          n   = not supported or not tested in this release
-          x   = not working in this release
-          dna = does not apply
-          ( ) = footnote appears below second table
-          <blank> = testing incomplete on this feature or platform 
-
-Platform                 C        F90    F90      C++   zlib  SZIP
-                         parallel        parallel
-SunOS5.8 64-bit          n        y      n        y     y     y
-SunOS5.8 32-bit          n        y      n        y     y     y
-SunOS5.10 64-bit         y(1)     y      n        y     y     y
-SunOS5.10 32-bit         y(1)     y      n        y     y     y
-IRIX64_6.5 64-bit        n        y      y        y     y     y
-IRIX64_6.5 32-bit        n        n      n        n     y     y
-Cray XT3           (16)  n        n      n        n     n     n
-AIX-5.2 & 5.3 32-bit     y        y      y        y     y     y
-AIX-5.2 & 5.3 64-bit     y        y      y        y     y     y
-Windows XP               n        y(15)  n(15)    y     y     y
-Windows XP x64           n        y(15)  n(15)    y     y     y
-Windows Vista            n        n      n        y     y     y
-Mac OS X 10.4 PowerPC    n               n
-FreeBSD 4.11             n        n      n        y     y     y
-RedHat EL3  W       (3)  y(1a)    y(10)  y(1a)    y     y     y
-RedHat EL3  W Intel (3)  n        y      n        y     y     n
-RedHat EL3  W PGI   (3)  n        y      n        y     y     n
-SuSe x86_64 gcc  (3,12)  y(1a)    y(11)  n        y     y     y
-SuSe x86_64 Int  (3,12)  n        y(13)  n        y     y     n
-SuSe x86_64 PGI  (3,12)  n        y(8)   n        y     y     y
-Linux 2.4 Xeon C 
-    Lustre Intel  (3,6)  n        y      n        y     y     n
-Linux 2.6 SuSE ia64 C 
-    Intel         (3,7)  y        y      y        y     y     n
-Linux 2.6 SGI Altix 
-    ia64 Intel      (3)  y        y      y        y     y     y
-Alpha OpenVMS 7.3.2      n        y      n        y     n     n
-
-
-
-Platform                 Shared  Shared    Shared    static-  Thread-  
-                         C libs  F90 libs  C++ libs  exec     safe     
-Solaris2.8 64-bit        y       y         y         x        y        
-Solaris2.8 32-bit        y       y         y         x        y        
-Solaris2.10 64-bit       y                           x        y        
-Solaris2.10 32-bit       y                           x        y        
-IRIX64_6.5 64-bit        y       y         n         y        y        
-IRIX64_6.5 32-bit        y       dna       y         y        y        
-HPUX11.00                y       n         y         x        n        
-HPUX11.23-32bit          y       n         n         y        n        
-HPUX11.23-64bit          y       dna       n         y        n        
-Cray XT3           (16)  n       n         n         n        n        
-AIX-5.2 & 5.3 32-bit     n       n         n         y        n        
-AIX-5.2 & 5.3 64-bit     n       n         n         y        n        
-Windows XP               y       y(15)     y         y        y        
-Windows XP x64           y       y(15)     y         y        y        
-Windows Vista            y       n         n         y        y        
-Mac OS X 10.3            y                           y        n        
-Mac OS X 10.4 PowerPC
-FreeBSD 4.11             y       n         y         y        y        
-RedHat EL3  W       (3)  y       y(10)     y         y        y        
-RedHat EL3  W Intel (3)  y       y         y         y        n        
-RedHat EL3  W PGI   (3)  y       y         y         y        n        
-SuSe x86_64 W GNU (3,12) y       y         y         y        y        
-SuSe x86_64 W Int (3,12) y       y         y         y(14)    n        
-SuSe x86_64 W PGI (3,12) y       y         y         y(14)    n        
-Linux 2.4 Xeon C 
-    Lustre Intel    (6)  y       y         y         y        n        
-Linux 2.4 SuSE 
-    ia64 C Intel    (7)  y       y         y         y        n        
-Linux 2.4 SGI Altix 
-    ia64 Intel           y                           y        n        
-Alpha OpenVMS 7.3.2      n       n         n         y        n        
-
-    Notes: (1)  Using mpich 1.2.6.
-           (1a) Using mpich2 1.0.6.
-           (2)  Using mpt and mpich 1.2.6.
-           (3)  Linux 2.6 with GNU, Intel, and PGI compilers, as indicated.  
-                  W or C indicates workstation or cluster, respectively.
-
-           (6)  Linux 2.4.21-32.0.1.  Xeon cluster with ELsmp_perfctr_lustre 
-                  and Intel compilers
-           (7)  Linux 2.4.21, SuSE_292.till.  Ia64 cluster with Intel compilers
-           (8)  pgf90
-           (9)  With Compaq Visual Fortran 6.6c compiler.
-           (10) With PGI and Absoft compilers.
-           (11) PGI and Intel compilers for both C and Fortran
-           (12) AMD Opteron x86_64
-           (13) ifort
-           (14) Yes with C and Fortran, but not with C++
-	   (15) Using Visual Studio 2005 or Cygwin
-           (16) Not tested for this release.
-    Compiler versions for each platform are listed in the preceding
-    "Platforms Tested" table.
-
-
-
-Known Problems
-==============
-* We discovered two problems when running collective IO parallel HDF5 tests 
-  with chunking storage on  ChaMPIon MPI compiler on tungsten, a linux 
-  cluster at NCSA.
-  Under some complex selection cases, 
-  1) MPI_Get_element returns the wrong value.
-  2) MPI_Type_struct also generates wrong derived data type and corrupt data
-     may be generated.
-  This only happens when turning on collective IO with chunking storage 
-  with some complex selections. We haven't found these problems on other
-  MPI-IO compilers. If you encounter these problems, you may use Independent IO
-  instead.
-
-  Change the following line in your code:
-  H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_COLLECTIVE);
-
-  to
-  H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_INDEPENDENT);
-
-  KY - 2007/08/24
-
-* For SNL, spirit/liberty/thunderbird: The serial tests pass but parallel
-  tests failed with MPI-IO file locking message. AKC - 2007/6/25.
-* On Intel 64 Linux cluster (RH 4, Linux 2.6.9) with Intel 10.0 compilers use
-  -mp -O1 compilation flags to build the libraries. Higher level of optimization 
-  causes failures in several HDF5 library tests. 
-* For HPUX 11.23 many tools tests failed for 64-bit version when linked to the
-  shared libraries (tested for 1.8.0-beta2)
-* For SNL, Red Storm: only paralle HDF5 is supported.  The serial tests pass
-  and the parallel tests also pass with lots of non-fatal error messages.
-* For LLNL, uP: both serial and parallel pass.  Zeus: serial passes but
-  parallel fails with a known proglem in MPI.  ubgl: serial passes but
-  parallel fails. 
-* on SUN 5.10 C++ test fails in the "Testing Shared Datatypes with Attributes" test 
-* configuring with --enable-debug=all produces compiler errors on most
-  platforms.  Users who want to run HDF5 in debug mode should use
-  --enable-debug rather than --enable-debug=all to enable debugging
-  information on most modules.
-* On Mac OS 10.4, test/dt_arith.c has some errors in conversion from long
-  double to (unsigned) long long and from (unsigned)long long to long double. 
-* On Altix SGI with Intel 9.0 testmeta.c would not compile with -O3
-  optimization flag.
-* On VAX, Scaleoffset filter isn't supported. The filter cannot be applied to
-  HDF5 data generated on VAX. Scaleoffset filter only supports IEEE standard
-  for floating-point data.
-* On Cray X1, a lone colon on the command line of h5dump --xml (as in
-  the testh5dumpxml.sh script) is misinterpereted by the operating system
-  and causes an error.
-* On mpich 1.2.5 and 1.2.6, we found that if more than two processes
-  contribute no IO and the application asks to do IO with collective, we found
-  that when using 4 processors, a simple collective write will be hung
-  sometimes. This can be verified with t_mpi test under testpar.
-* On IRIX6.5, when C compiler version >7.4, the complicate MPI derived data type
-  code will work. However, the user should be aware to enlarge MPI_TYPE_MAX environment 
-  variable to some certian value in order to use collective irregular selection code.
-  For example, the current parallel HDF5 test needs to enlarge MPI_TYPE_MAX to 
-  200,000 to make the test pass.
-* The dataset created or rewritten with the v1.6.3 library or after can't 
-  be read with the v1.6.2 library or before when Fletcher32 EDC(filter) is 
-  enabled.  There was a bug in the calculating code of the Fletcher32 
-  checksum in the library before v1.6.3.  The checksum value wasn't consistent 
-  between big-endian and little-endian systems.  This bug was fixed in 
-  Release 1.6.3.  However, after fixing the bug, the checksum value is no 
-  longer the same as before on little-endian system.  The library release 
-  after 1.6.4 can still read the dataset created or rewritten with the library
-  of v1.6.2 or before.  SLU - 2005/6/30
-* For the version 6(6.02 and 6.04) of Portland Group compiler on AMD Opteron
-  processor, there's a bug in the compiler for optimization(-O2).  The library
-  failed in several tests but all related to multi driver.  The problem has 
-  been reported to the vendor.  
-* On IBM AIX systems, parallel HDF5 mode will fail some tests with error
-  messages like "INFO: 0031-XXX ...".  This is from the command poe.
-  Set the environment variable MP_INFOLEVEL to 0 to minimize the messages
-  and run the tests again.
-  The tests may fail with messages like "The socket name is already
-  in use".  HDF5 does not use sockets (except for stream-VFD).  This is
-  due to problems of the poe command trying to set up the debug socket.
-  Check if there are many old /tmp/s.pedb.* staying around.  These are
-  sockets used by the poe command and left behind due to failed commands.
-  Ask your system administrator to clean them out.  Lastly, request IBM
-  to provide a mean to run poe without the debug socket.
-
-* The C++ library's tests fails when compiling with PGI C++ compiler.  The
-  workaround until the problem is correctly handled is to use the 
-  flag "--instantiate=local" prior to the configure and build steps, as:
-        setenv CXX "pgCC --instantiate=local"  for pgCC 5.02 and higher
-
-
-* The stream-vfd test uses ip port 10007 for testing. If another
-  application is already using that port address, the test will hang
-  indefinitely and has to be terminated by the kill command. To try the
-  test again, change the port address in test/stream_test.c to one not
-  being used in the host.
-
-* The --enable-static-exec configure flag fails to compile for Solaris
-  platforms. This is due to the fact that not all of the system
-  libraries on Solaris are available in a static format.
-
-  The --enable-static-exec configure flag also fails to correctly compile
-  on IBM SP2 platform for the serial mode. The parallel mode works fine
-  with this option.
-  
-  It is suggested that you don't use this option on these platforms
-  during configuration.
-
-* With the gcc 2.95.2 compiler, HDF 5 uses the `-ansi' flag during
-  compilation. The ANSI version of the compiler complains about not being
-  able to handle the `long long' datatype with the warning:
-
-        warning: ANSI C does not support `long long'
-  
-  This warning is innocuous and can be safely ignored.
-
-
-* The Stream VFD was not tested yet under Windows. It is not supported
-  in the TFLOPS machine.
-
-
-* The ./dsets tests failed in the TFLOPS machine if the test program,
-  dsets.c, is compiled with the -O option.  The hdf5 library still works
-  correctly with the -O option.  The test program works fine if it is
-  compiled with -O1 or -O0.  Only -O (same as -O2) causes the test
-  program to fail.
-
-* Certain platforms give false negatives when testing h5ls:
-    - Cray J90 and Cray T90IEEE give errors during testing when displaying
-      some floating-point values. These are benign differences due to
-      the different precision in the values displayed and h5ls appears to
-      be dumping floating-point numbers correctly.
-
-* Before building HDF5 F90 Library from source on Crays 
-  replace H5Aff.f90, H5Dff.f90 and H5Pff.f90 files in the fortran/src
-  subdirectory in the top level directory with the Cray-specific files
-  from this site:
-       ftp://www.hdfgroup.uiuc.edu/pub/outgoing/hdf5/hdf5-1.8.0-pre/PATCH/
-
-* Not all platforms behave correctly with szip's shared libraries. Szip is
-  disabled in these cases, and a message is relayed at configure time. Static
-  libraries should be working on all systems that support szip, and should be
-  used when shared libraries are unavailable. There is also a configure error
-  on Altix machines that incorrectly reports when a version of szip without
-  an encoder is being used.
-
-* On some platforms that use Intel and Absoft compilers to build HDF5 fortran library,
-  compilation may fail for fortranlib_test.f90, fflush1.f90 and fflush2.f90
-  complaining about exit subroutine. Comment out the line 
-  IF (total_error .ne. 0) CALL exit (total_error)
-
-* On IA32 and IA64 systems, if you use a compiler other than GCC (such as
-  Intel's ecc or icc compilers), you will need to modify the generated
-  "libtool" program after configuration is finished. On or around line 104 of
-  the libtool file, there are lines which look like:
-
-      # How to pass a linker flag through the compiler.
-      wl=""
-
-  change these lines to this:
-
-      # How to pass a linker flag through the compiler.
-      wl="-Wl,"
-
-  UPDATE: This is now done automatically by the configure script. However, if
-  you still experience a problem, you may want to check this line in the
-  libtool file and make sure that it has the correct value.
-
-* Information about building with PGI and Intel compilers is available in
-  INSTALL file sections 5.7 and 5.8
-
-* On at least one system, (SDSC DataStar), the scheduler (in this case
-  LoadLeveler) sends job status updates to standard error when you run 
-  any executable that was compiled with the parallel compilers.
-
-  This causes problems when running "make check" on parallel builds, as 
-  many of the tool tests function by saving the output from test runs,
-  and comparing it to an exemplar.  
-
-  The best solution is to reconfigure the target system so it no longer
-  inserts the extra text.  However, this may not be practical.
-
-  In such cases, one solution is to "setenv HDF5_Make_Ignore yes" prior to 
-  the configure and build.  This will cause "make check" to continue after 
-  detecting errors in the tool tests.  However, in the case of SDSC DataStar,
-  it also leaves you with some 150 "failed" tests to examine by hand.
-
-  A second solution is to write a script to run serial tests and filter
-  out the text added by the scheduler.  A sample script used on SDSC
-  DataStar is given below, but you will probably have to customize it 
-  for your installation.  
-
-  Observe that the basic idea is to insert the script as the first item 
-  on the command line which executes the the test.  The script then 
-  executes the test and filters out the offending text before passing
-  it on.
-
-        #!/bin/csh
-
-        set STDOUT_FILE=~/bin/serial_filter.stdout
-        set STDERR_FILE=~/bin/serial_filter.stderr
-
-        rm -f $STDOUT_FILE $STDERR_FILE
-
-        ($* > $STDOUT_FILE) >& $STDERR_FILE
-
-	set RETURN_VALUE=$status
-
-        cat $STDOUT_FILE
-
-        tail +3 $STDERR_FILE
-
-	exit $RETURN_VALUE
-
-  You get the HDF make files and test scipts to execute your filter script
-  by setting the environment variable "RUNSERIAL" to the full path of the 
-  script prior to running configure for parallel builds.  Remember to 
-  "unsetenv RUNSERIAL" before running configure for a serial build.
-
-  Note that the RUNSERIAL environment variable exists so that we can 
-  can prefix serial runs as necessary on the target system.  On DataStar,
-  no prefix is necessary.  However on an MPICH system, the prefix might
-  have to be set to something like "/usr/local/mpi/bin/mpirun -np 1" to
-  get the serial tests to run at all.
-
-  In such cases, you will have to include the regular prefix in your
-  filter script.
-
-* H5Ocopy() does not copy reg_ref attributes correctly when shared-message
-  is turn on. The value of the reference in the destination attriubte is
-  wrong. This H5Ocopy problem will affect h5copy tool
-
-%%%%1.6.7%%%%   Release Information for hdf5-1.6.7 (31/January/08)
-
-HDF5 version 1.6.7 released on Thu Jan 31 21:09:10 CST 2008
-================================================================================
-
-INTRODUCTION
-============
-This document describes the differences between HDF5-1.6.6 and HDF5-1.6.7  
-It contains information on the platforms tested and known problems in
-HDF5-1.6.7. For more details, check the HISTORY.txt file in the HDF5 source.
-
-HDF5 documentation can be found in the distributed release source code
-in the subdirectory doc/html/ or on the THG (The HDF Group) FTP server: 
-
-     ftp://ftp.hdfgroup.org/HDF5/docs/
-
-Documentation for the current release in the HDF5 Release 1.6.x series is 
-also on the HDF web site:
-
-     http://hdfgroup.org/HDF5/doc1.6/
-
-For more information, see the HDF5 home page:
-
-     http://hdfgroup.org/products/hdf5/
-
-If you have any questions or comments, please see the HDF Support page
-for a list of available resources:
-
-     http://hdfgroup.org/services/support.html
-
-
-CONTENTS
-========
-- New Features
-- Support for New Platforms, Languages and Compilers
-- Bug Fixes since HDF5-1.6.6
-- Documentation
-- Platforms Tested
-- Supported Configuration Features Summary
-- Known Problems
-
-
-New Features
-============
-    Configuration:
-    -------------------------
-    '--enable-stream-vfd' and '--disable-stream-vfd' are no longer valid 
-    configure options because the stream I/O driver has ben removed from
-    the distribution.
-
-    Source code distribution
-    ========================
-    Library:
-    --------
-    The stream I/O driver is not included with the HDF5 Library in this
-    release.  The source code files hdf5/src/H5FDstream.c and
-    hdf5/src/H5FDstream.h and the driver ENUM value H5FD_STREAM have been 
-    removed.
-
-    Parallel Library:
-    -----------------
-    None      
-
-    Tools:
-    ------
-    None
-
-    F90 API:
-    --------
-    None
-
-    C++ API:
-    --------
-    None
-
-
-Support for New Platforms, Languages and Compilers
-==================================================
-
-No new platorms, languages, or compilers are supported in this release.
-
-
-Bug Fixes since HDF5-1.6.6 Release
-==================================
-
-    Library
-    -------
-        - H5Iget_name could not be used with an object identifier returned  
-            by H5Rdereference; the function would not be able to determine 
-            a valid object name.  It has been fixed.  SLU - 2008/1/30 
-        - Changed library's behavior for reading files that might have
-            corrupted object header information from a previous (buggy)
-            version of the library.  By default, the library now rebuilds the
-            correct object header information instead of issuing an error.
-            Previous "strict" file format interpretation can be enabled with
-            the "--enable-strict-format-checks" configure option.
-            QAK - 2008/01/13
-        - Fixed bug in H5Epush() which was clearing the error stack before
-            pushing new error value.  QAK - 2007/08/23
-        - Fixed bug in H5Ewalk() which was not passing back the return value
-            from error stack walking callback.  QAK - 2007/08/23
-
-
-    Configuration
-    -------------
-     None
-
-
-    Performance
-    -------------
-     None
-   
-
-    Tools
-    -----
-     None
-
-
-    Documentation 
-    ------------- 
-     None
-
-
-    F90 API
-    -------
-     None
-
-                                
-    C++ API
-    -------
-     None
-
-
-Documentation
-=============
-    HDF5 documentation can be found in the distributed release source 
-    code in the subdirectory doc/html/ (start with index.html) or on the 
-    THG (The HDF Group) FTP server: 
-
-         ftp://ftp.hdfgroup.org/HDF5/docs/
-
-    Online documentation for the current release in the HDF5 Release 1.6.x 
-    series can be found on the THG web site:
-
-         http://hdfgroup.org/HDF5/doc1.6/
-
-    A listing of interface changes from release to release can be found
-    in the document "HDF5 Software Changes from Release to Release":
-
-         http://hdfgroup.org/HDF5/doc1.6/ADGuide/Changes.html
- 
-    Since the stream I/O driver is not included in this release, the 
-    functions H5Pset_fapl_stream and H5Pget_fapl_stream and the stream 
-    ENUM value H5FD_STREAM have been removed from the documentation.
-
-
-Platforms Tested
-================
-
-    AIX 5.2 (32/64 bit)           xlc 8.0.0.11
-    (datastar)                    xlC 8.0
-                                  xlf 10.01.0000.0002
-
-    FreeBSD 6.2 (32- and 64-bit)  gcc  and g++3.4.6
-    (duty and liberty)            gcc and g++ 4.2.1
-
-    IRIX64 6.5                    MIPSpro cc 7.4.4m
-    (ucar mop1 64 & n32)          F90 MIPSpro 7.4.4m (64 only)
-                                  C++ MIPSpro cc 7.4.4m
-
-    Linux 2.4.21-47.ELsmp #1 SMP  gcc 3.2.3
-        i686 i386 GNU/Linux
-    (osage)
-
-    Linux 2.6.9-42.0.10.ELsmp #1  gcc (GCC) 3.4.6
-         SMP i686 i386             G95 (GCC 4.0.3 (g95 0.91!) April 18 2007)
-    (kagiso)                      PGI C, Fortran, C++ 7.0-7 32-bit 
-                                  Intel(R) C Compiler for 32-bit 
-                                      applications, Version 9.1 
-                                  Intel(R) C++ Compiler for 32-bit 
-                                      applications, Version 9.1
-                                  Intel(R) Fortran Compiler for 32-bit 
-                                      applications, Version 9.1 
-                                  Absoft 32-bit Fortran 95 10.0.4
-                                  MPICH mpich2-1.0.6p1 compiled with  
-                                  gcc 4.2.1 and G95 (GCC 4.0.3 (g95 0.91!) 
-
-    Linux 2.6.16.46-0.12-debug #1 Intel(R) C++ Version 10.0.025
-        SMP ia64 GNU/Linux        Intel(R) Fortran Itanium(R) Version 10.0.025
-    (ucar hir1)                   
-
-    Linux 2.6.16.46-0.14-smp #1   Intel(R) C++ for Intel(R) EM64T Ver. 9.1.037
-        SMP x86_64 GNU/Linux      Intel(R) Fortran Intel(R) EM64T Ver. 9.1.031
-    (smirom)                      PGI C, Fortran, C++ Version 7.0-7
-                                         for 64-bit target on x86-64
-                                  tested for both 32- and 64-bit binaries
-
-    Linux 2.6.5-7.287.3-sn2 #1    Intel(R) C++ Version 9.0
-        Altix SMP ia64            Intel(R) Fortran Itanium(R) Version 9.0
-    (cobalt)                      SGI MPI
-
-    SunOS 5.8 32- and 64-bit      Sun WorkShop 6 update 2 C 5.3
-    (sol)                         Sun WorkShop 6 update 2 Fortran 95 6.2
-                                  Sun WorkShop 6 update 2 C++ 5.3
-
-    SunOS 5.10 32- and 64-bit     Sun WorkShop 6 update 2 C 5.8
-    (linew)                       Sun WorkShop 6 update 2 Fortran 95 8.2
-                                  Sun WorkShop 6 update 2 C++ 5.8
-                                  Patch 121019-06 
-
-    Xeon Linux 2.4.21-32.0.1.ELsmp-perfctr-lustre
-    (tungsten)                    Intel(R) C++ Version 9.0
-                                  Intel(R) Fortran Compiler Version 9.0
-                                  PGI C Version 6.0-5
-                                  PGI C++ Version 6.0-5
-                                  PGI Fortran Version 6.0-5
-                                  gcc (GCC) 3.2.2 (Red Hat Linux 3.2.2-5)
-
-    Xeon Linux 2.6.9-42.0.10.EL_lustre-1.4.10.1smp
-    (abe)                         Intel(R) C++ Version 10.0
-                                  Intel(R) Fortran Compiler Version 10.0
-                                  Open MPI 1.2.2
-
-    IA-64 Linux 2.4.21-309.tg1 #1 SMP
-        ia64                      gcc (GCC) 3.2.2
-    (NCSA tg-login)               Intel(R) C++ Version 8.1
-                                  Intel(R) Fortran Compiler Version 8.1
-                                  mpich-gm-1.2.6..14-intel-r2
-
-    Windows XP                    Visual Studio 6.0
-                                  Visual Studio .NET (with Intel Fortran 9.1)
-                                  Visual Studio 2005 (with Intel Fortran 9.1)
-                                  cygwin (gcc 3.4.4)
-
-    Windows Vista                 Visual studio 2005
-    MAC OS X Intel                Darwin 8.10.1
-                                  i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1
-                                  g95 0.91
-
-
-Supported Configuration Features Summary
-========================================
-
-Key:   y   = Tested and supported
-       n   = Not supported or not tested in this release
-       C   = Cluster
-       W   = Workstation
-       ( ) = Footnote appears below second table
-
-Platform                              C        F90  F90      C++  zlib  SZIP
-                                      parallel      parallel
-Solaris2.8 32-bit                     n        y    n        y    n     y
-Solaris2.8 64-bit                     n        y    n        n    y     y
-Solaris2.10 32-bit                    n        y    n        y    y     y
-Solaris2.10 64-bit                    n        y    n        n    y     y
-IRIX64_6.5 32-bit                     n        n    n        n    y     y
-IRIX64_6.5 64-bit                     n        y    n        n    y     y
-WinXP Visual Studio 6.0               n        n    n        y    y     y
-WinXP CYGWIN                          n        n    n        y    y     y
-WinXP 2005                            n        y    n        y    y     y
-WinXP .Net                            n        y    n        y    y     y
-WinVista 2005                         n        n    n        y    y     y
-Mac OS X 10.4.10                      n        y    n        y    y     y
-AIX-5.2 & 5.3 32- and 64-bit          y        y    y        y    y     y
-FreeBSD 6.2 32- and 64-bit            n        n    n        y    y     y
-RedHat Linux 2.4.21              W    n        n    n        n    y     n
-RedHat Linux 2.6.9-42 i686 GNU (1) W  y        y    y        y    y     y
-RedHat Linux 2.6.9-42 i686 Intel   W  n        y    n        y    y     n
-RedHat Linux 2.6.9-42 i686 PGI     W  n        y    n        y    y     n
-SuSE Linux 2.6.16 x86_64 GNU (1) W    y        y    n        y    y     y
-SuSE Linux 2.6.16 x86_64 Intel   W    n        y    n        y    y     n
-SuSE Linux 2.6.16 x86_64 PGI     W    n        y    n        y    y     n
-RHEL 4 Linux 2.6.9 Xeon Lustre   C    n        y    n        y    y     y
-RedHat Linux 2.4 Xeon Lustre     C    n        y    n        y    y     n
-SuSE Linux 2.4 ia64              C    y        y    y        y    y     y
-SuSe Linux 2.6.5 SGI Altix ia64       n        y    n        y    y     y
-
-
-Platform                              Shared        static-  Thread-  
-                                      libraries(4)  exec     safe     
-Solaris2.8 32- and 64-bit             y             n        y        
-Solaris2.10 32- and 64-bit            y             n        y        
-IRIX64_6.5 32-bit                     y             n        y        
-IRIX64_6.5 64-bit                     y             n        y        
-WinXP Visual Studio 6.0               y             n        n        
-WinXP CYGWIN                          y             n        n        
-WinXP 2005                            y             n        n        
-WinXP .Net                            y             n        n        
-WinVista 2005                         y             n        n        
-Mac OS X 10.4.10                      y             n        n        
-AIX-5.2 & 5.3 32- and 64-bit          n             n        n        
-FreeBSD 6.2 32- and 64-bit            y             n        n        
-RedHat Linux 2.4.21              W    y             n        n        
-SuSE Linux 2.6.9-42 i686 GNU (1) W    y             n        y        
-SuSE Linux 2.6.9-42 i686 Intel   W    y             n        n        
-SuSE Linux 2.6.9-42 i686 PGI     W    n             n        n        
-SuSE Linux 2.6.16 x86_64 GNU (1) W    y             n        y        
-SuSE Linux 2.6.16 x86_64 Intel   W    y             n        n        
-SuSE Linux 2.6.16 x86_64 PGI     W    n             n        n        
-RHEL 4 Linux 2.6.9 Xeon Lustre   C    y             n        n        
-RedHat Linux 2.4 Xeon Lustre     C    y             n        n        
-SuSE Linux 2.4 ia64              C    y             n        n        
-SuSe Linux 2.6.5 SGI Altix ia64       n             n        n        
-
-Compiler versions for each platform are listed in the "Platforms Tested" 
-table found elsewhere in this file (RELEASE.txt).  Unless otherwise noted, 
-compilers used are the system compilers.
-
-Footnotes:
-(1) Fortran compiled with g95.
-
-
-Known Problems
-==============
-* We discovered two problems when running collective IO parallel HDF5 tests
-  with chunking storage with the ChaMPIon MPI compiler on tungsten, a Linux
-  cluster at NCSA.
-  Under some complex selection cases, 
-  1) MPI_Get_element returns the wrong value.
-  2) MPI_Type_struct also generates the wrong derived datatype and corrupt 
-     data may be generated.
-  This only happens when turning on collective IO with chunking storage
-  with some complex selections. We haven't found these problems on other 
-  MPI-IO compilers. If you encounter these problems, you may use Independent 
-  IO instead.
-
-  To avoid this problem, change the following line in your code:
-  H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_COLLECTIVE);
-
-  to
-  H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_INDEPENDENT);
- 
-  KY - 2007/08/24
-
-* QSC (an HP alpha-based OSF1 cluster) does not create h5pfc correctly. It
-  does not include the -lmpi properly.  This will be fixed in the next
-  release.  AKC - 2007/08/07.
-
-* On IRIX64 6.5 (UCAR SGI mop1), when testing HDF5 tools with an HDF5 shared
-  library, especially for h5repacktst and h52gifgentst, the following (or a
-  similar) error message may appear:
-  "523648:lt-h5repacktst: rld: Fatal Error: Cannot Successfully map soname
-  'libh5test.so.1' under any of the filenames .......(bunch of directories)
-  "
-  And the testing will fail. 
-
-  We believe this is a libtool problem. One way to get rid of this is to
-  add the paths of libh5test.so.1 and libh5.so.1 to the shared library path.
-
-  For 32-bit:
-  You may do this, under csh:
-  setenv LD_LIBRARYN32_PATH .......(existing paths):[full path of HDF5
-  directory/test/.libs]:[full path of HDF5 directory/src/.libs]
-
-  For 64-bit:
-  setenv LD_LIBRARY64_PATH ......(existing paths):[full path of HDF5
-  directory/test/.libs]:[full path of HDF5 directory/src/.libs]
-
-  NOTE: This problem ONLY affects the testing of the HDF5 library when you 
-  build from source. It won't affect any applications that would like to link 
-  with the HDF5 shared library since the shared library path needs to be set 
-  anyway.  KY - 2007/8/2
-
-* QSC (an HP alpha-based OSF1 cluster) failed the testpar/testphdf5 sub-test
-  "calloc".  All other tests passed.  This indicates that a dataset using 
-  chunked storage created by serial HDF5 may not work properly with parallel 
-  HDF5.  The calloc test can be skipped by running "prun ... testphdf5 -x 
-  calloc".  AKC - 2007/7/12.
-
-* The Intel C Compiler for the Linux x86_64 platform (EM64T-based, v8.1) has
-  an optimization error in the datatypes conversion code.  Before running
-  configure, edit the file config/intel-flags by changing the setting of
-  PROD_CFLAGS from -O3 to -O0.  Then run configure.  AKC - 2005/11/10.
-
-* When testing parallel HDF5 with the C compiler version MIPSpro 7.4.3 on IRIX
-  6.5, set the environment variable MPI_TYPE_MAX to be a bigger number, for 
-  example 120000, in order to pass the complicated collective IO tests inside 
-  the parallel HDF5 library. This is not a problem inside the parallel HDF5 
-  library. You can always set a bigger number on your system.  KY - 2005/10/6
-
-* A contiguous or chunked dataset created by a sequential version of HDF5 
-  might not be able to be modified with a parallel version of the library. 
-  Use the H5Pset_alloc_time function with H5D_ALLOC_TIME_EARLY to set up the 
-  dataset creation property list to avoid the problem.  EIP - 2005/09/09
-
-* A dataset created or rewritten with the v1.6.3 library or after can't 
-  be read with the v1.6.2 library or before when Fletcher32 EDC (a filter) is 
-  enabled.  There was a bug in the calculating code of the Fletcher32 
-  checksum in the library before v1.6.3.  The checksum value wasn't consistent 
-  between big-endian and little-endian systems.  This bug was fixed in 
-  Release 1.6.3.  However, after fixing the bug, the checksum value is no 
-  longer the same as before on little-endian system.  HDF5 library releases 
-  after 1.6.4 can still read datasets created or rewritten with an HDF5 
-  library of v1.6.2 or before.  SLU - 2005/7/8
-
-* For version 6 (6.02 and 6.04) of the Portland Group compiler on AMD Opteron
-  processor, there's a bug in the compiler for optimization(-O2).  The library
-  failed in several tests, all related to the multi driver.  The problem has 
-  been reported to the vendor.  
-
-* test/big fails sometimes with the message "Possible overlap with another
-  region."  The test selects regions randomly, and this error occurs when
-  two regions overlap each other; it is a bug in the test and not in
-  HDF5.  Since the error is triggered by a random situation, it will
-  usually disappear if the test is re-run.
-
-* Newer SGI MIPSpro compilers (version 7.4.x) support C99 features but 
-  have a "guard" statement in stdint.h that will #error and skip the rest
-  of the header file if the C99 option is not used explicitly.  Hardsetting
-  $CC to c99 will resolve the problem. AKC - 2004/12/13
-
-* On IBM AIX systems, parallel HDF5 mode will fail some tests with error
-  messages like "INFO: 0031-XXX ...".  This is from the command poe.
-  Set the environment variable MP_INFOLEVEL to 0 to minimize the messages
-  and run the tests again.
-
-  The tests may also fail with messages like "The socket name is already
-  in use".  HDF5 does not use sockets.  This is due to problems of the 
-  poe command trying to set up the debug socket.  Check whether there are 
-  many old /tmp/s.pedb.* files staying around.  These are sockets used by 
-  the poe command and left behind due to failed commands.  Ask your system 
-  administrator to clean them out.  Lastly, request IBM to provide a means 
-  to run poe without the debug socket.
-
-* The h5dump tests may fail to match the expected output on some platforms
-  (e.g. parallel jobs, Windows) where the error messages directed to
-  "stderr" do not appear in the "right order" with output from stdout.
-  This is not an error.
-
-* The --enable-static-exec configure flag fails to compile for Solaris
-  platforms. This is due to the fact that not all of the system
-  libraries on Solaris are available in a static format.
-
-  The --enable-static-exec configure flag also fails to correctly compile
-  on the IBM SP2 platform for the serial mode. The parallel mode works fine
-  with this option.
-
-  The --enable-static-exec configure flag also fails to correctly compile
-  on the HPUX 11.00.
-  
-  It is suggested that you don't use this option on these platforms
-  during configuration.
-
-* Use the --disable-shared configure flag if building with an Absoft Fortran
-  compiler.
-
-* Information about building with PGI and Intel compilers is available in
-  INSTALL file sections 5.7 and 5.8.
-
-* In LANL QSC, the new cc compiler has problems converting small values of
-  long long (absolute values less than 1**-308) to double.  This triggers
-  the test/dtypes to report failure in the following test:
-      Testing random sw long double -> double conversions
-  If -ieee is used, the converted doubles spread over the range 0.0 to 
-  10**-308.  If -ieee is not used, the converted double values are mostly 
-  0.0, but occasionally appear as 10**-308.  This has been reported to the 
-  system staff.
-
-  All other tests have passed.
-
-* On at least one system, SDSC DataStar, the scheduler (in this case
-  LoadLeveler) sends job status updates to standard error when you run
-  any executable that was compiled with the parallel compilers.
-
-  This causes problems when running "make check" on parallel builds, as
-  many of the tool tests function by saving the output from test runs,
-  and comparing it to an exemplar.
-
-  The best solution is to reconfigure the target system so it no longer
-  inserts the extra text.  However, this may not be practical.
-
-  In such cases, one solution is to "setenv HDF5_Make_Ignore yes" prior to
-  the configure and build.  This will cause "make check" to continue after
-  detecting errors in the tool tests.  However, in the case of SDSC DataStar,
-  it also leaves you with some 150 "failed" tests to examine by hand.
-
-  A second solution is to write a script to run serial tests and filter
-  out the text added by the scheduler.  A sample script used on SDSC
-  DataStar is given below, but you will probably have to customize it
-  for your installation.
-
-  Observe that the basic idea is to insert the script as the first item
-  on the command line which executes the test.  The script then
-  executes the test and filters out the offending text before passing
-  it on.
-
-        #!/bin/csh
-
-        set STDOUT_FILE=~/bin/serial_filter.stdout
-        set STDERR_FILE=~/bin/serial_filter.stderr
-
-        rm -f $STDOUT_FILE $STDERR_FILE
-
-        ($* > $STDOUT_FILE) >& $STDERR_FILE
-
-        set RETURN_VALUE=$status
-
-        cat $STDOUT_FILE
-
-        tail +3 $STDERR_FILE
-
-        exit $RETURN_VALUE
-
-  You get the HDF5 make files and test scripts to execute your filter script
-  by setting the environment variable "RUNSERIAL" to the full path of the
-  script prior to running configure for parallel builds.  Remember to
-  "unsetenv RUNSERIAL" before running configure for a serial build.
-
-  Note that the RUNSERIAL environment variable exists so that we can
-  prefix serial runs as necessary on the target system.  On DataStar,
-  no prefix is necessary.  However, on an MPICH system, the prefix might
-  have to be set to something like "/usr/local/mpi/bin/mpirun -np 1" to
-  get the serial tests to run at all.
-
-  In such cases, you will have to include the regular prefix in your
-  filter script.  JM - 2004/9/15
-
-%%%%1.6.6%%%%   Release Information for hdf5-1.6.6 (16/August/08)
-
-HDF5 version 1.6.6 released on Thu Aug 16 11:17:10 CDT 2007
-================================================================================
-
-INTRODUCTION
-============
-This document describes the differences between HDF5-1.6.5 and
-HDF5-1.6.6  It contains information on the platforms tested and
-known problems in HDF5-1.6.6. For more details, check the HISTORY.txt
-file in the HDF5 source.
-
-HDF5 documentation can be found in the distributed release source 
-code in the subdirectory doc/html/ or on the THG (The HDF Group) 
-ftp server (ftp.hdfgroup.org) in the directory:
-
-     /HDF5/docs/
-
-Documentation for the current release is also on the HDF web site:
-
-     http://hdfgroup.org/HDF5/doc/
-
-For more information, see the HDF5 home page at:
-
-    http://hdfgroup.org/HDF5/
-
-If you have any questions or comments, please send them to:
-
-    help@hdfgroup.org
-
-
-CONTENTS
-========
-- New Features
-- Support for New Platforms, Languages and Compilers
-- Bug Fixes since HDF5-1.6.5
-- Documentation
-- Platforms Tested
-- Supported Configuration Features Summary
-- Known Problems
-
-
-New Features
-============
-    Configuration:
-    -------------------------
-        - HDF5 now uses autoconf 2.61 to generate configure. MAM - 2007/7/25.
-
-    Source code distribution
-    ========================
-    Library:
-    --------
-        - None
-
-    Parallel Library:
-    -----------------
-        - None
-      
-    Tools:
-    ------
-        - h52gif and gif2h5: Both these tools were revised to include High
-            Level Image API support.  Tests were added to /hl/tools/gif2h5.
-            PVN - 2007/04/13
-        - h5dump: Added support for double long type H5T_NATIVE_LDOUBLE. 
-            PVN - 2007/03/13
-        - h5dump: Added support for binary output; see usage. PVN 2007/03/13
-        - h5repack: Added support for reading and writing by hyperslabs for
-            large files. PVN - 2007/03/01
-        - h5repack: A new option allows the copy to use the source file type
-            (default) instead of the previous conversion to native type. 
-            PVN - 2007/03/01
-        - h5repack: Added output of the percentage of compression achieved. 
-            PVN - 2007/03/01
-        - h5diff: Added support for comparing dataset regions. PVN -
-          2007/02/20
-        - h5diff: Added support for reading and comparing by hyperslabs for 
-            large files.  PVN - 2007/02/20
-        - h5diff: Added printing of dataset dimensions along with dataset
-          name. 
-            PVN - 2007/02/19
-
-    F90 API:
-    --------
-        - None
-
-    C++ API:
-    --------
-        - Added support for Szip: DSetCreatPropList::setSzip - BMR 2007/01/24
-
-
-Support for New Platforms, Languages and Compilers
-==================================================
-        - Added support for MAC Intel (Darwin 8.8.2)  (gcc 4.0.1 and g95 0.91)
-                                EIP - 2007/02/13
-        - Added support for GNU C compiler version 4.2.1 for FreeBSD 6.2 
-          (32- and 64-bit)
-
-
-Bug Fixes since HDF5-1.6.5 Release
-==================================
-
-    Library
-    -------
-        - Fixed several bugs with writing fill values for datasets that have
-            a variable-length datatype or component datatype.  QAK -
-2007/06/19
-        - STDIO driver didn't support files bigger than 2GB because the OFFSET
-            parameter of fseek is of type LONG INT, not big enough for big 
-            files.  Use fseeko instead for big files if it's available on the 
-            system.  SLU - 2007/4/5
-        - Relaxed restrictions on attribute operations to allow a file ID to
-            be used as the "location ID".  If a file ID is used, the attribute
-            operation will occur on the root group of the file.
-            QAK - 2007/02/09
-        - Fixed a bug in H5Sselect_valid() that caused an incorrect value to
-            be returned (0) instead of FAIL on error conditions such as the
-            selection or extent not being defined. CMC - 2007/01/05
-        - Fixed potential file corruption bug which could overwrite a portion
-            of an object's header when an attribute was renamed.  If the new
-            name for the attribute was longer than the old name, it was
-possible
-            that the attribute would grow enough to overwrite another message
-            in the object's header.  QAK - 2007/01/02
-        - Fixed file corruption bug which could write an incorrect number of
-            messages to an object's header under certain circumstances.
-            Generally, the sequence of actions to generate this bug looks
-            like this:
-                - Create an object.
-                - Close the file.
-                - Re-open the file.
-                - Add 2 (or more) attributes to the object.
-                - Close the file.
-                - Re-open the file.
-                - Delete one of the attributes on the object.
-                - Add a smaller attribute to the object.
-                - Delete the smaller atttribute on the object.
-                - Add a larger attribute on the object.
-
-            After this, the number of header messages stored for the object
-            will be off by one.  Other sequences of modifying attributes on an
-            object could also trigger this bug.  If you are opening an
-            object and the bottom few messages of the HDF5 error stack
-            resembles the following, the object has been affected by this bug:
-
-              #007: ../../hdf5_v1.6/src/H5C.c line 3887 in H5C_load_entry():
-unable to load entry
-                major(08): Meta data cache layer
-                minor(40): Unable to load metadata into cache
-              #008: ../../hdf5_v1.6/src/H5Ocache.c line 332 in H5O_load():
-corrupt object header - too few messages
-                major(12): Object header layer
-                minor(40): Unable to load metadata into cache
-
-            Specifically, "corrupt object header" is the best string to search
-            for in the HDF5 error stack output.
-
-            If your files have been affected by this bug, or you are concerned
-            that your files might have been, please contact the HDF Helpdesk
-            at help@hdfgroup.org for a tool to detect and repair files
-            affected by this problem.  QAK - 2006/6/16
-
-        - Fixed various problems with retrieving names of objects, especially
-            with mounted files.  QAK - 2005/12/25
-
-    Configuration
-    -------------
-        - Changed to default to --disable-shared if parallel is enabled. 
-            AKC - 2007/5/12
-        - Corrected a coding error in configure when it tries to locate the
-          needed MPI and MPI-IO library for the fortran interface. 
-            AKC - 007/5/9.
-        - Changed default fortran compiler to g95 when gcc is used. 
-            AKC - 007/2/17.
-        - Configure can now use any tr command.  No more need for
-            defining the variable TR, nor is it supported.  AKC - 2006/05/20
-
-    Performance
-    -------------
-        - None
-   
-    Tools
-    -----
-        - Fixed a bug in h5dump regarding the display of named datatypes
-            attributes. PVN - 2007/03/13
-        - Fixed a bug in h5dump regarding the display of group comments. 
-            PVN - 2007/03/13
-        - Fixed a bug in h5dump regarding the display of hardlinks pointing 
-            to the root group.  PVN - 2007/03/13
-        - Fixed a bug in the h5diff percentage option -p.  PVN - 2007/03/05
-        - Fixed a bug in h5dump that caused array indices greater than 2^32-1
-            not to be printed correctly.  PVN - 2007/2/19
-
-    Documentation 
-    ------------- 
-        - Corrected errors and extended the descriptions in Reference Manual 
-            entries for several functions.  
-
-    F90 API
-    -------
-        - None
-                                
-    C++ API
-    -------
-          - Changed
-                  StrType::StrType(const size_t& size);
-            to
-                  StrType::StrType(const int dummy, const size_t& size);
-            because the first one clashed with
-                  StrType::StrType(const hid_t existing_id); - BMR 2007/05/03
-          - Wrappers of H5Rcreate had incorrect prototypes.  Added these
-            overloaded functions:
-                  IdComponent::reference(void* ref, const char* name,
-DataSpace&
-                          dataspace, H5R_type_t ref_type = H5R_DATASET_REGION)
-                  IdComponent::void reference(void* ref, const char* name)
-                  IdComponent::reference(void* ref, const H5std_string& name)
-            and will remove these incorrect member functions:
-                  DataSet::Reference
-                  DataType::Reference
-                  Group::Reference
-                  H5File::Reference
-          - Added wrappers for H5Rdereference as constructors:
-                  DataSet(IdComponent& obj, void* ref);
-                  Group(IdComponent& obj, void* ref);
-                  DataType(IdComponent& obj, void* ref);
-
-
-Documentation
-=============
-
-    HDF5 documentation can be found in the distributed release source 
-    code in the subdirectory doc/html/ (start with index.html) or on the 
-    THG (The HDF Group) ftp server (ftp.hdfgroup.org) in the directory:
-
-         /HDF5/docs/
-
-    Online documentation for the current release can be found on the THG 
-    web site:
-
-         http://hdfgroup.org/HDF5/doc/
-
-
-Platforms Tested
-================
-
-    AIX 5.2 (32/64 bit)           xlc 6.0.0.8
-    (datastar)                    xlC 6.0.0.9
-                                  xlf 8.1.1.7
-                                  mpcc_r 6.0.0.8
-                                  mpxlf_r 8.1.1.7
-
-    AIX 5.3 (32/64 bit)           xlc 7.0.0.0
-    (copper)                      xlC 7.0.
-                                  xlf 9.1.0.3
-
-    FreeBSD 6.2 (32- and 64-bit)  gcc  and g++3.4.6
-    (duty and liberty)            gcc and g++ 4.2.1
-
-    HP-UX B.11.23                 HP aC++/ANSI C B3910B A.06.02
-    (sirius)                      HP F90 v3.1 (32-bit only)
-                                  HP aC++/ANSI C B3910B A.06.02
-
-    IRIX64 6.5                    MIPSpro cc 7.4.4m
-    (ucar mop1 64 & n32)          F90 MIPSpro 7.4.4m (64 only)
-                                  C++ MIPSpro cc 7.4.4m
-
-    Linux 2.4.21-47.ELsmp #1 SMP  gcc 3.2.3
-        i686 i386 GNU/Linux
-    (osage)
-
-    Linux 2.6.9-42.0.10.ELsmp #1  gcc (GCC) 3.4.6
-        SMP i686 i386             G95 (GCC 4.0.3 (g95 0.91!) Nov 21 2006)
-    (kagiso)                      PGI C, Fortran, C++ 6.2-5 32-bit 
-                                  icc (ICC) 9.1 
-                                  Intel(R) C++ Compiler for 32-bit 
-                                      applications, Version 9.1
-                                  Intel(R) Fortran Compiler for 32-bit 
-                                      applications, Version 9.1 
-                                  Absoft 32-bit Fortran 95 10.0.4
-                                  MPICH mpich2-1.0.4p1 compiled with  
-                                  gcc 3.4.6 and G95 (GCC 4.0.3 (g95 0.91!) 
-
-    Linux 2.6.16.46-0.12-debug #1 
-        SMP ia64 GNU/Linux        Intel(R) C++ Version 10.0.025
-    (ucar hir1)                   Intel(R) Fortran Itanium(R) Version 10.0.025
-
-    Linux 2.6.16.46-0.14-smp #1   Intel(R) C++ for Intel(R) EM64T Ver. 9.1.037
-        SMP x86_64 GNU/Linux      Intel(R) Fortran Intel(R) EM64T Ver. 9.1.031
-    (smirom)                      PGI C, Fortran, C++ Version 6.2-5
-                                         for 64-bit target on x86-64
-                                  tested for both 32- and 64-bit binaries
-
-    Linux 2.6.5-7.283-rtgfx Altix 
-        SMP ia64                  Intel(R) C++ Version 9.0
-    (cobalt)                      Intel(R) Fortran Itanium(R) Version 9.0
-                                  SGI MPI
-
-    OSF1 V5.1 (QSC)               Compaq C V6.5-011 
-    (See "Known Problems.")       HP Fortran V5.5A-3548
-                                  Compaq C++ V6.5-036  
-                                  MPIX200_64_r13.4
-
-    SunOS 5.8 32- and 64-bit      Sun WorkShop 6 update 2 C 5.3
-    (sol)                         Sun WorkShop 6 update 2 Fortran 95 6.2
-                                  Sun WorkShop 6 update 2 C++ 5.3
-
-    SunOS 5.10 32- and 64-bit     Sun WorkShop 6 update 2 C 5.8
-    (linew)                       Sun WorkShop 6 update 2 Fortran 95 8.2
-                                  Sun WorkShop 6 update 2 C++ 5.8
-                                  Patch 121019-06 
-
-    Xeon Linux 2.4.21-32.0.1.ELsmp-perfctr-lustre
-    (tungsten)                    Intel(R) C++ Version 9.0
-                                  Intel(R) Fortran Compiler Version 9.0
-                                  PGI C Version 6.0
-                                  PGI C++ Version 6.0
-                                  PGI Fortran Version 6.0
-                                  gcc (GCC) 3.2.2 (Red Hat Linux 3.2.2-5)
-
-    Xeon Linux 2.6.9-42.0.10.EL_lustre-1.4.10.1smp
-    (abe)                         Intel(R) C++ Version 10.0
-                                  Intel(R) Fortran Compiler Version 10.0
-                                  Open MPI 1.2.2
-
-    IA-64 Linux 2.4.21.SuSE_292.til1
-        ia64                      gcc (GCC) 3.2.2
-    (NCSA tg-login)               Intel(R) C++ Version 8.0
-                                  Intel(R) Fortran Compiler Version 8.0
-                                  mpich-gm-1.2.5..10-intel-r2
-
-    Windows XP                    Visual Studio 6.0
-                                  Visual Studio .NET (with Intel Fortran 9.0)
-                                  Visual Studio 2005 (with Intel Fortran 9.0)
-                                  cygwin (gcc 3.4.4)
-
-    MAC OS X Intel                Darwin 8.10.1
-                                  i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1
-                                  g95 0.91
-
-
-Supported Configuration Features Summary
-========================================
-
-Key:   y   = Tested and supported
-       n   = Not supported or not tested in this release
-       C   = Cluster
-       W   = Workstation
-       ( ) = Footnote appears below second table
-
-Platform                              C        F90  F90      C++  zlib  SZIP
-                                      parallel      parallel
-Solaris2.8 32- and 64-bit             n        y    n        y    y     y
-Solaris2.10 32- and 64-bit            n        y    n        y    y     y
-IRIX64_6.5 32-bit                     n        n    n        n    y     y
-IRIX64_6.5 64-bit                     n        y    n        n    y     y
-HPUX11.23-32bit                       n        y    n        y    y     y
-HPUX11.23-64bit                       n        n    n        y    y     y
-WinXP Visual Studio 6.0               n        n    n        y    y     y
-WinXP CYGWIN                          n        n    n        y    y     y
-WinXP 2005                            n        y    n        y    y     y
-WinXP .Net                            n        y    n        y    y     y
-Mac OS X 10.4.10                      n        y    n        y    y     y
-AIX-5.2 & 5.3 32- and 64-bit          y        y    y        y    y     y
-FreeBSD 6.2 32- and 64-bit            n        n    n        y    y     y
-RedHat Linux 2.4.21              W    n        n    n        y    y     y
-SuSE Linux 2.6.9-42 i686 GNU (1) W    y        y    y        y    y     y
-SuSE Linux 2.6.9-42 i686 Intel   W    n        y    n        y    y     y
-SuSE Linux 2.6.9-42 i686 PGI     W    n        y    n        y    y     y
-SuSE Linux 2.6.16 x86_64 GNU (1) W    y        y    y        y    y     y
-SuSE Linux 2.6.16 x86_64 Intel   W    n        y    n        y    y     y
-SuSE Linux 2.6.16 x86_64 PGI     W    n        y    n        y    y     y
-RHEL 4 Linux 2.6.9 Xeon Lustre   C    y        y    y        y    y     y
-RedHat Linux 2.4 Xeon Lustre     C    n        y    n        y    y     y
-SuSE Linux 2.4 ia64              C    y        y    y        y    y     y
-SuSe Linux 2.6.16 SGI Altix ia64      n        y    n        y    y     y
-SuSe Linux 2.6.5 SGI Altix ia64       n        y    n        y    y     y
-OSF1 v5.1                             y        y    y        y    y     n
-
-
-Platform                              Shared        static-  Thread-  STREAM-
-                                      libraries(4)  exec     safe     VFD
-Solaris2.8 32- and 64-bit             y             n        y        y
-Solaris2.10 32- and 64-bit            y             n        y        y
-IRIX64_6.5 32-bit                     y             n        y        y
-IRIX64_6.5 64-bit                     y             n        y        y
-HPUX11.23-32bit                       y (3)         n        n        y
-HPUX11.23-64bit                       y (3)         n        n        y
-WinXP Visual Studio 6.0               y             n        n        n
-WinXP CYGWIN                          y             n        n        n
-WinXP 2005                            y             n        n        n
-WinXP .Net                            y             n        n        n
-Mac OS X 10.4.10                      y             n        n        y
-AIX-5.2 & 5.3 32- and 64-bit          n             n        n        y
-FreeBSD 6.2 32- and 64-bit            y             n        n        y
-RedHat Linux 2.4.21              W    y             n        n        y
-SuSE Linux 2.6.9-42 i686 GNU (1) W    y             n        y        y
-SuSE Linux 2.6.9-42 i686 Intel   W    y             n        n        y
-SuSE Linux 2.6.9-42 i686 PGI     W    n             n        n        y
-SuSE Linux 2.6.16 x86_64 GNU (1) W    y             n        n        y
-SuSE Linux 2.6.16 x86_64 Intel   W    y             n        n        y
-SuSE Linux 2.6.16 x86_64 PGI     W    n             n        n        y
-RHEL 4 Linux 2.6.9 Xeon Lustre   C    y             n        n        y
-RedHat Linux 2.4 Xeon Lustre     C    y             n        n        y
-SuSE Linux 2.4 ia64              C    y             n        n        y
-SuSe Linux 2.6.16 SGI Altix ia64      n             n        n        y
-SuSe Linux 2.6.5 SGI Altix ia64       n             n        n        y
-OSF1 v5.1                             n             n        n        y
-
-Compiler versions for each platform are listed in the "Platforms Tested" 
-table found elsewhere in this file (RELEASE.txt).  Unless otherwise noted, 
-compilers used are the system compilers.
-
-Footnotes:
-(1) Fortran compiled with g95.
-(2) In most cases, shared libraries are provided only for the C library, 
-    except on Windows where they are provided for C, C++, and Fortran.
-(3) C++ works only with static libraries.
-
-
-Known Problems
-==============
-* QSC (an HP alpha-based OSF1 cluster) does not create h5pfc correctly. It
-  does not include the -lmpi properly.  This will be fixed in the next
-  release.  AKC - 2007/08/07.
-
-* On IRIX64 6.5 (UCAR SGI mop1), when testing HDF5 tools with an HDF5 shared
-  library, especially for h5repacktst and h52gifgentst, the following (or
-  similar) error message may appear:
-  "523648:lt-h5repacktst: rld: Fatal Error: Cannot Successfully map soname
-  'libh5test.so.1' under any of the filenames .......(bunch of directories)
-  "
-  And the testing will fail. 
-  We believe this is a libtool problem. One way to get rid of this is to
-  add the paths of libh5test.so.1 and libh5.so.1 to the shared library path.
-
-  For 32-bit:
-  You may do this, under csh:
-  setenv LD_LIBRARYN32_PATH .......(existing pathes):[full path of HDF5
-  directory/test/.libs]:[full path of HDF5 directory/src/.libs]
-
-  For 64-bit:
-  setenv LD_LIBRARY64_PATH ......(existing pathes):[full path of HDF5
-  directory/test/.libs]:[full path of HDF5 directory/src/.libs]
-
-  NOTE: This problem ONLY affects the testing of the HDF5 library when you 
-  build from source. It won't affect any applications that would like to link 
-  with the HDF5 shared library since the shared library path needs to be set 
-  anyway.  KY - 2007/8/2
-
-* QSC (an HP alpha-based OSF1 cluster) failed the testpar/testphdf5 sub-test
-  "calloc".  All other tests passed.  This indicates that a dataset using 
-  chunked storage created by serial HDF5 may not work properly with parallel 
-  HDF5.  The calloc test can be skipped by running "prun ... testphdf5 -x 
-  calloc".  AKC - 2007/7/12.
-
-* The Intel C Compiler for the Linux x86_64 platform (EM64T-based, v8.1) has
-  an optimization error in the datax types conversion code.  Before running
-  configure, edit the file config/intel-flags by changing the setting of
-  PROD_CFLAGS from -O3 to -O0.  Then run configure.  AKC - 2005/11/10.
-
-* When testing parallel HDF5 with the C compiler version MIPSpro 7.4.3 on IRIX
-  6.5, set the environment variable MPI_TYPE_MAX to be a bigger number, for 
-  example 120000, in order to pass the complicated collective IO tests inside 
-  the parallel HDF5 library. This is not a problem inside the parallel HDF5 
-  library. You can always set a bigger number on your system.  KY - 2005/10/6
-
-* A contiguous or chunked dataset created by a sequential version of HDF5 
-  might not be able to be modified with a parallel version of the library. 
-  Use the H5Pset_alloc_time function with H5D_ALLOC_TIME_EARLY to set up the 
-  dataset creation property list to avoid the problem.  EIP - 2005/09/09
-
-* The dataset created or rewritten with the v1.6.3 library or after can't 
-  be read with the v1.6.2 library or before when Fletcher32 EDC (a filter) is 
-  enabled.  There was a bug in the calculating code of the Fletcher32 
-  checksum in the library before v1.6.3.  The checksum value wasn't consistent 
-  between big-endian and little-endian systems.  This bug was fixed in 
-  Release 1.6.3.  However, after fixing the bug, the checksum value is no 
-  longer the same as before on little-endian system.  The library release 
-  after 1.6.4 can still read the dataset created or rewritten with the library
-  of v1.6.2 or before.  SLU - 2005/7/8
-
-* For version 6 (6.02 and 6.04) of the Portland Group compiler on AMD Opteron
-  processor, there's a bug in the compiler for optimization(-O2).  The library
-  failed in several tests, all related to the multi driver.  The problem has 
-  been reported to the vendor.  
-
-* test/big fails sometimes with the message "Possible overlap with another
-  region."  The test selects regions randomly, and this error occurs when
-  two regions overlap each other; it is a bug in the test and not in
-  HDF5.  Since the error is triggered by a random situation, it will
-  usually disappear if the test is re-run.
-
-* Newer SGI MIPSpro compilers (version 7.4.x) support C99 features but 
-  have a "guard" statement in stdint.h that will #error and skip the rest
-  of the header file if the C99 option is not used explicitly.  Hardsetting
-  $CC to c99 will resolve the problem. AKC - 2004/12/13
-
-* On IBM AIX systems, parallel HDF5 mode will fail some tests with error
-  messages like "INFO: 0031-XXX ...".  This is from the command poe.
-  Set the environment variable MP_INFOLEVEL to 0 to minimize the messages
-  and run the tests again.
-
-  The tests may also fail with messages like "The socket name is already
-  in use".  HDF5 does not use sockets (except for stream-VFD).  This is
-  due to problems of the poe command trying to set up the debug socket.
-  Check whether there are many old /tmp/s.pedb.* files staying around.  These 
-  are sockets used by the poe command and left behind due to failed commands.
-  Ask your system administrator to clean them out.  Lastly, request IBM
-  to provide a means to run poe without the debug socket.
-
-* The h5dump tests may fail to match the expected output on some platforms
-  (e.g. parallel jobs, Windows) where the error messages directed to
-  "stderr" do not appear in the "right order" with output from stdout.
-  This is not an error.
-
-* The stream-vfd test uses ip port 10007 for testing. If another
-  application is already using that port address, the test will hang
-  indefinitely and has to be terminated by the kill command. To try the
-  test again, change the port address in test/stream_test.c to one not
-  being used in the host.
-
-* The --enable-static-exec configure flag fails to compile for Solaris
-  platforms. This is due to the fact that not all of the system
-  libraries on Solaris are available in a static format.
-
-  The --enable-static-exec configure flag also fails to correctly compile
-  on the IBM SP2 platform for the serial mode. The parallel mode works fine
-  with this option.
-
-  The --enable-static-exec configure flag also fails to correctly compile
-  on the HPUX 11.00.
-  
-  It is suggested that you don't use this option on these platforms
-  during configuration.
-
-* The Stream VFD is not supported under Windows.
-
-* Use the --disable-shared configure flag if building with Absoft Fortran
-  compiler.
-
-* Information about building with PGI and Intel compilers is available in
-  INSTALL file sections 5.7 and 5.8.
-
-* In LANL QSC, the new cc compiler has problems converting small values of
-  long long (absolute values less than 1**-308) to double.  This triggers
-  the test/dtypes to report failure in the following test:
-      Testing random sw long double -> double conversions
-  If -ieee is used, the converted doubles spread over the range 0.0 to 
-  10**-308.  If -ieee is not used, the converted double values are mostly 
-  0.0, but occasionally appear as 10**-308.  This has been reported to the 
-  system staff.
-
-  All other tests have passed.
-
-* On at least one system, SDSC DataStar, the scheduler (in this case
-  LoadLeveler) sends job status updates to standard error when you run
-  any executable that was compiled with the parallel compilers.
-
-  This causes problems when running "make check" on parallel builds, as
-  many of the tool tests function by saving the output from test runs,
-  and comparing it to an exemplar.
-
-  The best solution is to reconfigure the target system so it no longer
-  inserts the extra text.  However, this may not be practical.
-
-  In such cases, one solution is to "setenv HDF5_Make_Ignore yes" prior to
-  the configure and build.  This will cause "make check" to continue after
-  detecting errors in the tool tests.  However, in the case of SDSC DataStar,
-  it also leaves you with some 150 "failed" tests to examine by hand.
-
-  A second solution is to write a script to run serial tests and filter
-  out the text added by the scheduler.  A sample script used on SDSC
-  DataStar is given below, but you will probably have to customize it
-  for your installation.
-
-  Observe that the basic idea is to insert the script as the first item
-  on the command line which executes the test.  The script then
-  executes the test and filters out the offending text before passing
-  it on.
-
-        #!/bin/csh
-
-        set STDOUT_FILE=~/bin/serial_filter.stdout
-        set STDERR_FILE=~/bin/serial_filter.stderr
-
-        rm -f $STDOUT_FILE $STDERR_FILE
-
-        ($* > $STDOUT_FILE) >& $STDERR_FILE
-
-        set RETURN_VALUE=$status
-
-        cat $STDOUT_FILE
-
-        tail +3 $STDERR_FILE
-
-        exit $RETURN_VALUE
-
-  You get the HDF5 make files and test scripts to execute your filter script
-  by setting the environment variable "RUNSERIAL" to the full path of the
-  script prior to running configure for parallel builds.  Remember to
-  "unsetenv RUNSERIAL" before running configure for a serial build.
-
-  Note that the RUNSERIAL environment variable exists so that we can
-  prefix serial runs as necessary on the target system.  On DataStar,
-  no prefix is necessary.  However, on an MPICH system, the prefix might
-  have to be set to something like "/usr/local/mpi/bin/mpirun -np 1" to
-  get the serial tests to run at all.
-
-  In such cases, you will have to include the regular prefix in your
-  filter script.  JM - 2004/9/15
-
-
 %%%%1.6.5%%%%   Release Information for hdf5-1.6.5 (10/November/05)
 
 
diff --git a/release_docs/INSTALL b/release_docs/INSTALL
index 4a9a567..1444bf2 100644
--- a/release_docs/INSTALL
+++ b/release_docs/INSTALL
@@ -1,733 +1,674 @@
 
-Instructions for the Installation of HDF5 Software
-==================================================
-
-This file provides instructions for installing the HDF5 software.  
-If you have any problems with the installation, please see The HDF Group's
-support page at the following location:
-
-    http://www.hdfgroup.org/services/support.html
-
-CONTENTS
---------
-        1. Obtaining HDF5
-
-        2. Quick installation
-        2.1. Windows
-        2.2. RedStorm (Cray XT3)
-
-        3. HDF5 dependencies
-        3.1. Zlib
-        3.2  Szip (optional)
-        3.3. MPI and MPI-IO
-
-        4. Full installation instructions for source distributions
-        4.1. Unpacking the distribution
-        4.1.1. Non-compressed tar archive (*.tar)
-        4.1.2. Compressed tar archive (*.tar.Z)
-        4.1.3. Gzip'd tar archive (*.tar.gz)
-        4.1.4. Bzip'd tar archive (*.tar.bz2)
-        4.2. Source versus build directories
-        4.3. Configuring
-        4.3.1. Specifying the installation directories
-        4.3.2. Using an alternate C compiler
-        4.3.3. Configuring for 64-bit support
-        4.3.4. Additional compilation flags
-        4.3.5. Compiling HDF5 wrapper libraries
-        4.3.6. Specifying other programs
-        4.3.7. Specifying other libraries and headers
-        4.3.8. Static versus shared linking
-        4.3.9. Optimization versus symbolic debugging
-        4.3.10. Parallel versus serial library
-        4.3.11. Threadsafe capability
-        4.3.12. Backward compatibility
-        4.4. Building
-        4.5. Testing
-        4.6. Installing HDF5
-
-        5. Using the Library
-
-        6. Support
-
-        A. Warnings about compilers
-        A.1. GNU (Intel platforms)
-        A.2. DEC
-        A.3. SGI (Irix64 6.2)
-        A.4. Windows/NT
-
-        B. Large (>2GB) versus small (<2GB) file capability
-
-        C. Building and testing with other compilers
-        C.1.  Building and testing with Intel compilers
-        C.2.  Building and testing with PGI compilers
+	Instructions for the Installation of HDF5 Software
+	==================================================
+
+WARNING: This file was not updated for the 1.8.0-beta* releases. If you have any problems with the HDF5
+         installation please contact help@hdfgroup.org
+
+	CONTENTS
+	--------
+	1. Obtaining HDF5
+
+	2. Warnings about compilers
+	2.1. GNU (Intel platforms)
+	2.2. DEC
+	2.3. SGI (Irix64 6.2)
+	2.4. Windows/NT
+
+	3. Quick installation
+	3.1. Windows
+	3.2. RedStorm (Cray XT3)
+
+	4. HDF5 dependencies
+	4.1. Zlib
+	4.2  Szip
+	4.3. MPI and MPI-IO
+
+	5. Full installation instructions for source distributions
+	5.1. Unpacking the distribution
+	5.1.1. Non-compressed tar archive (*.tar)
+	5.1.2. Compressed tar archive (*.tar.Z)
+	5.1.3. Gzip'd tar archive (*.tar.gz)
+	5.1.4. Bzip'd tar archive (*.tar.bz2)
+	5.2. Source vs. Build Directories
+	5.3. Configuring
+	5.3.1. Specifying the installation directories
+	5.3.2. Using an alternate C compiler
+        5.3.3. Configuring for 64-bit support
+	5.3.4. Additional compilation flags
+	5.3.5. Compiling HDF5 wrapper libraries
+	5.3.6. Specifying other programs
+	5.3.7. Specifying other libraries and headers
+	5.3.8. Static versus shared linking
+	5.3.9. Optimization versus symbolic debugging
+	5.3.10. Large (>2GB) vs. small (<2GB) file capability
+	5.3.11. Parallel vs. serial library
+        5.3.12. Threadsafe capability
+        5.3.13. Backward compatibility
+        5.3.14. Network stream capability
+	5.4. Building
+	5.5. Testing
+	5.6. Installing
+	5.7  Building and testing with Intel compilers
+	5.8  Building and testing with PGI compilers
+
+	6. Using the Library
+
+	7. Support
 
 *****************************************************************************
 
 1. Obtaining HDF5
-        The latest supported public release of HDF5 is available from
-        ftp://ftp.hdfgroup.org/HDF5/current/src.  For Unix and UNIX-like 
-        platforms, it is available in tar format compressed with gzip.  
-        For Microsoft Windows, it is in ZIP format.
-
-        The HDF team also makes snapshots of the source code available on
-        a regular basis. These snapshots are unsupported (that is, the
-        HDF team will not release a bug-fix on a particular snapshot;
-        rather any bug fixes will be rolled into the next snapshot).
-        Furthermore, the snapshots have only been tested on a few
-        machines and may not test correctly for parallel applications.
-        Snapshots, in a limited number of formats, can be found on THG's 
-        development FTP server:
-
-            ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf5/snapshots 
-
-
-2. Quick installation
-        For those who don't like to read ;-) the following steps can be used
-        to configure, build, test, and install the HDF5 Library, header files,
-        and support programs. For example, to install HDF5 version X.Y.Z at
-        location /usr/local/hdf5, use the following steps.
-
-            $ gunzip < hdf5-X.Y.Z.tar.gz | tar xf -
-            $ cd hdf5-X.Y.Z
-            $ ./configure --prefix=/usr/local/hdf5 <more configure_flags>
-            $ make
-            $ make check                # run test suite.
-            $ make install
-            $ make check-install        # verify installation.
-
-        Some versions of the tar command support the -z option. In such cases,
-        the first step above can be simplified to the following:
-
-            $ tar zxf hdf5-X.Y.Z.tar.gz
-
-        <configure_flags> above refers to the configure flags appropriate
-        to your installation.  For example, to install HDF5 with the 
-        Fortran and C++ interfaces and with SZIP compression, the 
-        configure line might read as follows:
-        
-            $ ./configure --prefix=/usr/local/hdf5 --enable-fortran \
-                          --enable-cxx --with-szlib=PATH_TO_SZIP
-
-        In this case, PATH_TO_SZIP would be replaced with the path to the 
-        installed location of the SZIP library.
-
-2.1. Windows
-        Users of Microsoft Windows should see the INSTALL_Windows files for
-        detailed instructions.
-
-2.2. RedStorm (Cray XT3)
-        Users of the Red Storm machine, after reading this file, should read
-        the Red Storm section in the INSTALL_parallel file for specific
-        instructions for the Red Storm machine.  The same instructions would
-        probably work for other Cray XT3 systems, but they have not been
-        verified.
-
-
-3. HDF5 dependencies
-3.1. Zlib
-        The HDF5 Library includes a predefined compression filter that 
-        uses the "deflate" method for chunked datasets. If zlib-1.1.2 or
-        later is found, HDF5 will use it.  Otherwise, HDF5's predefined
-        compression method will degenerate to a no-op; the compression
-        filter will succeed but the data will not be compressed.
-
-3.2. Szip (optional)
-        The HDF5 Library includes a predefined compression filter that 
-        uses the extended-Rice lossless compression algorithm for chunked 
-        datasets. For more information about Szip compression and license 
-        terms, see http://hdfgroup.org/doc_resource/SZIP/.
-
-        Precompiled Szip binaries for each supported platform and a source 
-        tar file can be found at ftp://ftp.hdfgroup.org/lib-external/szip/.
-        
-        To configure the HDF5 Library with the Szip compression filter, use 
-        the '--enable-szlib=/PATH_TO_SZIP' flag. For more information, see 
-        section 4.3.7, "Specifying other libraries and headers."
-
-        Starting with release 1.6.3, Szip library binaries are distributed 
-        with the encoder enabled (a license may be required to use this binary) 
-        and with the encoder disabled (freely usable without a license). 
-        If the encoder enabled binary is used, Szip compression encoding is 
-        available for an HDF5 application; if the encoder disabled binary is 
-        used, Szip compression is not available.  Szip decoding is always 
-        available for applications (i.e., an HDF5 application can always read 
-        Szip-compressed data) if the Szip filter is present, regardless of the 
-        binary used.
-
-3.3. MPI and MPI-IO
-        The parallel version of the library is built upon the foundation
-        provided by MPI and MPI-IO. If these libraries are not available
-        when HDF5 is configured, only a serial version of HDF5 can be built.
-
-
-4. Full installation instructions for source distributions
-
-4.1. Unpacking the distribution
-        The HDF5 source code is distributed in a variety of formats which
-        can be unpacked with the following commands, each of which creates an
-        'hdf5-X.Y.Z' directory, where X.Y.Z is the HDF5 version numbers.
-
-4.1.1. Non-compressed tar archive (*.tar)
-
-            $ tar xf hdf5-X.Y.Z.tar
-
-4.1.2. Compressed tar archive (*.tar.Z)
-
-            $ uncompress -c < hdf5-X.Y.Z.tar.Z | tar xf -
-            Or
-            $ tar Zxf hdf5-X.Y.Z.tar.Z
-
-4.1.3. Gzip'd tar archive (*.tar.gz)
-
-            $ gunzip < hdf5-X.Y.Z.tar.gz | tar xf -
-            Or
-            $ tar zxf hdf5-X.Y.Z.tar.gz
-
-4.1.4. Bzip'd tar archive (*.tar.bz2)
-
-            $ bunzip2 < hdf5-X.Y.Z.tar.bz2 | tar xf -
-            Or
-            $ tar jxf hdf5-X.Y.Z.tar.bz2
-
-4.2. Source versus build directories
-        On most systems the build can occur in a directory other than the
-        source directory, allowing multiple concurrent builds and/or
-        read-only source code. In order to accomplish this, one should
-        create a build directory, cd into that directory, and run the
-        `configure' script found in the source directory (configure
-        details are below). For example,
-            $ mkdir built-fortran
-            $ cd build-fortran
-            $ ../hdf5-X.Y.Z/configure --enable-fortran ...
-
-        Unfortunately, this does not work on recent Irix platforms (6.5?
-        and later) because that `make' does not understand the VPATH variable. 
-        However, HDF5 also supports Irix `pmake' which has a .PATH target 
-        which serves a similar purpose. Here's what the Irix man pages say 
-        about VPATH, the facility used by HDF5 makefiles for this feature:
-
-                The VPATH facility is a derivation of the undocumented
-                VPATH feature in the System V Release 3 version of make.
-                System V Release 4 has a new VPATH implementation, much
-                like the pmake(1) .PATH feature. This new feature is also
-                undocumented in the standard System V Release 4 manual
-                pages.  For this reason it is not available in the IRIX
-                version of make. The VPATH facility should not be used
-                with the new parallel make option.
-
-4.3. Configuring
-        HDF5 uses the GNU autoconf system for configuration, which
-        detects various features of the host system and creates the
-        Makefiles. On most systems it should be sufficient to say:
-
-            $ ./configure        
-            Or
-            $ sh configure
-
-        The configuration process can be controlled through environment
-        variables, command-line switches, and host configuration files.
-        For a complete list of switches type:
-
-            $ ./configure --help
-
-        The host configuration files are located in the `config'
-        directory and are based on architecture name, vendor name, and/or
-        operating system which are displayed near the beginning of the
-        `configure' output. The host config file influences the behavior
-        of configure by setting or augmenting shell variables.
-
-4.3.1. Specifying the installation directories
-        The default installation location is the HDF5 directory created in
-        the build directory. Typing `make install' will install the HDF5
-        Library, header files, examples, and support programs in hdf5/lib,
-        hdf5/include, hdf5/doc/hdf5/examples, and hdf5/bin. To use a path
-        other than hdf5, specify the path with the `--prefix=PATH' switch:
-
-            $ ./configure --prefix=/usr/local
-
-        If shared libraries are being built (the default), the final
-        home of the shared library must be specified with this switch
-        before the library and executables are built.
-
-        HDF5 can be installed into a different location than the prefix
-        specified at configure time; see section 4.6, "Installing HDF5," 
-        for more details.
-
-4.3.2. Using an alternate C compiler
-        By default, configure will look for the C compiler by trying
-        `gcc' and `cc'. However, if the environment variable "CC" is set
-        then its value is used as the C compiler.  For instance, one would 
-        use the following line to specify the native C compiler on a system 
-        that also has the GNU gcc compiler (users of csh and derivatives 
-        will need to prefix the commands below with `env'):
-
-            $ CC=cc ./configure
-
-        A parallel version of HDF5 can be built by specifying `mpicc'
-        as the C compiler.  (The `--enable-parallel' flag documented
-        below is optional in this case.)  Using the `mpicc' compiler
-        will insure that the correct MPI and MPI-IO header files and
-        libraries are used.
-
-            $ CC=/usr/local/mpi/bin/mpicc ./configure
-
-4.3.3. Configuring for 64-bit support
-        Several machine architectures support 32-bit or 64-bit binaries.
-        The options below describe how to enable support for different options.
-
-        On Irix64, the default compiler is `cc'. To use an alternate compiler,
-        specify it with the CC variable:
-
-            $ CC='cc -n32' ./configure
-
-        Similarly, users compiling on a Solaris machine and desiring to
-        build the distribution with 64-bit support should specify the
-        correct flags with the CC variable:
-
-            $ CC='cc -xarch=v9' ./configure
-
-        To configure AIX 64-bit support including the Fortran and C++ APIs,
-        (Note: need to set $AR to 'ar -X 64'.)
-        Serial:
-            $ CFLAGS=-q64 FFLAGS=-q64 CXXFLAGS=-q64 AR='ar -X 64'\
-              ./configure --enable-fortran
-        Parallel: (C++ not supported with parallel)
-            $ CFLAGS=-q64 FFLAGS=-q64 AR='ar -X 64'\
-              ./configure --enable-fortran
-
-4.3.4. Additional compilation flags
-        If addtional flags must be passed to the compilation commands,
-        specify those flags with the CFLAGS variable. For instance,
-        to enable symbolic debugging of a production version of HDF5, one
-        might say:
-
-            $ CFLAGS=-g ./configure --enable-production
-
-4.3.5. Compiling HDF5 wrapper libraries
-        One can optionally build the Fortran and/or C++ interfaces to the
-        HDF5 C library. By default, both options are disabled. To build
-        them, specify `--enable-fortran' and `--enable-cxx', respectively.
-
-            $ ./configure --enable-fortran
-            $ ./configure --enable-cxx
-        
-        Configuration will halt if a working Fortran 90 or 95 compiler or
-        C++ compiler is not found. Currently, the Fortran configure tests
-        for these compilers in order: f90, pgf90, f95. To use an
-        alternate compiler specify it with the FC variable:
-
-            $ FC=/usr/local/bin/g95 ./configure --enable-fortran
-
-        Note: The Fortran and C++ interfaces are not supported on all the
-              platforms the main HDF5 Library supports. Also, the Fortran
-              interface supports parallel HDF5 while the C++ interface does
-              not.
-
-        Note: See sections 4.7 and 4.8 for building the Fortran library with
-              Intel or PGI compilers. 
-
-4.3.6. Specifying other programs
-        The build system has been tuned for use with GNU make but also 
-        works with other versions of make.  If the `make' command runs a
-        non-GNU version but a GNU version is available under a different
-        name (perhaps `gmake'), then HDF5 can be configured to use it by
-        setting the MAKE variable. Note that whatever value is used for
-        MAKE must also be used as the make command when building the
-        library:
-
-            $ MAKE=gmake ./configure
-            $ gmake
-
-        The `AR' and `RANLIB' variables can also be set to the names of
-        the `ar' and `ranlib' (or `:') commands to override values
-        detected by configure.
-
-        The HDF5 Library, include files, and utilities are installed
-        during `make install' (described below) with a BSD-compatible
-        install program detected automatically by configure. If none is
-        found, the shell script bin/install-sh is used. Configure does not
-        check that the install script actually works; if a bad install is 
-        detected on your system (e.g., on the ASCI blue machine as of 
-        March 2, 1999) you have two choices:
-
-            1. Copy the bin/install-sh program to your $HOME/bin
-               directory, name it `install', and make sure that $HOME/bin
-               is searched before the system bin directories.
-
-            2. Specify the full path name of the `install-sh' program
-               as the value of the INSTALL environment variable. Note: do
-               not use `cp' or some other program in place of install
-               because the HDF5 makefiles also use the install program to
-               change file ownership and/or access permissions.
-
-4.3.7. Specifying other libraries and headers
-        Configure searches the standard places (those places known by the
-        systems compiler) for include files and header files. However,
-        additional directories can be specified by using the CPPFLAGS
-        and/or LDFLAGS variables:
-
-            $ CPPFLAGS=-I/home/robb/include \
+	The latest supported public release of HDF5 is available from
+	ftp://hdf.ncsa.uiuc.edu/HDF5/current/src.  For Unix platforms, it is
+	available in tar format compressed with gzip.  For Microsoft Windows,
+        it is in ZIP format.
+
+	The HDF team also makes snapshots of the source code available on
+	a regular basis. These snapshots are unsupported (that is, the
+	HDF team will not release a bug-fix on a particular snapshot;
+	rather any bug fixes will be rolled into the next snapshot).
+	Furthermore, the snapshots have only been tested on a few
+	machines and may not test correctly for parallel applications.
+	Snapshots can be found at
+	ftp://hdf.ncsa.uiuc.edu/pub/outgoing/hdf5/snapshots in a limited
+	number of formats.
+
+
+2. Warnings about compilers
+	OUTPUT FROM THE FOLLOWING COMPILERS SHOULD BE EXTREMELY SUSPECT
+	WHEN USED TO COMPILE THE HDF5 LIBRARY, ESPECIALLY IF
+	OPTIMIZATIONS ARE ENABLED. IN ALL CASES, HDF5 ATTEMPTS TO WORK
+	AROUND THE COMPILER BUGS BUT THE HDF5 DEVELOPMENT TEAM MAKES NO
+	GUARANTEES THAT THERE ARE OTHER CODE GENERATION PROBLEMS.
+
+2.1. GNU (Intel platforms)
+	Versions before 2.8.1 have serious problems allocating registers
+	when functions contain operations on `long long' data types.
+	Supplying the `--disable-hsizet' switch to configure (documented
+	below) will prevent hdf5 from using `long long' data types in
+	situations that are known not to work, but it limits the hdf5
+	address space to 2GB.
+
+2.2. COMPAQ/DEC
+	The V5.2-038 compiler (and possibly others) occasionally
+	generates incorrect code for memcpy() calls when optimizations
+	are enabled, resulting in unaligned access faults. HDF5 works
+	around the problem by casting the second argument to `char *'.
+        The fortran module (5.4.1a) fails in compiling some fortran
+        programs.  Need to use 5.5.0 or more.
+
+2.3. SGI (Irix64 6.2)
+	The Mongoose 7.00 compiler has serious optimization bugs and
+	should be upgraded to MIPSpro 7.2.1.2m. Patches are available
+	from SGI.
+
+2.4. Windows/NT
+	The MicroSoft Win32 5.0 compiler is unable to cast unsigned long
+	long values to doubles. HDF5 works around this bug by first
+	casting to signed long long and then to double.
+
+	A link warning: defaultlib "LIBC" conflicts with use of other libs
+	appears for debug version of VC++ 6.0. This warning will not affect
+	building and testing hdf5 libraries. 
+
+
+3. Quick installation
+	For those that don't like to read ;-) the following steps can be
+	used to configure, build, test, and install the HDF5 library,
+	header files, and support programs.
+
+	    $ gunzip < hdf5-1.6.0.tar.gz | tar xf -
+	    $ cd hdf5-1.6.0
+	    $ make check
+	    $ make install
+
+3.1. Windows
+	Users of Microsoft Windows should see the INSTALL_Windows for
+	detailed instructions.
+
+3.2. RedStorm (Cray Xt3)
+	Users of the Red Storm machine, after reading this file, should read
+	the Red Storm section in the INSTALL_parallel file for specific
+	instructions for the Red Storm machine.  The same instructions would
+	probably work for other Cray XT3 systems but they have not been
+	verified.
+
+
+4. HDF5 dependencies
+4.1. Zlib
+	The HDF5 library has a predefined compression filter that uses
+	the "deflate" method for chunked datatsets. If zlib-1.1.2 or
+	later is found then HDF5 will use it, otherwise HDF5's predefined
+	compression method will degenerate to a no-op (the compression
+	filter will succeed but the data will not be compressed).
+
+4.2. Szip
+	The HDF5 library has a predefined compression filter that uses
+	the extended-Rice lossless compression algorithm for chunked 
+        datatsets. For more information about Szip compression and license terms
+        see http://hdf.ncsa.uiuc.edu/HDF5/doc_resource/SZIP/index.html.
+        Precompiled szip binaries for each supported platform and source tar ball
+        file can be found at ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/
+
+4.3. MPI and MPI-IO
+	The parallel version of the library is built upon the foundation
+	provided by MPI and MPI-IO. If these libraries are not available
+	when HDF5 is configured then only a serial version of HDF5 can be
+	built.
+
+
+5. Full installation instructions for source distributions
+5.1. Unpacking the distribution
+	The HDF5 source code is distributed in a variety of formats which
+	can be unpacked with the following commands, each of which
+	creates an `hdf5-1.6.0' directory.
+
+5.1.1. Non-compressed tar archive (*.tar)
+
+	    $ tar xf hdf5-1.6.0.tar
+
+5.1.2. Compressed tar archive (*.tar.Z)
+
+	    $ uncompress -c < hdf5-1.6.0.tar.Z | tar xf -
+
+5.1.3. Gzip'd tar archive (*.tar.gz)
+
+	    $ gunzip < hdf5-1.6.0.tar.gz | tar xf -
+
+5.1.4. Bzip'd tar archive (*.tar.bz2)
+
+	    $ bunzip2 < hdf5-1.6.0.tar.bz2 | tar xf -
+
+5.2. Source vs. Build Directories
+	On most systems the build can occur in a directory other than the
+	source directory, allowing multiple concurrent builds and/or
+	read-only source code. In order to accomplish this, one should
+	create a build directory, cd into that directory, and run the
+	`configure' script found in the source directory (configure
+	details are below).
+
+	Unfortunately, this does not work on recent Irix platforms (6.5?
+	and later) because that `make' doesn't understand the VPATH
+	variable. However, hdf5 also supports Irix `pmake' which has a
+	.PATH target which serves a similar purpose. Here's what the man
+	pages say about VPATH, which is the facility used by HDF5
+	makefiles for this feature:
+
+		The VPATH facility is a derivation of the undocumented
+		VPATH feature in the System V Release 3 version of make.
+		System V Release 4 has a new VPATH implementation, much
+		like the pmake(1) .PATH feature. This new feature is also
+		undocumented in the standard System V Release 4 manual
+		pages.  For this reason it is not available in the IRIX
+		version of make. The VPATH facility should not be used
+		with the new parallel make option.
+
+5.3. Configuring
+	HDF5 uses the GNU autoconf system for configuration, which
+	detects various features of the host system and creates the
+	Makefiles. On most systems it should be sufficient to say:
+
+	    $ ./configure		OR
+	    $ sh configure
+
+	The configuration process can be controlled through environment
+	variables, command-line switches, and host configuration files.
+	For a complete list of switches type:
+
+	    $ ./configure --help
+
+	The host configuration files are located in the `config'
+	directory and are based on architecture name, vendor name, and/or
+	operating system which are displayed near the beginning of the
+	`configure' output. The host config file influences the behavior
+	of configure by setting or augmenting shell variables.
+
+5.3.1. Specifying the installation directories
+	Typing `make install' will install the HDF5 library, header
+	files, examples, and support programs in /usr/local/lib,
+	/usr/local/include, /usr/local/doc/hdf5/examples, and 
+        /usr/local/bin. To use a path other than
+	/usr/local specify the path with the `--prefix=PATH' switch:
+
+	    $ ./configure --prefix=$HOME
+
+	If shared libraries are being built (the default) then the final
+	home of the shared library must be specified with this switch
+	before the library and executables are built.
+
+	HDF5 can be installed into a different location than the prefix
+	specified at configure time; see the section on Installing HDF5
+	for more details.
+
+5.3.2. Using an alternate C compiler
+	By default, configure will look for the C compiler by trying
+	`gcc' and `cc'. However, if the environment variable "CC" is set
+	then its value is used as the C compiler (users of csh and
+	derivatives will need to prefix the commands below with `env').
+	For instance, to use the native C compiler on a system which also
+	has the GNU gcc compiler:
+
+	    $ CC=cc ./configure
+
+	A parallel version of hdf5 can be built by specifying `mpicc'
+	as the C compiler (the `--enable-parallel' flag documented
+	below is optional in this case).  Using the `mpicc' compiler
+	will insure that the correct MPI and MPI-IO header files and
+	libraries are used.
+
+	    $ CC=/usr/local/mpi/bin/mpicc ./configure
+
+5.3.3. Configuring for 64-bit support
+	Several machine architectures support 32-bit or 64-bit binaries.
+	The options below describe how to enable support for different options.
+
+	On Irix64 the default compiler is `cc'. To use an alternate
+	compiler specify it with the CC variable:
+
+	    $ CC='cc -n32' ./configure
+
+	Similarly, users compiling on a Solaris machine and desiring to
+	build the distribution with 64-bit support should specify the
+	correct flags with the CC variable:
+
+	    $ CC='cc -xarch=v9' ./configure
+
+	To configure AIX 64-bit support including fortran API and C++,
+	(Note: need to set $AR to 'ar -X 64'.)
+	Serial:
+	    $ CFLAGS=-q64 FFLAGS=-q64 CXXFLAGS=-q64 AR='ar -X 64'\
+	    $ ./configure --enable-fortran
+	Parallel: (C++ not supported with parallel)
+	    $ CFLAGS=-q64 FFLAGS=-q64 AR='ar -X 64'\
+	    $ ./configure --enable-fortran
+
+5.3.4. Additional compilation flags
+	If addtional flags must be passed to the compilation commands
+	then specify those flags with the CFLAGS variable. For instance,
+	to enable symbolic debugging of a production version of HDF5 one
+	might say:
+
+	    $ CFLAGS=-g ./configure --enable-production
+
+5.3.5. Compiling HDF5 wrapper libraries
+	One can optionally build the Fortran and/or C++ interface to the
+	HDF5 C library. By default, both options are disabled. To build
+	them, specify `--enable-fortran' and `--enable-cxx' respectively.
+
+	    $ ./configure --enable-fortran
+	    $ ./configure --enable-cxx
+	
+	Configuration will halt if a working Fortran 90 or 95 compiler or
+	C++ compiler is not found. Currently, the Fortran configure tests
+	for these compilers in order: f90, pgf90, f95. To use an
+	alternative compiler specify it with the F9X variable:
+
+	    $ F9X=/usr/local/bin/g95 ./configure --enable-fortran
+
+	Note: The Fortran and C++ interfaces are not supported on all the
+	platforms the main HDF5 library supports. Also, the Fortran
+	interface supports parallel HDF5 while the C++ interface does
+	not.
+
+        Note:  On Cray T3Es the following files should be modified before
+               building the Fortran Library:
+                 fortran/src/H5Dff.f90
+                 fortran/src/H5Aff.f90
+                 fortran/src/H5Pff.f90
+               Check for "Comment if on T3E ..." comment and comment out 
+               specified lines or use a patch from HDF FTP server
+               ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/
+
+        Note: See sections 5.7 and 5.8 for how to build Fortran Library with
+              PGI or Intel compilers. 
+
+5.3.6. Specifying other programs
+	The build system has been tuned for use with GNU make but works
+	also with other versions of make.  If the `make' command runs a
+	non-GNU version but a GNU version is available under a different
+	name (perhaps `gmake') then HDF5 can be configured to use it by
+	setting the MAKE variable. Note that whatever value is used for
+	MAKE must also be used as the make command when building the
+	library:
+
+	    $ MAKE=gmake ./configure
+	    $ gmake
+
+	The `AR' and `RANLIB' variables can also be set to the names of
+	the `ar' and `ranlib' (or `:') commands to override values
+	detected by configure.
+
+	The HDF5 library, include files, and utilities are installed
+	during `make install' (described below) with a BSD-compatible
+	install program detected automatically by configure. If none is
+	found then the shell script bin/install-sh is used. Configure
+	doesn't check that the install script actually works, but if a
+	bad install is detected on your system (e.g., on the ASCI blue
+	machine as of March 2, 1999) you have two choices:
+
+	    1. Copy the bin/install-sh program to your $HOME/bin
+	       directory, name it `install', and make sure that $HOME/bin
+	       is searched before the system bin directories.
+
+	    2. Specify the full path name of the `install-sh' program
+	       as the value of the INSTALL environment variable. Note: do
+	       not use `cp' or some other program in place of install
+	       because the HDF5 makefiles also use the install program to
+	       also change file ownership and/or access permissions.
+
+5.3.7. Specifying other libraries and headers
+	Configure searches the standard places (those places known by the
+	systems compiler) for include files and header files. However,
+	additional directories can be specified by using the CPPFLAGS
+	and/or LDFLAGS variables:
+
+	    $ CPPFLAGS=-I/home/robb/include \
               LDFLAGS=-L/home/robb/lib \
-              ./configure
-
-        HDF5 uses the zlib library for two purposes: it provides support
-        for the HDF5 deflate data compression filter, and it is used by
-        the h5toh4 converter and  the h4toh5 converter in support of
-        HDF4. Configure searches the standard places (plus those specified 
-        above with the CPPFLAGS and LDFLAGS variables) for the zlib
-        headers and library. The search can be disabled by specifying
-        `--without-zlib' or alternate directories can be specified with
-        `--with-zlib=INCDIR,LIBDIR' or through the CPPFLAGS and LDFLAGS
-        variables:
-
-            $ ./configure --with-zlib=/usr/unsup/include,/usr/unsup/lib
-
-            $ CPPFLAGS=-I/usr/unsup/include \
-              LDFLAGS=-L/usr/unsup/lib \
-              ./configure
-
-        The HDF5-to-HDF4 and HDF4-to-HDF5 conversion tool requires the
-        HDF4 library and header files, which are detected the same way as
-        zlib. The switch to give to configure is `--with-hdf4'.  Note
-        that HDF5 requires a newer version of zlib than the one shipped
-        with some versions of HDF4. Also, unless you have the "correct"
-        version of HDF4, the confidence testing will fail in the tools
-        directory.
-
-        HDF5 includes Szip as a predefined compression method (see 3.2).  
-        To enable Szip compression, the HDF5 Library must be configured 
-        and built using the Szip Library:
-
-            $ ./configure --with-szlib=/Szip_Install_Directory
-
-4.3.8. Static versus shared linking
-        The build process will create static libraries on all systems and
-        shared libraries on systems that support dynamic linking to a
-        sufficient degree. Either form of the library may be suppressed by
-        saying `--disable-static' or `--disable-shared'.
-
-            $ ./configure --disable-shared
-
-        Shared C++ and Fortran libraries will be built if shared libraries
-        are enabled.
-
-        To build only statically linked executables on platforms which
-        support shared libraries, use the `--enable-static-exec' flag.
-
-            $ ./configure --enable-static-exec
-
-4.3.9. Optimization versus symbolic debugging
-        The library can be compiled to provide symbolic debugging support
-        so it can be debugged with gdb, dbx, ddd, etc., or it can be
-        compiled with various optimizations. To compile for symbolic
-        debugging (the default for snapshots), say `--disable-production';
-        to compile with optimizations (the default for supported public
-        releases), say `--enable-production'. On some systems the library
-        can also be compiled for profiling with gprof by saying
-        `--enable-production=profile'.
-
-            $ ./configure --disable-production         #symbolic debugging
-            $ ./configure --enable-production          #optimized code
-            $ ./configure --enable-production=profile  #for use with gprof
-
-        Regardless of whether support for symbolic debugging is enabled,
-        the library can also perform runtime debugging of certain packages 
-        (such as type conversion execution times and extensive invariant 
-        condition checking). To enable this debugging, supply a
-        comma-separated list of package names to to the `--enable-debug'
-        switch.  See "Debugging HDF5 Applications" for a list of package 
-        names:
-
-            http://www.hdfgroup.org/HDF5/doc/H5.user/Debugging.html
-
-        Debugging can be disabled by saying `--disable-debug'. 
-        The default debugging level for snapshots is a subset of the
-        available packages; the default for supported releases is no
-        debugging (debugging can incur a significant runtime penalty).
-
-            $ ./configure --enable-debug=s,t  #debug only H5S and H5T
-            $ ./configure --enable-debug      #debug normal packages
-            $ ./configure --enable-debug=all  #debug all packages
-            $ ./configure --disable-debug     #no debugging
-
-        HDF5 can also print a trace of all API function calls, their 
-        arguments, and the return values. To enable or disable the
-        ability to trace the API say `--enable-trace' (the default for
-        snapthots) or `--disable-trace' (the default for public releases). 
-        The tracing must also be enabled at runtime to see any output 
-        (see "Debugging HDF5 Applications," reference above).
-
-4.3.10. Parallel versus serial library
-        The HDF5 Library can be configured to use MPI and MPI-IO for
-        parallelism on a distributed multi-processor system.  Read the
-        file INSTALL_parallel for detailed explanations.
-
-4.3.11. Threadsafe capability
-        The HDF5 Library can be configured to be thread-safe (on a very
-        large scale) with the `--enable-threadsafe' flag to the configure
-        script.  Some platforms may also require the '-with-pthread=INC,LIB'
-        (or '--with-pthread=DIR') flag to the configure script.
-        For further details, see "HDF5 Thread Safe Library":
-
-            http://www.hdfgroup.org/HDF5/doc/TechNotes/ThreadSafeLibrary.html
-
-4.3.12. Backward compatibility
-        The 1.8 version of the HDF5 Library can be configured to operate
-        identically to the v1.6 library with the 
-            --with-default-api-version=v16
-        configure flag. This allows existing code to be compiled with the
-        v1.8 library without requiring immediate changes to the application 
-        source code.  For addtional configuration options and other details, 
-        see "API Compatibility Macros in HDF5":
-
-            http://www.hdfgroup.org/HDF5/doc/RM/APICompatMacros.html 
-
-4.4. Building
-        The library, confidence tests, and programs can be built by
-        saying just:
-
-            $ make
-
-        Note that if you have supplied some other make command via the MAKE
-        variable during the configuration step, that same command must be
-        used here.
-
-        When using GNU make, you can add `-j -l6' to the make command to
-        compile in parallel on SMP machines. Do not give a number after
-        the `-j' since GNU make will turn it off for recursive invocations
-        of make.
-
-            $ make -j -l6
-
-4.5. Testing
-        HDF5 comes with various test suites, all of which can be run by
-        saying
-
-            $ make check
-
-        To run only the tests for the library, change to the `test'
-        directory before issuing the command. Similarly, tests for the
-        parallel aspects of the library are in `testpar' and tests for
-        the support programs are in `tools'.
-
-        The `check' consists of two sub-tests, check-s and check-p, which
-        are for serial and parallel tests, respectively.  Since serial tests
-        and parallel tests must be run with single and multiple processes
-        respectively, the two sub-tests work nicely for batch systems in
-        which the number of processes is fixed per batch job.  One may submit
-        one batch job, requesting 1 process, to run all the serial tests by
-        "make check-s"; and submit another batch job, requesting multiple
-        processes, to run all the parallel tests by "make check-p".
-
-        Temporary files will be deleted by each test when it completes,
-        but may continue to exist in an incomplete state if the test
-        fails. To prevent deletion of the files, define the HDF5_NOCLEANUP
-        environment variable.
-
-        The HDF5 tests can take a long time to run on some systems.  To perform
-        a faster (but less thorough) test, set the HDF5TestExpress environment
-        variable to 2 or 3 (with 3 being the shortest run).  To perform a
-        longer test, set HDF5TestExpress to 0.  1 is the default.
-
-4.6. Installing HDF5
-        The HDF5 Library, include files, and support programs can be
-        installed in a (semi-)public place by saying `make install'. The
-        files are installed under the directory specified with
-        `--prefix=DIR' (default is 'hdf5') in directories named `lib',
-        `include', and `bin'. The directories, if not existing, will be
-        created automatically, provided the mkdir command supports the -p
-        option.
-
-        If `make install' fails because the install command at your site
-        somehow fails, you may use the install-sh that comes with the
-        source. You will need to run ./configure again.
+	      ./configure
+
+	HDF5 uses the zlib library for two purposes: it provides support
+	for the HDF5 deflate data compression filter, and it is used by
+	the h5toh4 converter and  the h4toh5 converter in support of
+	HDF4. Configure searches the standard places (plus those
+	specified above with CPPFLAGS and LDFLAGS variables) for the zlib
+	headers and library. The search can be disabled by specifying
+	`--without-zlib' or alternate directories can be specified with
+	`--with-zlib=INCDIR,LIBDIR' or through the CPPFLAGS and LDFLAGS
+	variables:
+
+	    $ ./configure --with-zlib=/usr/unsup/include,/usr/unsup/lib
+
+	    $ CPPFLAGS=-I/usr/unsup/include \
+	      LDFLAGS=-L/usr/unsup/lib \
+	      ./configure
+
+	The HDF5-to-HDF4 and HDF4-to-HDF5 conversion tool requires the
+	HDF4 library and header files which are detected the same way as
+	zlib. The switch to give to configure is `--with-hdf4'.  Note
+	that HDF5 requires a newer version of zlib than the one shipped
+	with some versions of HDF4. Also, unless you have the "correct"
+	version of hdf4 the confidence testing will fail in the tools
+	directory.
+
+	HDF5 has Szip predefined compression method (see 4.2).  To enable
+	Szip compression, HDF5 library has to be configured and build using 
+	Szip Library
+
+        $ ./configure --with-szlib=/Szip_Install_Directory
+
+5.3.8. Static versus shared linking
+	The build process will create static libraries on all systems and
+	shared libraries on systems that support dynamic linking to a
+	sufficient degree. Either form of library may be suppressed by
+	saying `--disable-static' or `--disable-shared'.
+
+	    $ ./configure --disable-shared
+
+	Shared C++ and Fortran libraries will be built if shared libraries
+	are enabled.
+
+	To build only statically linked executables on platforms which
+	support shared libraries, use the `--enable-static-exec' flag.
+
+	    $ ./configure --enable-static-exec
+
+5.3.9. Optimization versus symbolic debugging
+	The library can be compiled to provide symbolic debugging support
+	so it can be debugged with gdb, dbx, ddd, etc or it can be
+	compiled with various optimizations. To compile for symbolic
+	debugging (the default for snapshots) say `--disable-production';
+	to compile with optimizations (the default for supported public
+	releases) say `--enable-production'. On some systems the library
+	can also be compiled for profiling with gprof by saying
+	`--enable-production=profile'.
+
+	    $ ./configure --disable-production         #symbolic debugging
+	    $ ./configure --enable-production          #optimized code
+	    $ ./configure --enable-production=profile  #for use with gprof
+
+	Regardless of whether support for symbolic debugging is enabled,
+	the library also is able to perform runtime debugging of certain
+	packages (such as type conversion execution times, and extensive
+	invariant condition checking). To enable this debugging supply a
+	comma-separated list of package names to to the `--enable-debug'
+	switch (see Debugging.html for a list of package names).
+	Debugging can be disabled by saying `--disable-debug'. The
+	default debugging level for snapshots is a subset of the
+	available packages; the default for supported releases is no
+	debugging (debugging can incur a significant runtime penalty).
+
+	    $ ./configure --enable-debug=s,t  #debug only H5S and H5T
+	    $ ./configure --enable-debug      #debug normal packages
+	    $ ./configure --enable-debug=all  #debug all packages
+	    $ ./configure --disable-debug     #no debugging
+
+	HDF5 is also able to print a trace of all API function calls,
+	their arguments, and the return values. To enable or disable the
+	ability to trace the API say `--enable-trace' (the default for
+	snapthots) or `--disable-trace' (the default for public
+	releases). The tracing must also be enabled at runtime to see any
+	output (see Debugging.html).
+
+5.3.10. Large (>2GB) vs. small (<2GB) file capability
+	In order to read or write files that could potentially be larger
+	than 2GB it is necessary to use the non-ANSI `long long' data
+	type on some platforms. However, some compilers (e.g., GNU gcc
+	versions before 2.8.1 on Intel platforms) are unable to produce
+	correct machine code for this data type. To disable use of the
+	`long long' type on these machines say:
+
+	    $ ./configure --disable-hsizet
+
+5.3.11. Parallel vs. serial library
+	The HDF5 library can be configured to use MPI and MPI-IO for
+	parallelizm on a distributed multi-processor system.  Read the
+	file INSTALL_parallel for detailed explanations.
+
+5.3.12. Threadsafe capability
+	The HDF5 library can be configured to be thread-safe (on a very
+	large scale) with the with the `--enable-threadsafe' flag to
+	the configure script.  Some platforms may also require the 
+	'-with-pthread=INC,LIB' (or '--with-pthread=DIR') flag to the configure
+	script as well.  Read the file doc/TechNotes/ThreadSafeLibrary.html
+	for further details.
+
+5.3.13. Backward compatibility
+	The 1.8 version of the HDF5 library can be configured to operate
+	identically to the v1.6 library with the `--enable-hdf5v1_6'
+	configure flag. This allows existing code to be compiled with the
+	v1.8 library without requiring immediate changes to the
+	application source code. This flag will only be supported in the
+	v1.8 branch of the library, it will not be available in v1.9+.
+
+5.3.14. Network stream capability
+	The HDF5 library can be configured with a network stream file
+	driver with the `--enable-stream-vfd' configure flag. This option
+	compiles the "stream" Virtual File Driver into the main library.
+	See the documentation on the Virtual File Layer for more details
+	about the use of this driver.  The network stream capability is
+	enabled by default, except for use in parallel or with a parallel
+        compiler, where it is disabled. Explicitly enabling Stream-VFD
+        will allow for its use in parallel.
+
+5.4. Building
+	The library, confidence tests, and programs can be build by
+	saying just:
+
+	    $ make
+
+	Note that if you supplied some other make command via the MAKE
+	variable during the configuration step then that same command
+	must be used here.
+
+	When using GNU make you can add `-j -l6' to the make command to
+	compile in parallel on SMP machines. Do not give a number after
+	th `-j' since GNU make will turn it off for recursive invocations
+	of make.
+
+	    $ make -j -l6
+
+5.5. Testing
+	HDF5 comes with various test suites, all of which can be run by
+	saying
+
+	    $ make check
+
+	To run only the tests for the library change to the `test'
+	directory before issuing the command. Similarly, tests for the
+	parallel aspects of the library are in `testpar' and tests for
+	the support programs are in `tools'.
+
+	Temporary files will be deleted by each test when it complets,
+	but may continue to exist in an incomplete state if the test
+	fails. To prevent deletion of the files define the HDF5_NOCLEANUP
+	environment variable.
+
+        The HDF5 tests can take a long time to run on some systems.  To
+        perform a faster (but less thorough) test, set the HDF5TestExpress
+        environment variable to 2 or 3 (with 3 being the shortest run).
+        To perform a longer test, set HDF5TestExpress to 0.  1 is the default.
+
+5.6. Installing
+	The HDF5 library, include files, and support programs can be
+	installed in a (semi-)public place by saying `make install'. The
+	files are installed under the directory specified with
+	`--prefix=DIR' (or '/usr/local') in directories named `lib',
+	`include', and `bin'. The prefix directory must exist prior to
+	`make install', but its subdirectories are created automatically.
+
+	If `make install' fails because the install command at your site
+	somehow fails, you may use the install-sh that comes with the
+	source. You need to run ./configure again.
 
             $ INSTALL="$PWD/bin/install-sh -c" ./configure ...
             $ make install
 
-        If you want to install HDF5 in a location other than the location
-        specified by the `--prefix=DIR' flag during configuration (or
-        instead of the default location, `hdf5'), you can do that
-        by running the deploy script:
+	If you want to install HDF5 in a location other than the location
+	specified by the `--prefix=DIR' flag during configuration (or
+	instead of the default location, `/usr/local'), you can do that
+	by running the deploy script:
 
             $ bin/deploy NEW_DIR
 
-        This will install HDF5 in NEW_DIR.  Alternately, you can do this
-        manually by issuing the command:
+	This will install hdf5 in NEW_DIR.  Alternately, you can do this
+	manually by issuing the command:
 
-            $ make install prefix=NEW_DIR
+	    $ make install prefix=NEW_DIR
 
-        where NEW_DIR is the new directory where you wish to install HDF5. 
-        If you do not use the deploy script, you should run h5redeploy in
-        NEW_DIR/bin directory.  This utility will fix the h5cc, h5fc and
-        h5c++ scripts to reflect the new NEW_DIR location.
+	where NEW_DIR is the new directory you wish to install HDF5. If
+	you do not use the deploy script, you should run h5redeploy in
+	NEW_DIR/bin directory.  This utility will fix h5cc, h5fc and
+	h5c++ scripts to reflect the new NEW_DIR location.
 
-        The library can be used without installing it by pointing the
-        compiler at the `src' and 'src/.libs' directory for include files and
-        libraries. However, the minimum which must be installed to make
-        the library publicly available is:
+	The library can be used without installing it by pointing the
+	compiler at the `src' and 'src/.libs' directory for include files and
+	libraries. However, the minimum which must be installed to make
+	the library publically available is:
 
-            The library:
-                ./src/.libs/libhdf5.a
+	    The library:
+		./src/.libs/libhdf5.a
 
-            The public header files:
-                ./src/H5*public.h, ./src/H5public.h
+	    The public header files:
+		./src/H5*public.h, ./src/H5public.h
                 ./src/H5FD*.h except ./src/H5FDprivate.h,
                 ./src/H5api_adpt.h
 
-            The main header file:
-                ./src/hdf5.h
-
-            The configuration information:
-                ./src/H5pubconf.h
-        
-            The support programs that are useful are:
-            ./tools/h5ls/h5ls               (list file contents)
-            ./tools/h5dump/h5dump           (dump file contents)
-            ./tools/misc/h5repart           (repartition file families)
-            ./tools/misc/h5debug            (low-level file debugging)
-            ./tools/h5import/h5import       (imports data to HDF5 file)
-            ./tools/h5diff/h5diff           (compares two HDF5 files)
-            ./tools/gifconv/h52gif          (HDF5 to GIF converter) 
-            ./tools/gifconv/gif2h5          (GIF to HDF5 converter)
+	    The main header file:
+		./src/hdf5.h
 
+	    The configuration information:
+		./src/H5pubconf.h
+	
+    	The support programs that are useful are:
+	    ./tools/h5ls/h5ls		(list file contents)
+	    ./tools/h5dump/h5dump	(dump file contents)
+	    ./tools/misc/h5repart	(repartition file families)
+	    ./tools/misc/h5debug	(low-level file debugging)
+	    ./tools/h5import/h5import	(imports data to HDF5 file)
+            ./tools/h5diff/h5diff       (compares two HDF5 files)
+            ./tools/gifconv/h52gif	(HDF5 to GIF converter) 
+            ./tools/gifconv/gif2h5      (GIF to HDF5 converter)
 
-5. Using the Library
-        Please see the "HDF5 User's Guide" and the "HDF5 Reference Manual":
+5.7  Building and testing with Intel compilers
 
-            http://www.hdfgroup.org/HDF5/doc/
 
-        Most programs will include <hdf5.h> and link with -lhdf5.
-        Additional libraries may also be necessary depending on whether
-        support for compression, etc., was compiled into the HDF5 Library.
+     When Intel compilers are used (icc or ecc), you will need to 
+     modify the generated "libtool" program after configuration is finished.
+     On or around line 104 of the libtool file, there are lines which 
+     look like:
 
-        A summary of the HDF5 installation can be found in the
-        libhdf5.settings file in the same directory as the static and/or
-        shared HDF5 Libraries.
+          # How to pass a linker flag through the compiler.
+          wl=""
 
+      Change these lines to this:
 
-6. Support
-        Support is described in the README file.
+          # How to pass a linker flag through the compiler.
+          wl="-Wl,"
 
+      UPDATE: This is now done automatically by the configure script. However,
+      if you still experience a problem, you may want to check this line in
+      the libtool file and make sure that it has the correct value.
 
-*****************************************************************************
-			    APPENDIX
-*****************************************************************************
+    * To build the Fortran library using Intel compiler on Linux 2.4, one has to 
+          x Use -fpp -DDEC$=DEC_ -DMS$=MS_ compiler flags to disable
+            DEC and MS compiler directives in source files in fortran/src, fortran/test 
+            and fortran/examples directories.
+	    e.g., setenv F9X 'ifc -fpp -DDEC$=DEC_ -DMS$=MS_'
+	    (do not use double quotes since $ is interpreted in them.)
 
-A. Warnings about compilers
-        Output from the following compilers should be extremely suspected
-        when used to compile the HDF5 Library, especially if optimizations are
-        enabled. In all cases, HDF5 attempts to work around the compiler bugs.
-
-A.1. GNU (Intel platforms)
-        Versions before 2.8.1 have serious problems allocating registers
-        when functions contain operations on `long long' datatypes.
-        Supplying the `--disable-hsizet' switch to configure (documented
-        in Appendix B, "Large (>2GB) versus small (<2GB) file capability,")
-        will prevent HDF5 from using `long long' datatypes in
-        situations that are known not to work, but it limits the HDF5
-        address space to 2GB.
-
-A.2. COMPAQ/DEC
-        The V5.2-038 compiler (and possibly others) occasionally
-        generates incorrect code for memcpy() calls when optimizations
-        are enabled, resulting in unaligned access faults. HDF5 works
-        around the problem by casting the second argument to `char *'.
-        The Fortran module (5.4.1a) fails in compiling some Fortran
-        programs.  Use 5.5.0 or higher.
-
-A.3. SGI (Irix64 6.2)
-        The Mongoose 7.00 compiler has serious optimization bugs and
-        should be upgraded to MIPSpro 7.2.1.2m. Patches are available
-        from SGI.
-
-A.4. Windows/NT
-        The Microsoft Win32 5.0 compiler is unable to cast unsigned long
-        long values to doubles. HDF5 works around this bug by first
-        casting to signed long long and then to double.
-
-        A link warning: defaultlib "LIBC" conflicts with use of other libs
-        appears for debug version of VC++ 6.0. This warning will not affect
-        building and testing HDF5 Libraries. 
-
-
-B. Large (>2GB) versus small (<2GB) file capability
-        In order to read or write files that could potentially be larger
-        than 2GB, it is necessary to use the non-ANSI `long long' data
-        type on some platforms. However, some compilers (e.g., GNU gcc
-        versions before 2.8.1 on Intel platforms) are unable to produce
-        correct machine code for this datatype. To disable use of the
-        `long long' type on these machines, say:
-
-            $ ./configure --disable-hsizet
-
-C. Building and testing with other compilers
-C.1.  Building and testing with Intel compilers
-        When Intel compilers are used (icc or ecc), you will need to modify
-        the generated "libtool" program after configuration is finished.
-        On or around line 104 of the libtool file, there are lines which 
-        look like:
-
-            # How to pass a linker flag through the compiler.
-            wl=""
-
-        Change these lines to this:
-
-            # How to pass a linker flag through the compiler.
-            wl="-Wl,"
-
-        UPDATE: This is now done automatically by the configure script. 
-        However, if you still experience a problem, you may want to check this 
-        line in the libtool file and make sure that it has the correct value.
-
-      * To build the Fortran library using Intel compiler on Linux 2.4, 
-        one has to perform the following steps:
-          x Use the -fpp -DDEC$=DEC_ -DMS$=MS_ compiler flags to disable
-            DEC and MS compiler directives in source files in the fortran/src, 
-            fortran/test, and fortran/examples directories.
-            E.g.,  setenv F9X 'ifc -fpp -DDEC$=DEC_ -DMS$=MS_'
-            Do not use double quotes since $ is interpreted in them.
-
-          x If Version 6.0 of Fortran compiler is used, the build fails in 
-            the fortran/test directory and then in the fortran/examples 
-            directory.  To proceed, edit the work.pcl files in those 
-            directories to contain two lines:
+          x If Version 6.0 of Fortran compiler is used, build fails in 
+            the fortran/test directory and then in the
+            fortran/examples directory; to proceed, edit the work.pcl files in
+            those directories to contain two lines
 
                     work.pc
                     ../src/work.pc 
 
-          x Do the same in the fortran/examples directory.
+          x Do the same in fortran/examples directory
+          x Problem with work.pc files was resolved for newest version of the compiler (7.0)
+
+    * To build the Fortran Library on IA32 follow step described above, except 
+      that DEC and MS compiler directives should be removed manually or 
+      use a patch from HDF FTP server ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/
+
+
+5.8  Building and testing with PGI compilers
+     
+     When PGI C and C++ compilers are used (pgcc or pgCC), you will need to 
+     modify the generated "libtool" program after configuration is finished.
+     On or around line 104 of the libtool file, there are lines which 
+     look like:
 
-          x A problem with work.pc files was resolved for the newest version 
-            of the compiler (7.0).
+          # How to pass a linker flag through the compiler.
+          wl=""
 
-       * To build the Fortran library on IA32, follow the steps described 
-         above, except that the DEC and MS compiler directives should be 
-         removed manually or use a patch from HDF FTP server:
+      Change these lines to this:
 
-             ftp://ftp.hdfgroup.org/HDF5/current/
+          # How to pass a linker flag through the compiler.
+          wl="-Wl,"
 
+      UPDATE: This is now done automatically by the configure script. However,
+      if you still experience a problem, you may want to check this line in
+      the libtool file and make sure that it has the correct value.
 
-C.2.  Building and testing with PGI compilers
-        When PGI C and C++ compilers are used (pgcc or pgCC), you will need to 
-        modify the generated "libtool" program after configuration is finished.
-        On or around line 104 of the libtool file, there are lines which 
-        look like this:
+      To build HDF5 C++ Library with pgCC (version 4.0 and later), set
+      environment variable CXX to "pgCC -tlocal"
+         setenv CXX "pgCC -tlocal"
+      before running the configure script.
 
-            # How to pass a linker flag through the compiler.
-            wl=""
 
-        Change these lines to this:
+6. Using the Library
+	Please see the User Manual in the doc/html directory.
 
-            # How to pass a linker flag through the compiler.
-            wl="-Wl,"
+	Most programs will include <hdf5.h> and link with -lhdf5.
+	Additional libraries may also be necessary depending on whether
+	support for compression, etc. was compiled into the hdf5 library.
 
-        UPDATE: This is now done automatically by the configure script. However,
-        if you still experience a problem, you may want to check this line in
-        the libtool file and make sure that it has the correct value.
+	A summary of the hdf5 installation can be found in the
+	libhdf5.settings file in the same directory as the static and/or
+	shared hdf5 libraries.
 
-        To build the HDF5 C++ Library with pgCC (version 4.0 and later), set
-        the environment variable CXX to "pgCC -tlocal"
-            setenv CXX "pgCC -tlocal"
-        before running the configure script.
 
+7. Support
+	Support is described in the README file.
diff --git a/release_docs/INSTALL_Cygwin.txt b/release_docs/INSTALL_Cygwin.txt
index b63d294..0cb0968 100644
--- a/release_docs/INSTALL_Cygwin.txt
+++ b/release_docs/INSTALL_Cygwin.txt
@@ -98,7 +98,29 @@ Install HDF5 on Cygwin
 
             $ bunzip2 < hdf5-1.8.0.tar.bz2 | tar xf - 
             
-3. Configuring 
+3. Setup environment
+
+   In the latest version of the Cygwin DLL, a bug was introduced
+   relating to the 'timezone' global variable and C99 support. As
+   work-around, we must use a special compiler flag.
+
+      3.1. In the command prompt you plan to build from, run the 
+           command:
+
+               export CFLAGS="-ansi ${CFLAGS}"
+
+      3.2 (Optional) If you plan to build C++ libraries, also
+          run the command:
+
+               export CXXFLAGS="-ansi ${CXXFLAGS}"
+
+      3.3 (Optional) If you plan to build Fortran libraries, also
+          run the command:
+
+               export FCFLAGS="-ansi ${FCFLAGS}"
+
+
+4. Configuring 
      
    Notes: See detailed information in hdf5/release_docs/INSTALL, 
           part 5. Full installation instructions for source 
@@ -112,19 +134,19 @@ Install HDF5 on Cygwin
      
    In short,
      
-   3.1 To configure HDF5 C Library, using 
+   4.1 To configure HDF5 C Library, using 
             
             $ ./configure
                    
-   3.2 To configure HDF5 C/C++ Library, using
+   4.2 To configure HDF5 C/C++ Library, using
 
             $ ./configure --enable-cxx
                    
-   3.3 To configure HDF5 C/Fortran Library, using
+   4.3 To configure HDF5 C/Fortran Library, using
 
             $ ./configure --enable-fortran
                    
-   3.4 To configure HDF5 C with Szip library, using
+   4.4 To configure HDF5 C with Szip library, using
 
             $ ./configure  --with-szlib="path to szlib"
            
@@ -135,15 +157,15 @@ Install HDF5 on Cygwin
            
             $ ./configure --with-szlib=/cygdrive/c/szip
                    
-   3.5 To configure HDF5 C without Zlib,
+   4.5 To configure HDF5 C without Zlib,
      
        To disable zlib, using
 
            $ ./configure --without-zlib
            
-   3.6 Two ways to configure HDF5 C with specified Zlib
+   4.6 Two ways to configure HDF5 C with specified Zlib
      
-     3.6.1 Using
+     4.6.1 Using
 
            $ ./configure --with-zlib=INCDIR,LIBDIR
 
@@ -153,7 +175,7 @@ Install HDF5 on Cygwin
 
  $ ./configure --with-zlib=/cygdrive/c/usr/include,/cygdrive/c/usr/lib
 
-     3.6.2 Through the CPPFLAGS and LDFLAGS Variables
+     4.6.2 Through the CPPFLAGS and LDFLAGS Variables
            
        For example, if zlib was installed in the directory 
        /cygdrive/c/usr then using the following command to configure 
@@ -163,7 +185,7 @@ Install HDF5 on Cygwin
            $ LDFLAGS=-L/cygdrive/c/usr/lib \
            $ ./configure
 
-   3.7 To specify the installation directories, using 
+   4.7 To specify the installation directories, using 
 
             $ ./configure --prefix="path for installation"
                  
@@ -174,7 +196,7 @@ Install HDF5 on Cygwin
        the path with the `--prefix=PATH' switch as in the above
        command.
 
-   3.8 Combination of Switches 
+   4.8 Combination of Switches 
 
        All of the above switches can be combined together. For 
        example, if users want to configure HDF5 C/C++/Fortran 
@@ -209,7 +231,7 @@ Install HDF5 on Cygwin
              --enable-fortran 
              <"If no more switches, then hit Enter">
                           
-4. Make and Make Check
+5. Make and Make Check
 
    After configuration is done successfully, run the following series of
    commands to build, test and install HDF5
@@ -220,20 +242,23 @@ Install HDF5 on Cygwin
    Before run "make install", check output file for "make check", there
    should be no failures at all.
 
-5. Make Install
+6. Make Install
 
             $ make install  > "output file name"
    
      
-6. Check installed HDF5 library
+7. Check installed HDF5 library
 
    After step 4, go to your installation directory, there should be 
    three subdirectories: "bin" "include" and "lib".
 
-7. Known Problems 
+8. Known Problems 
    
    Shared libraries can not be built on Cygwin In release 1.8.0.
 
+   There are issues linking with the latest Cygwin DLL.  As a work-around,
+   make sure to follow the steps described in step 3 above.
+
 -----------------------------------------------------------------------
 
 Need Further assistance, email help@hdfgroup.org
diff --git a/release_docs/INSTALL_VMS.txt b/release_docs/INSTALL_VMS.txt
index 0245024..fd997c5 100644
--- a/release_docs/INSTALL_VMS.txt
+++ b/release_docs/INSTALL_VMS.txt
@@ -1,6 +1,6 @@
 		Building and installation instructions for Alpha Open VMS
                                   HDF5 1.8.0 release
-                                     February 12, 2008
+                                     January 2008
    
 
 
diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt
index 1facd81..daedadd 100644
--- a/release_docs/INSTALL_Windows.txt
+++ b/release_docs/INSTALL_Windows.txt
@@ -829,14 +829,20 @@ To build and test HDF5 High Level C examples:
           Select "Build" -> "Build Solution" or "Rebuild Solution" to build 
           release version of project "allhlcexamples".
 
-      When the debug and release build is done, binaries will be built in the
-      following subdirectories of c:\MyHDFstuff\hdf5\examples\
-
-          ex_image[1-2](dll)
-          ex_lite1(dll)
-          ex_table[01-12](dll)
-          ex_ds1(dll)
-          ptExample[FL+VL](dll)
+      When the debug and release build is done, there should be the following 
+      subdirectories in c:\MyHDFstuff\hdf5\examples\
+
+          allhlcexamples
+          ex_images
+          ex_imagesdll
+          ex_lite
+          ex_litedll
+          ex_table
+          ex_tabledll
+          ex_ds
+          ex_dsdll
+          ex_packet
+          ex_packetdll
 
    3. Invoke a command prompt and run the batch file Install_hlcexamples.bat 
       which resides in the top level directory (c:\MyHDFstuff\hdf5).  This file 
diff --git a/release_docs/INSTALL_parallel b/release_docs/INSTALL_parallel
index e8f8bad..b0e0a86 100644
--- a/release_docs/INSTALL_parallel
+++ b/release_docs/INSTALL_parallel
@@ -61,7 +61,7 @@ The "--enable-parallel" is optional in this case.
 Make sure your environment variables are set correctly to compile and execute
 a single process mpi applications for the SP machine. Unfortunately, the
 setting varies from machine to machine.  E.g., the following works for the
-IBM SP machine at LLNL.
+Blue machine of LLNL.
 
     setenv MP_PROCS     1
     setenv MP_NODES     1
@@ -102,7 +102,7 @@ This allows for >2GB sized files on Linux systems and is only available with
 Linux kernels 2.4 and greater.
 
 
-2.4. Red Storm (Cray XT3) (for v1.8 and later)
+2.4. Red Storm (Cray XT3) (for v1.8 only)
 -------------------------
 The following steps are for building the Parallel HDF5 for the Red Storm
 compute nodes.  They would probably work for other Cray XT3 systems but have
@@ -180,28 +180,15 @@ environment variable at the time `make check' is run (or the value 3).
 
 4. Parallel test suite
 ----------------------
-The testpar/ directory contains tests for Parallel HDF5 and MPI-IO.  Here are
-some notes about some of the tests.
-
-The t_mpi tests the basic functionalities of some MPI-IO features used by
-Parallel HDF5.  It usually exits with non-zero code if a required MPI-IO
-feature does not succeed as expected.  One exception is the testing of
-accessing files larger than 2GB.  If the underlying filesystem or if the
-MPI-IO library fails to handle file sizes larger than 2GB, the test will
-print informational messages stating the failure but will not exit with
-non-zero code.  Failure to support file size greater than 2GB is not a fatal
-error for HDF5 because HDF5 can use other file-drivers such as families of
-files to bypass the file size limit.
-
-The t_posix_compliant tests if the file system is POSIX compliant when POSIX
-and MPI IO APIs are used.  This is for information only and it always exits
-with 0 even when non-compliance errors have occurred.  This is to prevent
-the test from aborting the remaining parallel HDF5 tests unnecessarily.
-
-The t_cache does many small sized I/O requests and may not run well in a
-slow file system such as NFS disk. If it takes a long time to run it, try
-set the environment variable $HDF5_PARAPREFIX to a file system more suitable
-for MPI-IO requests before running t_cache.
+The testpar/ directory contains tests for Parallel HDF5 and MPI-IO.  The t_mpi
+tests the basic functionalities of some MPI-IO features used by Parallel HDF5.
+It usually exits with non-zero code if a required MPI-IO feature does not
+succeed as expected.  One exception is the testing of accessing files larger
+than 2GB.  If the underlying filesystem or if the MPI-IO library fails to
+handle file sizes larger than 2GB, the test will print informational messages
+stating the failure but will not exit with non-zero code.  Failure to support
+file size greater than 2GB is not a fatal error for HDF5 because HDF5 can
+use other file-drivers such as families of files to bypass the file size limit.
 
 By default, the parallel tests use the current directory as the test directory.
 This can be changed by the environment variable $HDF5_PARAPREFIX.  For example,
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 881865b..f1f58b6 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,20 +1,32 @@
-HDF5 version 1.9.5 currently under development
+HDF5 version 1.8.0 currently under development
 ================================================================================
 
 
 INTRODUCTION
 
-This document describes the differences between HDF5-1.9.0 and
-HDF5 1.9.x snapshot, and contains information on the platforms 
-tested and known problems in HDF5-1.9.x. 
-For more details check the HISTORY*.txt files in the HDF5 source.
+This document describes the differences between HDF5-1.6.* and
+Hdf5 1.8.0 release candidate "HDF5-1.8.0-rc*", and contains information 
+on the platforms tested and known problems in HDF5-1.8.0-rc*. 
+For more details check the HISTORY.txt file in the HDF5 source.
+
+
+Links to HDF5 1.8.0-rc* source code, documentation, and additional materials
+can be found on THG's development server (www.hdfgroup.uiuc.edu) at the
+following location:
+     http://www.hdfgroup.uiuc.edu/HDF5/release/beta/obtain518.html
+User documentation for the beta can be accessed directly at this location: 
+     http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/doc/
+
+New features of the upcoming 1.8.0 release are described in
+the "What's New in 1.8.0?" document:
+     http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/WhatsNew180.html
+
+New and modified APIs are described briefly in
+     http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/WhatsNew180.html
+and will be listed in the "HDF5 Software Changes" document:
+     http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/doc/ADGuide/Changes.html
 
 
-Links to HDF5 1.9.x source code can be found on THG's development 
-FTP server at the following location:
-     ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf5/snapshots
-User documentation for the snapshot can be accessed directly at this location: 
-     http://www.hdfgroup.uiuc.edu/HDF5/doc_dev_snapshot/H5_dev/
 
 For more information, see the HDF5 home page:
    
@@ -29,7 +41,7 @@ CONTENTS
 
 - New Features
 - Support for new platforms and languages
-- Bug Fixes since HDF5-1.8.0
+- Bug Fixes since HDF5-1.6.0
 - Platforms Tested
 - Known Problems
 
@@ -38,71 +50,940 @@ New Features
 ============
 
     Configuration:
-    -------------
+    --------------
+        - Removed stream-vfd from the HDF5 library. - AKC 2007/11/19.
+        - Updated versions of autotools. HDF5 now uses automake 1.10.0, 
+          autoconf 2.61, and libtool 1.5.22. MAM - 2007/7/25.
+        - Changed default fortran compiler to g95 when gcc is used. - AKC
+          2007/2/17.
+        - 'make check-vfd' can now be run from the top level directory. Not all
+          tests that 'make check' invokes work with certain Virtual File Drivers,
+          so those tests have been skipped. - MAM 2006/7/17  
+        - Added the variable HDF5TestExpress to control how long tests run.
+          Setting it to a value between 0 and 3 controls how thoroughly the
+          library is tested, with 0 being an "exhaustive run" and 3 being a
+          very quick "smoke test."  1 (a "full run") is the default.
+          -JML 2006/6/21
+        - If both shared and static libraries are installed, now both will be
+          tested during 'make install'. -MAM 2006/06/21
+        - Added support to explicity enable stream_vfd or shared libraries
+          when using parallel via the '--enable-stream_vfd' and
+          '--enable-shared' options, respectively. If not explicity defined, 
+          These settings default to enabled when parallel is not used, 
+          and disabled when parallel is used. -MAM 2006/06/17
+        - Remove the flexible parallel code and the --enable-fphdf5
+          configure option, it was never up to production standards
+          anyway.  -QAK 2006/4/20
+        - Added a macro hdf5_mpi_special_collective_io_works to filter out
+          some mpi-io packages that don't support collective IO for no IO
+          contributions in some processes. -KY 2006/2/16
+	- Added -shlib option to link against installed shared libraries to
+	  h5c++ and h5fc.  -JML 2005/11/1
+	- Added --enable-build-all option to configure, which only developers
+	  should need to use.  -JML 2005/10/24
+	- Configure uses the 'TR' variable to let the user override the path
+          to the 'tr' utility. -JML 2005/10/17
+	- Configure can recognize -lmpich as a form of MPI library. -AKC-
+	  2005/9/28.
+        - MD5 checksumming has been added to snapshot releases.  Release
+          tarballs will be accompanied by .md5 checksum files, which can
+          be verified using the md5sum utility.  -JML 2005/9/6
+        - Some configure flags are incompatible (e.g., the C++ APIs cannot
+          be built using the parallel version of HDF5).  configure will now
+          output errors when some common incompatible features are used
+          together.  -JML 2005/9/6
+        - A new API function, H5Tis_hard(), was added to the library.  It
+          checks if a conversion function is a compiler (hard) conversion.
+          SLU - 2005/9/6
+	- t_mpi will run the test_mpio_derived_dtype by default unless it is
+	  known not working (indicated by macro H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
+	  not defined.)  -AKC- 2005/8/23.
+	- Test execution has changed in a number of ways:
+	  When make is invoked in parallel (using -j), sequential tests
+	  are now executed as parallel make targets.  This should make them
+	  finish more quickly on machines with multiple processors.
+	  Since test output is garbled when they are executed by parallel make,
+	  tests now dump their output to foo.log files and foo.logsh files
+	  (for test scripts).  These logs are printed to the screen only
+	  when a test fails or when all tests in the current directory have
+	  completed successfully.
+	  When tests pass, they will create a foo.chkexe file.
+	  This prevents the test from executing again until the test or
+	  main library changes.
+	  All files generated by tests (*.chkexe, *.log, and any *.h5 files
+	  created) can be removed by invoking 'make check-clean'.
+	  Sequential and parallel library tests can now be invoked separately.
+	  'make check-s' will execute only sequential tests, and 'make check-p'
+	  will execute only parallel tests.  'make check' will still execute
+	  all tests.
+	    -JML 2005/08/03
+        - On windows, all.zip is deprecated. users should
+             read INSTALL_Windows.txt to know the details.
+             Reasons to deprecate all.zip:
+		1. Avoid confliction for windows programmers
+                2. Decrease size of CVS tree by adding all.zip
+	        3. Avoid using winzip as the intermediate step
+             --KY 2005/04/22
+	- When HDF5 is created as a shared library, it now uses libtool's
+	  shared library versioning scheme. -JML 2005/04/18
+	- HDF5 now uses automake 1.9.5 to generate Makefiles.in.
+	  This has a number of effects on users:
+          The Fortran compiler should be set using the environment
+          variable $FC, not $F9X.  F9X still works, but is depreciated.
+	  The output of make may be different.  This should be only a
+          cosmetic effect.
+	  make depened (or make dep) is no longer recognized, since automake
+	  handles dependency tracking.
+	  Some new configure options exist.  --enable-dependency-tracking
+          and --disable-dependency-tracking are used to control automake's
+	  dependency tracking.  Dependencies are on by default *on most
+	  platforms and compilers*.  If --enable-dependency-tracking is
+	  used, they will be enabled on any platform.  However, this can
+	  slow down builds or even cause build errors in some cases.
+	  Likewise, --disable-dependency-tracking can speed up builds and
+	  avoid some build errors.
+	  Some make targets have alternate names.  make check-install and
+	  make installcheck do the same thing, for instance.
+	  pmake on IRIX can be invoked from the root directory, but the
+	  -V flag must be used to invoke it in any subdirectory or it
+	  will give an error about undefined variables.
+	  JML 2005/01 - 2005/03
+        - Hardware conversion between long double and integers is also added.
+          SLU 2005/02/10
+        - Started to support software conversion between long double and 
+          integers.  Hardware conversion will come very soon.  SLU - 2005/1/6
+	- Intel v8.0 compiler would infinite loop when compiling some test
+	  code with -O3 option.  Changed enable-production default compiler
+	  option to -O2. AKC - 2004/12/06
+	- Long double is assumed to be a supported C data type.  It is a
+	  stanadard C89 type. AKC - 2004/10/22
+	- The IA64 will use ecc as the C++ compiler by default.
+        - Added some initial support for making valgrind/Purify (or similar
+            memory checking products) happier by initializing buffers to zero
+            and disabling the internal free list code.  To take advantage of
+            this, use the "--enable-using-memchecker" configure option when
+            building the library.  QAK - 2004/07/23
+        - Fixed the long compile time of H5detect.c when v7.x Intel Compiler
+	    is used with optimization NOT off.  AKC - 2004/05/20
+	- Fixed configure setting of C++ for OSF1 platform. AKC - 2004/01/06
+        - Prefix default is changed from /usr/local to `pwd`/hdf5.
+            AKC - 2003/07/09
 
     Library:
     --------
+       - Removed size restrictions on attributes, when using the "latest"
+            version of the file format. - QAK - 2007/02/21
+       - Relaxed restrictions on attribute operations to allow a file ID to
+            be used as the "location ID".  If a file ID is used, the attribute
+            operation will occur on the root group of the file.
+            - QAK - 2007/02/09
+       - Enabled the CORE driver to read an existing file depending on 
+            the setting of the backing_store for H5Pset_fapl_core and file 
+            open flags. - SLU - 2006/11/30
+       - Added new H5Gget_info_by_idx() routine to query the information about
+            a group according to the order within an index.
+            - QAK - 2006/11/27
+       - Added new H5Gget_info() routine to query the information about a
+            group by name.
+            - QAK - 2006/11/27
+       - Added new H5Oget_info_by_idx() routine to query the information about
+            an object in a group according to the order within an index.
+            - QAK - 2006/11/26
+       - Added new H5Oget_info() routine to query the information about an
+            object in a group by name.
+            - QAK - 2006/11/26
+       - Added new H5Oopen_by_idx() routine to open an object in a group
+            according to the order within an index.
+            - QAK - 2006/11/20
+       - Added new H5Literate() routine to iterate over links in a group
+            according to the order within an index.
+            - QAK - 2006/11/20
+       - Added new H5Ldelete_by_idx() routine to delete a link according to
+            the order within an index.
+            - QAK - 2006/11/13
+       - Added new H5Lget_val_by_idx() routine to query the value of a soft link
+            according to the order within an index.
+            - QAK - 2006/11/13
+       - Added new H5Lget_name_by_idx() routine to query the name of a link
+            according to the order within an index.
+            - QAK - 2006/11/12
+       - Added new H5Rget_name() routine to determine the name of the object
+            that a reference points to, as long as the object is still
+            reachable in the group hierarchy.
+            - QAK - 2006/11/10
+       - Added new H5Lget_info_by_idx() routine to query the link information
+            according to the order within an index.
+            - QAK - 2006/11/10
+       - Added feature to H5Iget_name to allow retrieving the name of any
+            object's ID, as long as the object is still reachable in the
+            group hierarchy.
+            - LA - 2006/11/01
+       - Added External and User-defined links.
+            External links are links from one HDF5 file to another; they
+            require both the name of the file and a path within that file.
+            User-defined links allow users to supply callback functions
+            for link traversals, allowing links to exhibit essentially
+            any behavior.
+            External links are a kind of user-defined link, so their default
+            behavior can be overridden by the user.
+            -JML 2006/8/23
+       - Added H5Oopen and H5Oclose for opening objects of unknown type
+            (as link callback functions do).
+            -JML 2006/8/23
+       - Added H5Oopen_by_addr, H5Oincr_refcount, and H5Odecr_refcount for
+            opening objects by address.  Be very careful with these!
+            -JML 2006/8/23
+       - Added H5Fget_intent to get the "intent" of a file (whether it
+            was opened with read-write access or read-only.
+            -JML 2006/8/23
+       - Added Link Access Property Lists. They currently contain two
+            properties, nlinks (H5Pget/set_nlinks) and elink_prefix
+            (H5Pget/set_elink_prefix). nlinks controls how many soft and
+            user-defined traversals are allowed before HDF5 assumes it has
+            found a cycle (previously this defaulted to 16).
+            The elink_prefix is a filesystem path that is prefixed to the
+            names of any external link files opened using this LAPL.
+            -JML 2006/8/23
+       - Add H5L link APIs.  Old APIs (H5Glink, H5Gmove, etc.) are still
+         supported but deprecated.
+         New APIs are:
+            H5Llink - create a link to an object given its ID
+            H5Lmove - just like H5Gmove2
+            H5Lcopy - copy a link without copying the underlying object
+            H5Lcreate_hard - like H5Glink2 for hard links
+            H5Lcreate_soft - like H5Glink2 for soft links
+            H5Ldelete - just like H5Gunlink
+            H5Lget_val - just like H5Gget_linkval
+            H5Lget_info - gets link-specific info (like H5Gget_objinfo)
+
+         In addition, H5Gcreate_anon, H5Tcommit_anon, and H5Dcreate_anon
+         no longer create links to objects; objects must be manually linked
+         using H5Llink or they will be deleted when the ID is closed.
+
+         Link Creation Property Lists can be used to pass character
+         encoding (ASCII or UTF-8) for link names and to set the Intermediate
+         Group Creation Flag:
+            H5Pset_char_encoding, H5Pget_char_encoding
+            H5Pset_copy_object, H5Pget_copy_object
+         -JML 2006/7/5
+       - Added managements of collective IO supports for chunking storage
+         inside parallel HDF5
+         1) Implemented One IO with collective mode for all chunks in the
+            application by building one MPI derived datatype accross all
+            chunks.
+         2) Implemented the decision-making support to do collective IO inside
+            MPI-IO per chunk. 
+         3) Added the decision-making support to do one IO accross all chunks
+            or to do multiple IOs with each IO per chunk.
+         4) Added the support to handle the case some processes won't do any IOs in 
+            collectively.
+         5) Some MPI-IO package(mpich 1.2.6 or lower, e.g.) cannot handle
+            collective IO correctly for the case when some processes have no
+            contributions to IOs, a special macro is added to change
+            collective IO mode to independent IO mode inside HDF5 library.
+
+            Currently we find that MPICH at Linux and vender MPI-IO package at NCSA
+            Altix cannot handle this case. 
+            
+             "hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}"
+              has been added at the end of file <ia64-linux-gnui> and
+                                                 <linux-gnulibc1>.
+
+             If MPI-IO packages at your Linux and Altix support this case,
+             please comment out the last line and report to us at
+             help@hdfgroup.org. We can tune in our configuration to
+             support this.                                                     
+ 
+             KY - 2006/02/16
+       - Added character encoding to attribute creation property lists.
+            JML - 2006/01/02
+       - Added H5Gcopy() routine to copy objects between while keeping
+         data in compressed form.  QAK - 2005/11/06
+       - Added H5Sextent_equal() routine.  QAK - 2005/11/06
+       - Added HSYS_ERROR which retrieves the system error message and pushes
+         it to the error stack.  This gives more information of the failed
+	 system call. AKC - 2005/08/04
+       - Added H5F_OBJ_LOCAL flag to H5Fget_obj_count() & H5Fget_obj_ids(), to
+         allow querying for objects in file that were opened with a particular
+         file ID, instead of all objects opened in file with any file ID.
+         QAK - 2005/06/01
+       - Added H5T_CSET_UTF8 character set to mark datatypes that use the
+         UTF-8 Unicode character encoding.  Added tests to ensure that
+         library handles UTF-8 object names, attributes, etc. -JL 2005/05/13
+       - HDF5 supports collective MPI-IO for irregular selection with HDF5
+         dataset. Irregular selection is when users use H5Sselect_hyperslab
+         more than once for the same dataset.
+         Currently, not all MPI-IO packages support complicated MPI derived
+                     datatype used in the implementation of irregular
+                     selection INSIDE HDF5. 
+                     1) DEC 5.x is not supporting complicated derived datatype.
+                     2) For AIX 5.1,
+                     if your poe version number is 3.2.0.19 or lower,
+                     please edit powerpc-ibm-aix5.x under hdf5/config,
+                     Find the line with
+                            << hdf5_mpi_complex_derived_datatype_works>>
+                     and UNCOMMENT this line before the configure.
+                     check poe version with the following command:
+                     lpp -l all | grep ppe.poe
+                     3) For Linux cluster, 
+                        if mpich version is 1.2.5 or lower, collective irregular selection
+                        IO is not supported, internally independent IO is used.
+                     4) For IRIX 6.5,
+                        if C compiler version is 7.3 or lower, collective irregular selection
+                        IO is not supported, internally independent IO is used.
+                     5) For platforms which internally used mpich, if the
+                        mpich version is 1.2.5 or lower, please find the 
+                        corresponding config file and add
+                        hdf5_mpi_complex_derived_datatype_works='no' at the
+                        end of the configuration file. For example, at NCSA
+                        SGI Altix, the internal mpich library is 1.2.5. So 
+                        hdf5_mpi_complex_derived_datatype_works='no' should be
+                        added at the end of the config file ia64-linux-gnu.
+                     KY - 2005/09/12
+        We also found not all MPI-IO packages support collective IO with one
+                    or more processes to have no contributions to IO.
+                     For mpich version 1.2.6 or lower and all IRIX machine, 
+                     if the library  checks that there are no IO contributions for some
+                     processes, collective IO request is replaced with
+                     independent inside HDF5.
+                     KY - 2006/05/04
+                    
+        - HDF5 N-bit filter 
+          HDF5 support N-bit filter from this version,  
+          The N-Bit filter is used effectively for compressing data of N-Bit
+          datatype as well as compound and array datatype with N-Bit fields. 
+          KY - 2005/04/15
+        - HDF5 scaleoffset filter
+          HDF5 supports scaleoffset filter for users to do data
+          compression through HDF5 library. 
+          Scale-Offset compression performs a scale and/or offset operation
+          on each data value and truncates the resulting value to a minimum 
+          number of bits and then stores the data.
+          Scaleoffset filter supports floating-point and integer datatype.
+          Please check the HDF5 reference manual for this.
+          KY - 2005/06/06
+        - Retired SRB vfd (--with-srb). Functions H5Pset_fapl_srb and
+          H5Pget_fapl_srb were removed.  EIP - 2005/04/07
+	- Retired GASS vfd (--with-gass).  Functions H5Pset_fapl_gass and
+	  H5Pget_fapl_gass are removed too.  AKC - 2005/3/3
+        - Pablo was removed from the source code EIP - 2005/01/21
+        - Modified registration of SZIP to dynamically detect the presence
+            or absence of the encoder.  Changed configure and Makefiles,
+            and tests to dynamically detect encoder. BEM - 2004/11/02
+	- Added function H5Pget_data_transform, together with the previously
+	    added H5Pset_data_transform, to support the data transform
+	    feature. AKC - 2004/10/26
+        - Compound datatype has been enhanced with a new feature of size 
+            adjustment.  The size can be increased and decreased(without
+            cutting the last member) as long as it doesn't go down to zero.  
+            No API change is involved.  SLU - 2004/10/1
+        - Put back 6 old error API functions to be backward compatible with
+            version 1.6.  They are H5Epush, H5Eprint, H5Ewalk, H5Eclear,
+            H5Eset_auto, H5Eget_auto.  Their new equivalent functions are
+            called H5Epush_stack, H5Eprint_stack, H5Ewalk_stack,
+            H5Eclear_stack, H5Eset_auto_stack, H5Eget_auto_stack.  SLU -
+            2004/9/2
+        - 4 new API functions, H5Tencode, H5Tdecode, H5Sencode, H5Sdecode were
+            added to the library.  Given object ID, these functions encode and 
+            decode HDF5 objects(data type and space) information into and from 
+            binary buffer.        SLU - 2004/07/21
+        - Modified the way how HDF5 calculates 'pixels_per_scanline' parameter for 
+            SZIP compression. Now there is no restriction on the size and shape of the
+            chunk except that the total number of elements in the chunk cannot be 
+            bigger than 'pixels_per_block' parameter provided by the user.  
+                                                                     EIP - 2004/07/21  
+        - Added support for SZIP without encoder.  Added H5Zget_filter_info
+            and changed H5Pget_filter and H5Pget_filter_by_id to support this
+            change.  JL/NF - 2004/06/30
+        - SZIP always uses K13 compression.  This flag no longer needs to
+            be set when calling H5Pset_szip.  If the flag for CHIP
+            compression is set, it will be ignored (since the two are mutually
+            exclusive).  JL/NF - 2004/6/30
+        - A new API function H5Fget_name was added.  It returns the name
+            of the file by object(file, group, data set, named data type,
+            attribute) ID.  SLU - 2004/06/29
+        - Added support for user defined identifier types.  NF/JL - 2004/06/29
+        - A new API function H5Fget_filesize was added.  It returns the
+            actual file size of the opened file.  SLU - 2004/06/24
+	- New Feature of Data transformation is added.  AKC - 2004/05/03.
+        - New exception handler for datatype conversion is put in to 
+            replace the old overflow callback function.  This exception
+            handler is set through H5Pset_type_conv_cb function.
+            SLU - 2004/4/27
+        - Added option that if $HDF5_DISABLE_VERSION_CHECK is set to 2,
+	    will suppress all library version mismatch warning messages.
+	    AKC - 2004/4/14
+	- A new type of dataspace, null dataspace(dataspace without any 
+            element) was added.  SLU - 2004/3/24
+        - Data type conversion(software) from integer to float was added.
+            SLU - 2004/3/13 
+        - Data type conversion(software) from float to integer was added.
+            Conversion from integer to float will be added later.  
+            SLU -2004/2/4
+        - Added new H5Premove_filter routine to remove I/O pipeline filters
+            from dataset creation property lists.  PVN - 2004/01/26
+        - Added new 'compare' callback parameter to H5Pregister & H5Pinsert
+            routines.  QAK - 2004/01/07
+        - Data type conversion(hardware) between integers and floats was added.
+            SLU 2003/11/21
+        - New function H5Iget_file_id() was added.  It returns file ID given
+            an object(dataset, group, or attribute) ID.  SLU 2003/10/29
+        - Added new fields to the H5G_stat_t for more information about an
+            object's object header.  QAK 2003/10/06
+        - Added new H5Fget_freespace() routine to query the free space in a
+            given file.  QAK 2003/10/06
+        - Added backward compatability with v1.6 for new Error API. SLU - 
+            2003/09/24
+        - Changed 'objno' field in H5G_stat_t structure from 'unsigned long[2]'
+            to 'haddr_t'.  QAK - 2003/08/08
+        - Changed 'fileno' field in H5G_stat_t structure from 'unsigned long[2]'
+            to 'unsigned long'.  QAK - 2003/08/08
+        - Changed 'hobj_ref_t' type from structure with array field to 'haddr_t'.
+            QAK - 2003/08/08
+        - Object references (hobj_ref_t) can now be compared with the 'objno'
+            field in the H5G_stat_t struct for testing if two objects are the
+            same within a file.  QAK - 2003/08/08
+        - Switched over to new error API. SLU - 2003/07/25
 
     Parallel Library:
     -----------------
+	- Added mpich2 as a testing "platform" informally. AKC - 2005/9/28.
+	- A dataset created in serial mode with H5D_ALLOC_TIME_INCR allocation
+	  setting was not extendible, either explicitly by H5Dextend or
+	  implicitly by writing to unallocated chunks.	Library now allocates
+	  more space when needed or directed if the file is opened by parallel
+	  mode, independent of what the dataset allocation mode is.
+	  CC/AKC - 2005/08/29.
+        - Allow compressed, chunked datasets to be read in parallel.
+            QAK - 2004/10/04
+        - Add options of using atomicity and file-sync to test_mpio_1wMr.
+            AKC - 2003/11/13
+        - Added parallel test, test_mpio_1wMr, which tests if the
+            underlaying parallel I/O system is conforming to the POSIX
+            write/read requirement.  AKC - 2003/11/12
 
     Fortran Library:
     ----------------
+         - added support for shared Fortran libraries.  -JML 2005/09/20
+         - added missing h5tget_member_class_f function
+                                                 EIP 2005/04/06         
+         - added new functions h5fget_name_f and h5fget_filesize_f 
+                                                 EIP 2004/07/08
+         - h5dwrite/read_f and h5awrite/read_f functions only accept dims parameter
+            of the type INTEGER(HSIZE_T).
+         - added support for native integers of 8 bytes (i.e. when special
+           compiler flag is specified to set native fortran integers to 8 bytes,
+           for example, -i8 flag for PGI and Absoft Fortran compilers, 
+           -qintsize=8 flag for IBM xlf compiler).
+                                                 EIP 2005/06/20
+         - added support for "big" REAL and DOUBLE PRECISION types
+           (usually the size is specified by compilers flags like 
+            -r8, -r16, etc.)
+           Known problem: multi file test fails when REAL is 16 bytes.
+                                                EIP 2005/09/8
 
     C++ Library:
     ----------------
+        - added support for shared C++ libraries.  -JML 2005/09/20
+        - Added missing member functions
+                H5::CompType::getMemberArrayType
+                H5::CompType::getMemberVarLenType
+                H5::AbstractDs::getArrayType
+                H5::AbstractDs::getVarLenType
+                H5::CommonFG::openArrayType
+                H5::CommonFG::openVarLenType
+                H5::PropList::copyProp -- this will replace the current
+                        H5::PropList::copyProp in later releases due
+                        to incorrect prototype.
+                H5::IdComponent::getHDFObjType
+                BMR - 2005/08/08
 
 
     Tools:
     ------
+        - h5repack and h5diff changed command line parameter syntax to be
+           similar to h5dump, adding also long switch names. PVN - 2008/1/16
+     	- h5repack now supports adding multiple filters to all objects. 
+	   PVN - 2008/1/16
+        - h5dump lists groups and attributes in requested orders (by name and 
+           creation order, both ascending and descending). PVN - 2007/10/5
+        - h5import imports string (text) data. PVN - 2007/10/5
+        - h52gif and gif2h5: Both these tools were revised to include the High
+          Level Image API support, and tests were added to /hl/tools/gif2h5.
+           PVN - 2007/04/13
+        - h5dump: added support for double long type H5T_NATIVE_LDOUBLE. PVN
+           2007/03/13
+        - h5dump: added support for binary output, see usage. PVN 2007/03/13
+        - h5repack: added support for the new nbit and scaleoffset filters.
+           PVN - 2007/05/07
+        - h5repack: now uses the API function H5Ocopy (of the tool h5copy) to
+           recreate objects if there is not a user input for changes. PVN -
+           2007/05/07
+        - h5repack: added support for reading and repacking  by hyperslabs for
+           large files. PVN - 2007/03/01
+        - h5repack: a new option allows the copy using the file type (default)
+           instead of the previous conversion to native type. PVN - 2007/03/01
+        - h5repack: output the percentage of compression used. PVN - 2007/03/01
+        - h5diff: added support for -p option for unsigned long_long data. PVN
+          - 2007/02/26
+        - h5diff: added support for comparing dataset regions. PVN - 2007/02/20
+        - h5diff: added support for reading and comparing by hyperslabs for large files.
+           PVN - 2007/02/20
+        - h5diff: printing of dataset dimensions along with dataset name. PVN -2007/02/19
+        - h5dump now uses the new API function H5Rget_name to display the name
+          of the dataset referenced instead of its ID. PVN - 2007/02/19
+        - Added new tool, h5mkgrp. QAK - 2007/02/14
+        - Added new tool, h5copy. PVN - 2006/7/15
+	- Removed obsolete pdb2hdf5 tool from tools/misc  -JML 2005/10/24
+	- Added build_h5perf_alone.sh that builds h5perf by standalone mode.
+	  AKC - 2005/09/18.
+        - Sped up h5dump on files with large numbers of objects.
+            QAK - 2005/08/25
+        - Added a standalone mode for building h5perf.  AKC - 2005/08/12
+        - new tool, h5jam. See reference manual.  2004/10/08
+        - h5repack.sh did not report errors encountered during tests.  It does
+            now.  AKC - 2004/04/02
+        - Added the MPI-I/O and MPI-POSIX drivers to the list of VFL drivers
+            available for h5dump and h5ls.  RPM & QAK - 2004/02/01
+        - Added option --vfd= to h5ls to allow a VFL driver to be selected
+            by a user.  RPM & QAK - 2004/02/01
+	- Added option -showconfig to compiler tools (h5cc,h5fc,h5c++).
+	    AKC - 2004/01/08
+        - Install the "h5cc" and "h5fc" tools as "h5pcc" and "h5pfc"
+            respectively if library is built in parallel mode.
+            WCW - 2003/11/04
+        - Added metadata benchmark (perform/perf_meta).  SLU - 2003/10/03
+        - Changed output of "OID"s from h5dump from "<number>-<number>" to
+            "<number".  This affects both the "regular" and XML output.
+            QAK - 2003/08/08
+        - Changed output of file IDs and "OID"s from h5ls from
+            "<number>:<number>:<number>:<number>" to "<number>:<number>"
+            QAK - 2003/08/08
 
     High-Level APIs:
     ------
+        - Fortran interfaces for the Image, Table and Lite APIs. PVN - 2007/5/1
+        - New HDF5 Dimension Scale API (H5DS) allows dimension scales to be
+          created in an HDF5 file and associated with specific datasets. PVN - 2007/5/1
+        - There are two new functions in the Lite library, H5LTtext_to_dtype
+            and H5LTdtype_to_text.  H5LTtext_to_dtype creates a HDF5 data type
+            given a text description; H5LTdtype_to_text converts a data type
+            to text description.  Only DDL definition is supported as text 
+            desciption now. SLU - 2006/05/17
+        - Added Packet Table API for creating tables with less overhead than
+            H5TB API.  Added C++ wrapper for Packet Tables.  See documentation.
+            JML - 2004/03/28
     
     Documentation 
     ------------- 
+        - The documentation for this release is largely complete, but 
+            trails the source code.  A few of the newer functions are 
+            not yet documented.                       FMB - 2007/04/18
+        - The user documents for this release can be accessed directly at
+            this location:
+               http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/doc/
+            The most recent document versions (updated daily) in the 
+            1.8 development branch can be accessed at this location:
+               http://www.hdfgroup.uiuc.edu/HDF5/doc_dev_snapshot/H5_dev/
+                                                      FMB - 2007/04/18
+
 
 Support for new platforms, languages and compilers.
 =======================================
-
-Bug Fixes since HDF5-1.8.0 release
+        - Added support for Free-BSD on amd64 with GNU C and Fortran compilers
+          4.2.1
+                                                     EIP - 2007/06/25
+        - Added support for sequential and parallel libraries for Intel 64 Linux
+          cluster (abe.ncsa.uiuc.edu).  Among three MPICH packages available on
+          this machine, only Open MPI works.  The VMI has seg fault in hyperslab.c
+          and bittests.c tests.  The MVAPICH2 complained about mpd not running 
+          the parallel test.  (see Known Problems section for more info)
+                                                     EIP - 2007/06/25
+        - Added support for HPUX11.23 for both 32 and 64-bit; HDF5 C++
+        - Added support for 64-bit Windows with Visual Studio .NET and 2005.
+            SJW - 2007/06/25
+        - Added suport for HPUX11.23 for both 32 and 64-bit; HDF5 C++
+          shared library is not supported with +DD64 flag.
+                                                     EIP - 2006/06/22
+        - Added support for VAX floating numbers for Alpha Open VMS 7.3.2
+                                                     EIP - 2006/05/05
+        - Fixed broken make.com files in tools directories
+                                                     EIP - 2006/05/05
+        - Added support for Alpha Open VMS 7.3.2 EIP - 2006/04/15
+        - Added support for Cray X1.  JML - 2005/10/03
+        - PGI Fortran compiler is supported on Linux64 systems (x86_64)
+                            EIP - 2004/08/19
+        - Absoft compiler f95 v9.0 supported on Linux 2.4
+                            EIP - 2004/07/29
+        - HDF5 Fortran APIs are supported on Mac OSX with IBM XL Fortran
+            compiler version 8.1. This is a default compiler.
+        - HDF5 Fortran APIs are supported on MAC OSX with Absoft F95 compiler
+            version 8.2; set F9X environment varibale to f95, for example
+            setenv F9X f95
+            Use --disable-shared --enable-static configure flags when Absoft
+            compiler is used.
+                             EIP - 2004/07/27
+        - HDF5 Fortran APIs are supported on MAC OSX with IBM XL Fortran
+            Compiler version 8.1 Use "--disable-shared --enable-static"
+            configure flags along with the "--enable-fortran" flag to build
+            Fortran library.  EIP - 2004/01/07
+
+Bug Fixes since HDF5-1.6.0 release
 ==================================
 
     Library
     -------
-	- Fixed the problem with the searching of target file for H5Lcreate_external().
-	  The searching pattern will depend on whether the target file's
-	  pathname is an absolute or a relative path. Please see the description
-	  in the RM for H5Lcreate_external().  (VC - 4/8/08)
-        - Fixed possible file corruption bug when encoding datatype
-            descriptions for compound datatypes whose size was between
-            256 & 511 bytes and the file was opened with the "use the
-            latest format" property enabled (with H5Pset_libver_bounds).
-            (QAK - 2008/03/13)
-        - Fixed bug in H5Aget_num_attrs() routine to handle invalid location
-            ID correctly.  (QAK - 2008/03/11)
-
+        - Changed library's behavior for reading files that might have
+            corrupted object header information from a previous (buggy)
+            version of the library.  By default, the library now rebuilds the
+            correct object header information instead of issuing an error.
+            Previous "strict" file format interpretation can be enabled with
+            the "--enable-strict-format-checks" configure option.
+            QAK - 2008/01/13
+        - Fixed several bugs with writing fill values for datasets that have
+            a variable-length datatype or component datatype.  QAK - 2007/06/19
+        - STDIO driver didn't support files bigger than 2GB because the OFFSET
+            parameter of fseek is of type LONG INT, not big enough for big files.
+            Use fseeko instead for big files if it's available on the system.
+            SLU - 2007/4/5
+        - Fixed a bug in H5Sselect_valid() that caused an incorrect value to
+            be returned (0) instead of FAIL on error conditions such as the
+            selection or extent not being defined. CMC - 2007/01/17
+        - Fixed the MULTI driver problem (Bug #731) that corruptted the data.
+            SLU - 2007/1/12
+        - Fixed file corruption bug which could write an incorrect number of
+            messages to an object's header under certain circumstances.
+            Generally, the sequence of actions to generate this bug looks
+            like this:
+                - Create an object
+                - Close the file
+                - Re-open the file
+                - Add 2 (or more) attributes to the object
+                - Close the file
+                - Re-open the file
+                - Delete one of the attributes on the object
+                - Add a smaller attribute to the object
+                - Delete the smaller atttribute on the object
+                - Add a larger attribute on the object
+
+            After this, the number of header messages stored for the object
+            will be off by one.  Other sequences of modifying attributes on an
+            object could also trigger this bug.  If you are opening an
+            object and the bottom few messages of the HDF5 error stack
+            resembles this, the object has been affected by this bug:
+
+              #007: ../../hdf5_v1.6/src/H5C.c line 3887 in H5C_load_entry(): unable to load entry
+                major(08): Meta data cache layer
+                minor(40): Unable to load metadata into cache
+              #008: ../../hdf5_v1.6/src/H5Ocache.c line 332 in H5O_load(): corrupt object header - too few messages
+                major(12): Object header layer
+                minor(40): Unable to load metadata into cache
+
+            Specifically, "corrupt object header" is the best string to search
+            for in the HDF5 error stack output.
+
+            If your files have been affected by this bug, or you are concerned
+            that your files might have been, please contact the HDF Helpdesk
+            at help@hdfgroup.org for a tool to detect and repair files
+            affected by this problem.  QAK - 2006/6/16
+        - Fixed various problems with retrieving names of objects, especially
+            with mounted files.  QAK - 2005/12/25
+        - Fixed core dump when closing root groups opened through two different
+            file handles that operate on the same actual file.  QAK - 2005/10/02
+        - Corrected errors when performing various operations on a group opened
+            by dereferencing an object reference.  QAK - 2005/07/30
+        - Fixed a bug with named datatypes where a copy of a named datatype
+            used to create a dataset would accidentally use the original
+            named datatype for the dataset's datatype.  QAK - 2005/07/23
+        - Made H5Fget_name() be consistent and always return name of actual
+            file the ID is in.  (Instead of the name of the top file in a
+            file mounting hierarchy).  QAK - 2005/07/19
+        - Reworked internal file mounting semantics to hopefully eliminate
+            mounting problems.  We now require that files that are mounting
+            together all have the same "file close degree".  QAK - 2005/07/19
+        - More bug fixes on holding open files that are mounted and have
+            IDs open.  QAK - 2005/07/14
+        - Don't unmount child files until the parent file actually closes.
+            (Previously, if an object is holding open a file, the child files
+            would get unmounted too early).  QAK - 2005/07/05
+        - Fixed bug where unmounted files could cause the library to go into
+            an infinite loop when shutting down.  QAK - 2005/06/30
+        - The library didn't save the information of family driver in file.
+          The original file member size was lost after file was closed (see
+          bug #213).  This has been fixed by saving driver name and member
+          file size in the superblock.  SLU - 2005/6/24
+        - Fixed bug with hyperslab selections that use selection offsets and
+            operate on chunked datasets going into infinite loop or dumping
+            core.  QAK - 2005/06/17
+        - Corrected memory leak and possible corruption when opening a group.
+            QAK - 2005/06/17
+        - Added check for opaque datatype tags being too long (check against
+            H5T_OPAQUE_TAG_MAX, currently set to 256).  QAK - 2005/06/14
+        - Fixed various errors in maintaining names for open objects in the
+            face of unusual mount & unmount operations.  QAK - 2005/06/08
+        - "SEMI" and "STRONG" file close degree settings now apply only to the
+            particular file ID being closed, instead of operating on all open
+            file IDs for a given file.  QAK - 2005/06/01
+        - For family driver, the library didn't save member size in file.
+          When file is reopened, the size of 1st member file determine the 
+          member size.  Now member size is saved in file and is used to 
+          define member file size.  Wrong file access property of member size
+          will result in a failure.  Using any other driver except family 
+          will cause library to return error.  So is multi driver. SLU - 
+          2005/05/24  
+        - Fixed error in opening object in group that was opened in mounted
+          file which has been unmounted.  QAK - 2005/03/17
+        - Fixed a racing condition in MPIPOSIX virtual file drive close
+	  function.  Now all processes must completed the close before any
+	  of them is returned.  This prevents some "faster" processes start
+	  accessing the file for another purpose (e.g., open with truncate)
+	  while other "slower" processes have not closed the same file with
+	  the previous purpose.  AKC - 2005/03/01
+        - H5Tget_member_value calls for enum datatype didn't return correct 
+            value if H5Tenum_valueof was called first.  It's fixed.  SLU - 
+            2005/02/08
+        - For variable-length string, H5Tget_class returned H5T_STRING as its
+            class.  But H5Tdetect_class and H5Tget_member_class considered it
+            as H5T_VLEN.  This is fixed to let all these 3 functions treat it
+            as H5T_STRING.  SLU - 2005/02/08
+        - The byte order of 1-byte integer types was fixed as little endian
+            even on a big-endian machine.  This has been corrected.  SLU -
+            2005/02/07 
+        - Fix segmentation fault when calling H5Fflush with an attribute that
+            hasn't had a value written to it open.  QAK - 2004/10/18
+        - Back up supporting bitfield and time types in H5Tget_native_type.  
+            Leave it to future support.  The function simply returns error 
+            message of "not support" for bitfield and time types.  
+            SLU - 2004/10/5
+        - Fixed address check in Core VFL driver to avoid spurious address/size
+            overflows for odd valued addresses and/or sizes.  QAK - 2004/09/27
+	- Fixed parallel bug in which some processes attempted collective
+	    I/O while others did independent I/O.  Bug appeared when some
+	    processes used point selections, and others didn't.  JRM - 2004/9/15
+        - Corrected error where dataset region references were written in an
+            incorrect way on Cray machines.  PVN & QAK - 2004/09/13
+        - The H5Tget_native_type now determines the native type for integers 
+	    based on the precision. This is to avoid cases of wrongly converting 
+            an int to a short in machines that have a short of 8 bytes but with 
+	    32bit precision (e.g Cray SV1). PVN - 2004/09/07  
+        - Changed H5Dread() to not overwrite data in an application's buffer
+            with garbage when accessing a chunked dataset with an undefined
+            fill value and an unwritten chunk is uncountered.  QAK - 2004/08/25
+        - Fixed error which could cause a core dump when a type conversion
+            routine was registered after a compound datatype had been
+            converted and then an equivalment compound datatype was converted
+            again.  QAK - 2004/08/07
+        - Fixed memory overwrite when encoding "multi" file driver information
+            for file's superblock.  QAK - 2004/08/05
+        - Fixed obscure bug where a filter which failed during chunk allocation
+            could allow library to write uncompressed data to disk but think
+            the data was compressed.  QAK - 2004/07/29
+        - Fixed bug where I/O to an extendible chunked dataset with zero-sized
+            dimensions would cause library to fail an assertion.
+            QAK - 2004/07/27
+        - Fixed bug where chunked datasets which have filters defined,
+            allocation time set to "late" and whose chunks don't align with
+            the dataspace bounds could have incorrect data stored when
+            overwriting the entire dataset on the first write.  QAK - 2004/07/27
+        - Added check to ensure that dataspaces have extents set. JML-2004/07/26
+        - Fixed bug on some Solaris systems where HDF5 would try to use
+            gettimeofday() when that function didn't work properly.
+            JML - 2004/07/23
+        - Fixed bug in H5Sset_extent_simple where setting maximum size to
+            non-zero, then to zero would cause an error.  JML - 2004/07/20
+        - Allow NULL pointer for buffer parameter to H5Dread & H5Dwrite
+            when not writing data ("none" selection or hyperslab or point
+            selection with no elements defined).  QAK - 2004/07/20
+        - Calling H5Gcreate() on "/" or "." throws an error instead of
+            failing quietly. JML - 2004/07/19
+        - Fixed bug where setting file address size to be very small could
+            trigger an assert if the file grew to more than 64 KB.  Now throws
+            an error and data can be recovered. JL/NF - 2004/07/14
+        - Fixed bug where "resurrecting" a dataset was failing.
+            QAK - 2004/07/14
+        - Fixed bug where incorrect data could be read from a chunked dataset
+            after it was extended.  QAK - 2004/07/12
+        - Fixed failure to read data back from file of compound type with
+            variable-length string as field.  SLU - 2004/06/10
+        - Fixed potential file corruption bug when a block of metadata could
+            overlap the end of the internal metadata accumulator buffer and
+            the buffer would be extended correctly, but would incorrectly 
+            change it's starting address.  QAK - 2004/06/09
+        - Opaque datatype with no tag failed for some operations.  Fixed.
+            SLU - 2004/6/3 
+        - Fixed potential file corruption bug where dimensions that were
+            too large (a value greater than could be represented in 32-bits)
+            could cause the incorrect amount of space to be allocated in a
+            file for the raw data for the dataset.  QAK - 2004/06/01
+	- Fixed dtypes "sw long double -> double" failure in QSC class
+            machines.  AKC - 2004/4/16
+        - Fixed problem with fletcher32 filter when converting data of different
+	    endianess. PVN - 2004/03/10
+        - Fixed problem with H5Tget_native_type() not handling opaque fields
+            correctly.  QAK - 2004/01/31
+        - Fixed several errors in B-tree deletion code which could cause a
+            B-tree (used with groups and chunked datasets) to become corrupt
+            with the right sequence of deleted objects.  QAK - 2004/01/19
+        - Fixed small internal memory leaks of fill-value information.
+            QAK - 2004/01/13
+        - Fixed bug that caused variable-length datatypes (strings or sequences)
+            used for datasets in files with objects that were unlinked to
+            fail to be read/written to a file.  QAK - 2004/01/13
+        - Detect situation where szip 'pixels per block' is larger than the
+            fastest changing dimension of a dataset's chunk size and disallow
+            this (due to limits in szip library).  QAK - 2003/12/31
+        - Fixed bug with flattened hyperslab selections that would generate
+            incorrect hyperslab information with certain high-dimensionality
+            combinations of start/stride/count/block information.
+            QAK - 2003/12/31
+        - Fixed bug with variable-length datatypes used in compound datatypes.
+            SLU - 2003/12/29
+        - Fixed bug in parallel I/O routines that would cause reads from
+            "short datasets" (datasets which were only partially written out)
+            to return invalid data.  QAK & AKC - 2003/12/19
+        - Fixed bug where scalar dataspaces for attributes were reporting as
+            simple dataspaces.  QAK - 2003/12/13
+        - Fixed problem with selection offsets of hyperslab selections in
+            chunked datasets causing the library to go into an infinite loop.
+            QAK - 2003/12/13
+        - Fixed H5Giterate to avoid re-using index parameter after iteration
+            callback has been called (allows iteration callback to modify the
+            index parameter itself).  QAK - 2003/12/06
+        - Fixed various floating-point conversion problems, including a
+            change which could corrupt data when converting from double->float.
+            QAK - 2003/11/24
+        - Changed "single process" metadata writing in library to collective
+            I/O by all processes, in order to guarantee correct data being
+            written with MPI-I/O.  QAK - 2003/11/20
+        - Fixed problems with fill values and variable-length types and also
+            I/O on VL values that were set to NULL.  QAK - 2003/11/08
+        - Fixed problems with MPI datatypes that caused ASCI Q machine to
+            hang.  QAK - 2003/10/28
+        - Removed HDF5_MPI_PREFER_DERIVED_TYPES environment variable support,
+            since it had no benefit.  QAK - 2003/10/28
+        - Single hyperslab selections (which were set with only one call to
+            H5Sselect_hyperslab) that had dimensions that could be "flattened"
+            but were interspersed with dimensions that could not be flattened
+            were not correctly handled, causing core dumps.  QAK - 2003/10/25
+        - Fixed incorrect datatype of the third parameter to the Fortran90
+            h5pset(get)_cache_f subroutine (INTEGER to INTEGER(SIZE_T)) 
+            EIP - 2003/10/13
+        - Fixed problems with accessing variable-length data datatypes on
+            Crays.  QAK - 2003/10/10
+        - Fixed potential file corruption bug when too many object header
+            messages (probably attributes, from a user perspective) were
+            inserted into an object header and certain other conditions were
+            met.  QAK - 2003/10/08
+        - Changed implementation of internal ID searching algorithm to avoid
+            O(n) behavior for many common cases.  QAK - 2003/10/06
+        - Allow partial parallel writing to compact datasets.  QAK - 2003/10/06
+        - Correctly create reference to shared datatype in attribute, instead
+            of making a copy of the shared datatype in the attribute.
+            QAK - 2003/10/01
+        - Revert changes which caused files >2GB to fail when created with
+            MPI-I/O file driver on certain platforms.  QAK - 2003/09/16
+        - Allow compound datatypes to grow in size.  SLU - 2003/09/10
+        - Detect if a type is already packed before attempting to pack it
+            again or check if it is locked.  SLU - 2003/09/10
+        - Corrected bug when opening a file twice with read-only permission
+            for one open and then closing the read-only access file ID would
+            generate an error.  QAK - 2003/09/10
+        - Corrected bug in repeated calls to H5Pget_access_plist() which would
+            incorrectly manage reference counts of internal information and
+            eventually blow up.  QAK - 2003/09/02
+        - Return rank of the array datatype on successful call to
+            H5Tget_array_dims().  QAK - 2003/08/30
+        - Corrected bug in H5Tdetect_class which was not correctly detecting
+            datatype classes of fields in nested compound datatypes in some
+            circumstances.  QAK - 2003/08/30
+        - Corrected bug in sieve buffer code which could cause loss of data
+            when a small dataset was created and deleted in quick succession.
+            QAK - 2003/08/27
+        - Corrected bug in H5Gget_objname_by_idx which was not allowing NULL
+            for the name when just querying for the object name's length.
+            QAK - 2003/08/25
+        - Corrected bug in variable-length string handling which could
+            generate a core dump on writing variable-length strings as part
+            of a compound datatype on certain architectures.  QAK - 2003/08/25
+        - Corrected bug in H5Tget_native_type which would incorrectly compute
+            the size of certain compound datatypes and also incorrectly
+            compute the offset of the last field for those compound datatypes.
+            QAK - 2003/08/25
+        - Corrected bug in H5Tget_native_type which would drop string datatype
+            metadata (padding, etc.)  QAK - 2003/08/25
+        - Corrected bugs in H5Gget_num_objs, H5Gget_objname_by_idx and
+            H5Gget_objtype_by_idx to allow them to accept location IDs, not just
+            group IDs.  QAK - 2003/08/21
+        - Corrected bug when using scalar dataspace for memory selection and
+            operating on chunked dataset.  QAK - 2003/08/18
+        - Corrected bugs with multiple '/' characters in names for H5Glink
+            and H5Gunlink.  QAK - 2003/08/16
+        - Corrected bug with user blocks that didn't allow a user block to
+            be inserted in front of a file after the file was created.
+            QAK - 2003/08/13
+        - Corrected errors with using point selections to access data in
+            chunked datasets.  QAK - 2003/07/23
+        - Corrected error with variable-length datatypes and chunked datasets
+            caused H5Dwrite to fail sometimes.  QAK - 2003/07/19
+        - Modified library and file format to support storing indexed storage
+            (chunked dataset) B-tree's with non-default internal 'K' values.
+            QAK - 2003/07/15
+        - Returned H5T_BKG_TEMP support to library after it was accidentally
+            removed.  QAK - 2003/07/14
 
     Configuration
     -------------
+	- Configure can now use any tr command.  No more need for
+	  defining variable TR nor is it supported. -AKC 2006/05/19
+        - Parallel I/O with the MPI-I/O driver will no longer work if the
+            filesystem is not POSIX compliant.  The "HDF5_MPI_1_METAWRITE"
+            environment variable has been removed.  QAK - 2004/01/30
+        - Fixed the error that cause "make install" to fail because of the
+            macro definition syntax of "prefix?=..."  AKC - 2003/07/22
 
     Performance
     -------------
+        - Optimized I/O for enumerated datatypes that are a superset of source
+            enumerated datatype.  QAK - 2005/03/19
+        - More optimizations to inner loops of datatype conversions for
+            integers and floats which give a 10-50% speedup.  QAK - 2003/11/07
+        - Hoisted invariant 'if/else's out of inner datatype conversion loop for
+            integer and floating-point values, giving about a 20% speedup.
+            QAK - 2003/10/20
 
     Tools
     -----
-        - Fixed bug in h5diff that prevented datasets & attributes with
-            variable-length string elements from comparing correctly.
-            (QAK - 2008/02/28)
-        - h5import bug on Windows w/binary datasets. fread in windows needs a
-            binary file to be open with 'rb' instead of 'r' otherwise it
-            terminates execution if an end of file character is found on the
-            input file. Besides that the binary file generated needs to be open
-            with 'wb' , otherwise an end of line character is read twice.
-            (PVN - 2008/02/19)
-        - Fixed bug in h5dump that caused binary output to be made only for the first 
-           dataset, when several datasets were requested. (PVN - 2008/04/07)
-
+        - Fixed h5dump regarding the display of blocks in hyperslab
+           selections. PVN 2008/01/16
+        - Fixed h5diff regarding the display of NaN (Not a Number)
+           values. PVN 2008/01/16
+	- Fixed h5dump regarding the parsing of binary output parameters. 
+           PVN 2008/01/16
+	- Fixed memory problems in h52gif and gif2h5. PVN 2008/01/16
+	- Fixed h5repack dealing with NULL references. PVN 2008/01/16 
+        - Fixed h5dump & h5ls to display attributes in "name" order, rather
+           than the order they are encountered in the object header.
+           QAK - 2007/10/04
+        - Fixed h5dump regarding the display of named datatypes
+           attributes. PVN 2007/03/13
+        - Fixed h5dump regarding the display of group comments. PVN
+           2007/03/13
+        - Fixed h5dump regarding the display of hardlinks pointing 
+           to the root group. PVN 2007/03/13
+        - Fixed h5diff percentage option -p. PVN 2007/03/05
+        - Fixed h5dump that caused array indices greater than 2 ^32-1
+           not to be printed correctly - PVN 2007/2/19
+        - Fixed h5dump to print attributes data in ASCII if -r option is used.
+	    AKC - 2004/11/18
+        - Fixed space utilization reported in h5ls to correct error in formula
+            used.  QAK - 2004/10/22
+        - Fixed h5redeploy which sometimes complain too many argument for the
+            test command. (The complain did not hinder the h5redploy to
+            proceed correctly.) AKC - 2003/11/03
+        - Fixed a segmentation fault of h5diff when percentage option is used.
+            AKC - 2003/08/27
+        - Switched away from tools using internal "fixtype" function(s) to use
+            H5Tget_native_type() internally.  QAK - 2003/08/25
 
 
     Documentation 
@@ -111,23 +992,27 @@ Bug Fixes since HDF5-1.8.0 release
 
     F90 APIs
     --------
-
-
-    C++ APIs
-    --------
-        - Fixed bug that caused segfaults in Attribute::read. (BMR - 2008/04/20)
-        - Fixed bug in PropList::getClassName to use portable HDfree instead
-            of free. (BMR - 2008/04/20)
+        - h5pget_driver_f was returning information that could not be
+          interpreted by fortran application program; fixed. EIP - 2005/04/10 
 
 
 Platforms Tested
 ================
+Platforms marked with * were not tested for hdf5-1.8.0-rc* release
+(This information is somewhat out of date and may be inaccurate.  It will be
+    updated for a later release)
 
-    AIX 5.2 (32/64 bit)           xlc 8.0.0.11
+*   AIX 5.2 (32/64 bit)           xlc 8.0.0.11
                                   xlC 8.0
                                   xlf 10.01.0000.0 
                                   mpcc_r 6.0.0.8
                                   mpxlf_r 8.1.1.7
+*    AIX 5.3 (32/64 bit)           xlc 7.0.0.8
+                                  xlC 7.0.0.8
+                                  xlf  09.01.0000.0007
+*   Cray X1 water 3.0.35          Cray Standard C Version 5.4.0.7.4
+                                  Cray Fortran 5.4.0.7.3
+                                  Cray C++ 5.4.0.7.4
     FreeBSD 6.2-STABLE i386       gcc 3.4.6 [FreeBSD] 20060305
     (duty)                        g++ 3.4.6 [FreeBSD] 20060305
                                   gcc 4.2.1 20080123
@@ -139,11 +1024,14 @@ Platforms Tested
                                   g++ 4.2.1 20080123
                                   gfortran 4.2.1 20080123
 
+*   HP-UX B.11.23                 HP aC++/ANSI C B3910B A.06.00
+                                  HP F90 v2.9.2
+                                  HP aC++/ANSI C B3910B A.06.00
     IRIX64 6.5 (64 & n32)         MIPSpro cc 7.4.4m
                                   F90 MIPSpro 7.4.4m 
                                   C++ MIPSpro cc 7.4.4m
 				 
-    Linux 2.6.9 (RHEL4)           Intel 10.0 compilers
+*   Linux 2.6.9 (RHEL4)           Intel 10.0 compilers
     (abe.ncsa.uiuc.edu)
     Linux 2.4.21-47               gcc 3.2.3 20030502
     (osage)
@@ -160,6 +1048,9 @@ Platforms Tested
     SunOS 5.8 32,46               Sun WorkShop 6 update 2 C 5.3
      (Solaris 2.8)                Sun WorkShop 6 update 2 Fortran 95 6.2
                                   Sun WorkShop 6 update 2 C++ 5.3
+*   SunOS 5.10 i86pc              Sun C 5.7
+                                  Sun Fortran 95 8.1
+                                  Sun C++ 5.7
     SunOS 5.10                    cc: Sun C 5.8 
     (linew)                       f90: Sun Fortran 95 8.2 
                                   CC: Sun C++ 5.8 
@@ -184,91 +1075,105 @@ Platforms Tested
 
     MAC OS  10.4 (Intel)          gcc i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 
                                   G95 (GCC 4.0.3 (g95 0.91!) Nov 21 2006)
-    Alpha Open VMS 7.3
+*    Alpha Open VMS 7.3
 
 
 Supported Configuration Features Summary
+(This table was not modified for 1.8.0-rc* release; for information contact help@hdfgroup.org)
 ========================================
 
     In the tables below
           y   = tested and supported
           n   = not supported or not tested in this release
           x   = not working in this release
+          dna = does not apply
           ( ) = footnote appears below second table
-          <blank> = testing incomplete on this feature or platform
-          W or C indicates workstation or cluster, respectively.
-
-Platform                          C        F90    F90      C++   zlib  SZIP
-                                  parallel        parallel
-SunOS5.8 64-bit                    n        y      n        y     y     y
-SunOS5.8 32-bit                    n        y      n        y     y     y
-SunOS5.10 64-bit                   n        y      n        y     y     y
-SunOS5.10 32-bit                   n        y      n        y     y     y
-IRIX64_6.5 64-bit                  n        y      y        y     y     y
-IRIX64_6.5 32-bit                  n        n      n        n     y     y
-AIX-5.2  32-bit                    y        y      y        y     y     y
-AIX-5.2  64-bit                    y        y      y        y     y     y
-Cray XT3 (not tested
-          for this release)        n        n      n        n     n     n
-Windows XP                         n        y(3)   n(3)     y     y     y
-Windows XP x64                     n        y(3)   n(3)     y     y     y
-Windows Vista                      n        n      n        y     y     y
-Mac OS X 10.4 PowerPC              n               n
-Mac OS X 10.4 Intel                n        y      n        y     y     y
-FreeBSD 6.2 32-bit                 n        n      n        y     y     y
-FreeBSD 6.2 64-bit
-RedHat EL4 2.6.9 i686 GNU        W y(2)     y(4)   y(2)     y     y     y
-RedHat EL4 2.6.9 i686 Intel      W n        y      n        y     y     n
-RedHat EL4 2.6.9 i686 PGI        W n        y      n        y     y     n
-SuSe Linux 2.6.16 x86_64 GNU (5) W y(2)     y      n        y     y     y
-SuSe Linux 2.6.16 x86_64 Int (5) W n        y      n        y     n     n
-SuSe Linux 2.6.16 x86_64 PGI (5) W n        y      n        y     n     n
-RHL9 Linux 2.4 Xeon Lustre Intel C n        y      n        y     y     n
-RHEL3 Linux 2.4 Xeon Intel       W n        y      n        n     y     n
-RHEL4 Linux 2.6 Xeon Lustre Int  C n        y      n        y     y     n
-SuSE Linux 2.4 ia64 Intel        C y(1)     y      y        y     y     y
-SuSe Linux 2.6.5
-       SGI Altix ia64 Intel      C n        y      n        y     n     y
-Alpha OpenVMS 7.3.2                n        y      n        y     n     n
-
-
-
-Platform                          Shared   Shared    Shared    static-  Thread-
-                                  C libs   F90 libs  C++ libs  exec     safe
-SunOS 5.8 32-bit                    y        y         y         x        y
-SunOS 5.8 64-bit                    y        y         y         x        y
-SunOS 5.10 32-bit                   y        y         y         x        y
-SunOS 5.10 64-bit                   y        y         y         x        y
-IRIX64_6.5 32-bit                   y        n         y         x        y
-IRIX64_6.5 64-bit                   y        y         n         x        y
-AIX-5.2 32-bit                      n        n         n         x        n
-AIX-5.2 64-bit                      n        n         n         x        n
-Cray XT3 (not tested
-          for this release)         n        n         n         x        n
-Windows XP                          y        y(3)      y         y        y
-Windows XP x64                      y        y(3)      y         y        y
-Windows Vista                       y        n         n         y        y
-Mac OS X 10.4 Intel Duo             y        y         y         x        n
-FreeBSD 6.2 32-bit                  y        y         y         x        n
-FreeBSD 6.2 64-bit                  y        y         y         x        n
-RHEL4 2.6.9 i686 GNU              W y        y(4)      y         x        y
-RHEL4 2.6.9 i686 Intel            W y        y         y         x        n
-RHEL4 2.6.9 i686 PGI              W y        y         y         x        n
-SuSE Linux 2.6.16 x86_64 GNU (5)  W y        y         y         x        y
-SuSE Linux 2.6.16 x86_64 Intel(5) W y        y         y         x        n
-SuSE Linux 2.6.16 x86_64 PGI(5)   W y        y         y         x        n
-RHL9 Linux 2.4 Xeon Lustre Intel  C y        y         y         x        n
-RHEL3 Linux 2.4 Xeon Intel        W y        n         n         x        n
-RHEL4 Linux 2.6 Xeon Lustre Intel C y        y         y         x        n
-SuSE Linux 2.4 ia64 Intel         C y        y         y         x        n
-SuSe Linux 2.6.5
-           SGI Altix ia64 Intel   C n        n         n         x        n
+          <blank> = testing incomplete on this feature or platform 
+
+Platform                 C        F90    F90      C++   zlib  SZIP
+                         parallel        parallel
+SunOS5.8 64-bit          n        y      n        y     y     y
+SunOS5.8 32-bit          n        y      n        y     y     y
+SunOS5.10 64-bit         y(1)     y      n        y     y     y
+SunOS5.10 32-bit         y(1)     y      n        y     y     y
+IRIX64_6.5 64-bit        n        y      y        y     y     y
+IRIX64_6.5 32-bit        n        n      n        n     y     y
+Cray XT3           (16)  n        n      n        n     n     n
+AIX-5.2 & 5.3 32-bit     y        y      y        y     y     y
+AIX-5.2 & 5.3 64-bit     y        y      y        y     y     y
+Windows XP               n        y(15)  n(15)    y     y     y
+Windows XP x64           n        y(15)  n(15)    y     y     y
+Windows Vista            n        n      n        y     y     y
+Mac OS X 10.4 PowerPC    n               n
+FreeBSD 4.11             n        n      n        y     y     y
+RedHat EL3  W       (3)  y(1a)    y(10)  y(1a)    y     y     y
+RedHat EL3  W Intel (3)  n        y      n        y     y     n
+RedHat EL3  W PGI   (3)  n        y      n        y     y     n
+SuSe x86_64 gcc  (3,12)  y(1a)    y(11)  n        y     y     y
+SuSe x86_64 Int  (3,12)  n        y(13)  n        y     y     n
+SuSe x86_64 PGI  (3,12)  n        y(8)   n        y     y     y
+Linux 2.4 Xeon C 
+    Lustre Intel  (3,6)  n        y      n        y     y     n
+Linux 2.6 SuSE ia64 C 
+    Intel         (3,7)  y        y      y        y     y     n
+Linux 2.6 SGI Altix 
+    ia64 Intel      (3)  y        y      y        y     y     y
+Alpha OpenVMS 7.3.2      n        y      n        y     n     n
+
+
+
+Platform                 Shared  Shared    Shared    static-  Thread-  
+                         C libs  F90 libs  C++ libs  exec     safe     
+Solaris2.8 64-bit        y       y         y         x        y        
+Solaris2.8 32-bit        y       y         y         x        y        
+Solaris2.10 64-bit       y                           x        y        
+Solaris2.10 32-bit       y                           x        y        
+IRIX64_6.5 64-bit        y       y         n         y        y        
+IRIX64_6.5 32-bit        y       dna       y         y        y        
+HPUX11.00                y       n         y         x        n        
+HPUX11.23-32bit          y       n         n         y        n        
+HPUX11.23-64bit          y       dna       n         y        n        
+Cray XT3           (16)  n       n         n         n        n        
+AIX-5.2 & 5.3 32-bit     n       n         n         y        n        
+AIX-5.2 & 5.3 64-bit     n       n         n         y        n        
+Windows XP               y       y(15)     y         y        y        
+Windows XP x64           y       y(15)     y         y        y        
+Windows Vista            y       n         n         y        y        
+Mac OS X 10.3            y                           y        n        
+Mac OS X 10.4 PowerPC
+FreeBSD 4.11             y       n         y         y        y        
+RedHat EL3  W       (3)  y       y(10)     y         y        y        
+RedHat EL3  W Intel (3)  y       y         y         y        n        
+RedHat EL3  W PGI   (3)  y       y         y         y        n        
+SuSe x86_64 W GNU (3,12) y       y         y         y        y        
+SuSe x86_64 W Int (3,12) y       y         y         y(14)    n        
+SuSe x86_64 W PGI (3,12) y       y         y         y(14)    n        
+Linux 2.4 Xeon C 
+    Lustre Intel    (6)  y       y         y         y        n        
+Linux 2.4 SuSE 
+    ia64 C Intel    (7)  y       y         y         y        n        
+Linux 2.4 SGI Altix 
+    ia64 Intel           y                           y        n        
+Alpha OpenVMS 7.3.2      n       n         n         y        n        
 
     Notes: (1)  Using mpich 1.2.6.
-           (2) Using mpich2 1.0.6.
-           (3) Using Visual Studio 2005 or Cygwin
-           (4) With PGI and Absoft compilers.
-           (5) AMD Opteron x86_64
+           (1a) Using mpich2 1.0.6.
+           (2)  Using mpt and mpich 1.2.6.
+           (3)  Linux 2.6 with GNU, Intel, and PGI compilers, as indicated.  
+                  W or C indicates workstation or cluster, respectively.
+
+           (6)  Linux 2.4.21-32.0.1.  Xeon cluster with ELsmp_perfctr_lustre 
+                  and Intel compilers
+           (7)  Linux 2.4.21, SuSE_292.till.  Ia64 cluster with Intel compilers
+           (8)  pgf90
+           (9)  With Compaq Visual Fortran 6.6c compiler.
+           (10) With PGI and Absoft compilers.
+           (11) PGI and Intel compilers for both C and Fortran
+           (12) AMD Opteron x86_64
+           (13) ifort
+           (14) Yes with C and Fortran, but not with C++
+	   (15) Using Visual Studio 2005 or Cygwin
+           (16) Not tested for this release.
     Compiler versions for each platform are listed in the preceding
     "Platforms Tested" table.
 
@@ -405,6 +1310,12 @@ Known Problems
       the different precision in the values displayed and h5ls appears to
       be dumping floating-point numbers correctly.
 
+* Before building HDF5 F90 Library from source on Crays 
+  replace H5Aff.f90, H5Dff.f90 and H5Pff.f90 files in the fortran/src
+  subdirectory in the top level directory with the Cray-specific files
+  from this site:
+       ftp://www.hdfgroup.uiuc.edu/pub/outgoing/hdf5/hdf5-1.8.0-pre/PATCH/
+
 * Not all platforms behave correctly with szip's shared libraries. Szip is
   disabled in these cases, and a message is relayed at configure time. Static
   libraries should be working on all systems that support szip, and should be
@@ -417,6 +1328,23 @@ Known Problems
   complaining about exit subroutine. Comment out the line 
   IF (total_error .ne. 0) CALL exit (total_error)
 
+* On IA32 and IA64 systems, if you use a compiler other than GCC (such as
+  Intel's ecc or icc compilers), you will need to modify the generated
+  "libtool" program after configuration is finished. On or around line 104 of
+  the libtool file, there are lines which look like:
+
+      # How to pass a linker flag through the compiler.
+      wl=""
+
+  change these lines to this:
+
+      # How to pass a linker flag through the compiler.
+      wl="-Wl,"
+
+  UPDATE: This is now done automatically by the configure script. However, if
+  you still experience a problem, you may want to check this line in the
+  libtool file and make sure that it has the correct value.
+
 * Information about building with PGI and Intel compilers is available in
   INSTALL file sections 5.7 and 5.8
 
diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c
index 85cef2f..9f888c8 100644
--- a/src/H5Adeprec.c
+++ b/src/H5Adeprec.c
@@ -312,8 +312,6 @@ H5Aget_num_attrs(hid_t loc_id)
     H5TRACE1("Is", "i", loc_id);
 
     /* check arguments */
-    if(H5I_BADID == H5I_get_type(loc_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad location ID")
     if(H5I_FILE == H5I_get_type(loc_id) || H5I_ATTR == H5I_get_type(loc_id))
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute")
     if(NULL == (obj = H5I_object(loc_id)))
diff --git a/src/H5B2int.c b/src/H5B2int.c
index eae1291..2625c63 100644
--- a/src/H5B2int.c
+++ b/src/H5B2int.c
@@ -203,7 +203,7 @@ HDmemset(shared->page, 0, shared->node_size);
 
     /* Compute size to store # of records in each node */
     /* (uses leaf # of records because its the largest) */
-    shared->max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[0].max_nrec);
+    shared->max_nrec_size = (H5V_log2_gen((uint64_t)shared->node_info[0].max_nrec) + 7) / 8;
     HDassert(shared->max_nrec_size <= H5B2_SIZEOF_RECORDS_PER_NODE);
 
     /* Initialize internal node info */
@@ -217,7 +217,7 @@ HDmemset(shared->page, 0, shared->node_size);
 
             shared->node_info[u].cum_max_nrec = ((shared->node_info[u].max_nrec + 1) * 
                 shared->node_info[u - 1].cum_max_nrec) + shared->node_info[u].max_nrec;
-            shared->node_info[u].cum_max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[u].cum_max_nrec);
+            shared->node_info[u].cum_max_nrec_size = (H5V_log2_gen((uint64_t)shared->node_info[u].cum_max_nrec) + 7) / 8;
 
             if((shared->node_info[u].nat_rec_fac = H5FL_fac_init(shared->type->nrec_size * shared->node_info[u].max_nrec)) == NULL)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create node native key block factory")
@@ -576,7 +576,7 @@ H5B2_split_root(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2, unsigned *bt2_flags_ptr)
     shared->node_info[shared->depth].merge_nrec = (shared->node_info[shared->depth].max_nrec * shared->merge_percent) / 100;
     shared->node_info[shared->depth].cum_max_nrec = ((shared->node_info[shared->depth].max_nrec + 1) * 
         shared->node_info[shared->depth - 1].cum_max_nrec) + shared->node_info[shared->depth].max_nrec;
-    shared->node_info[shared->depth].cum_max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[shared->depth].cum_max_nrec);
+    shared->node_info[shared->depth].cum_max_nrec_size = (H5V_log2_gen((uint64_t)shared->node_info[shared->depth].cum_max_nrec) + 7) / 8;
     if((shared->node_info[shared->depth].nat_rec_fac = H5FL_fac_init(shared->type->nrec_size * shared->node_info[shared->depth].max_nrec)) == NULL)
 	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create node native key block factory")
     if((shared->node_info[shared->depth].node_ptr_fac = H5FL_fac_init(sizeof(H5B2_node_ptr_t) * (shared->node_info[shared->depth].max_nrec + 1))) == NULL)
diff --git a/src/H5D.c b/src/H5D.c
index 7fd03b3..7153ea5 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -625,7 +625,7 @@ H5Dget_create_plist(hid_t dset_id)
                 H5I_dec_ref(src_id);
                 H5I_dec_ref(dst_id);
                 if(bkg_buf)
-                    (void)H5FL_BLK_FREE(type_conv, bkg_buf);
+                    H5FL_BLK_FREE(type_conv, bkg_buf);
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed")
             } /* end if */
 
@@ -633,7 +633,7 @@ H5Dget_create_plist(hid_t dset_id)
             H5I_dec_ref(src_id);
             H5I_dec_ref(dst_id);
             if(bkg_buf)
-                (void)H5FL_BLK_FREE(type_conv, bkg_buf);
+                H5FL_BLK_FREE(type_conv, bkg_buf);
         } /* end if */
     } /* end if */
 
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
deleted file mode 100644
index baaa5f1..0000000
--- a/src/H5Dchunk.c
+++ /dev/null
@@ -1,1515 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/****************/
-/* Module Setup */
-/****************/
-
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
-
-
-/***********/
-/* Headers */
-/***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Dataset functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#ifdef H5_HAVE_PARALLEL
-#include "H5MMprivate.h"	/* Memory management			*/
-#endif /* H5_HAVE_PARALLEL */
-#include "H5Vprivate.h"		/* Vector and array functions		*/
-
-
-/****************/
-/* Local Macros */
-/****************/
-
-/* Default skip list height for storing list of chunks */
-#define H5D_DEFAULT_SKIPLIST_HEIGHT     8
-
-/* Macros for iterating over chunks to operate on */
-#define H5D_CHUNK_GET_FIRST_NODE(map) (map->use_single ? (H5SL_node_t *)(1) : H5SL_first(map->sel_chunks))
-#define H5D_CHUNK_GET_NODE_INFO(map, node)  (map->use_single ? map->single_chunk_info : (H5D_chunk_info_t *)H5SL_item(node))
-#define H5D_CHUNK_GET_NEXT_NODE(map, node)  (map->use_single ? (H5SL_node_t *)NULL : H5SL_next(node))
-
-
-/******************/
-/* Local Typedefs */
-/******************/
-
-
-/********************/
-/* Local Prototypes */
-/********************/
-
-/* Chunked layout operation callbacks */
-static herr_t H5D_chunk_io_init(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, H5D_chunk_map_t *fm);
-static herr_t H5D_chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *fm);
-static herr_t H5D_chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *fm);
-static herr_t H5D_chunk_io_term(const H5D_chunk_map_t *fm);
-
-/* "Null" layout operation callbacks */
-static ssize_t H5D_null_readvv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
-
-/* Helper routines */
-static herr_t H5D_free_chunk_info(void *item, void *key, void *opdata);
-static herr_t H5D_create_chunk_map_single(H5D_chunk_map_t *fm,
-    const H5D_io_info_t *io_info);
-static herr_t H5D_create_chunk_file_map_hyper(H5D_chunk_map_t *fm,
-    const H5D_io_info_t *io_info);
-static herr_t H5D_create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm);
-static herr_t H5D_chunk_file_cb(void *elem, hid_t type_id, unsigned ndims,
-    const hsize_t *coords, void *fm);
-static herr_t H5D_chunk_mem_cb(void *elem, hid_t type_id, unsigned ndims,
-    const hsize_t *coords, void *fm);
-
-
-
-/*********************/
-/* Package Variables */
-/*********************/
-
-/* Compact storage layout I/O ops */
-const H5D_layout_ops_t H5D_LOPS_CHUNK[1] = {{
-    H5D_chunk_io_init,
-    H5D_chunk_read,
-    H5D_chunk_write,
-#ifdef H5_HAVE_PARALLEL
-    H5D_chunk_collective_read,
-    H5D_chunk_collective_write,
-#endif /* H5_HAVE_PARALLEL */
-    NULL,
-    NULL,
-    H5D_chunk_io_term
-}};
-
-
-/*******************/
-/* Local Variables */
-/*******************/
-
-/* "null" storage layout I/O ops */
-const H5D_layout_ops_t H5D_LOPS_NULL[1] = {{
-    NULL,
-    NULL,
-    NULL,
-#ifdef H5_HAVE_PARALLEL
-    NULL,
-    NULL,
-#endif /* H5_HAVE_PARALLEL */
-    H5D_null_readvv,
-    NULL,
-    NULL
-}};
-
-/* Declare a free list to manage the H5D_chunk_info_t struct */
-H5FL_DEFINE(H5D_chunk_info_t);
-
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_chunk_io_init
- *
- * Purpose:	Performs initialization before any sort of I/O on the raw data
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Thursday, March 20, 2008
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *fm)
-{
-    H5D_t *dataset = io_info->dset;     /* Local pointer to dataset info */
-    const H5T_t *mem_type = type_info->mem_type;        /* Local pointer to memory datatype */
-    H5S_t *tmp_mspace = NULL;   /* Temporary memory dataspace */
-    hssize_t old_offset[H5O_LAYOUT_NDIMS];  /* Old selection offset */
-    htri_t file_space_normalized = FALSE;   /* File dataspace was normalized */
-    hid_t f_tid = (-1);           /* Temporary copy of file datatype for iteration */
-    hbool_t iter_init = FALSE;  /* Selection iteration info has been initialized */
-    unsigned f_ndims;           /* The number of dimensions of the file's dataspace */
-    int sm_ndims;               /* The number of dimensions of the memory buffer's dataspace (signed) */
-    H5SL_node_t *curr_node;     /* Current node in skip list */
-    H5S_sel_type fsel_type;     /* Selection type on disk */
-    char bogus;                 /* "bogus" buffer to pass to selection iterator */
-    unsigned u;                 /* Local index variable */
-    hbool_t sel_hyper_flag;
-    herr_t ret_value = SUCCEED;	/* Return value		*/
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_io_init)
-
-    /* Get layout for dataset */
-    fm->layout = &(dataset->shared->layout);
-    fm->nelmts = nelmts;
-
-    /* Check if the memory space is scalar & make equivalent memory space */
-    if((sm_ndims = H5S_GET_EXTENT_NDIMS(mem_space)) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get dimension number")
-    /* Set the number of dimensions for the memory dataspace */
-    H5_ASSIGN_OVERFLOW(fm->m_ndims, sm_ndims, int, unsigned);
-
-    /* Get dim number and dimensionality for each dataspace */
-    fm->f_ndims = f_ndims = dataset->shared->layout.u.chunk.ndims - 1;
-    if(H5S_get_simple_extent_dims(file_space, fm->f_dims, NULL) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get dimensionality")
-
-    /* Normalize hyperslab selections by adjusting them by the offset */
-    /* (It might be worthwhile to normalize both the file and memory dataspaces
-     * before any (contiguous, chunked, etc) file I/O operation, in order to
-     * speed up hyperslab calculations by removing the extra checks and/or
-     * additions involving the offset and the hyperslab selection -QAK)
-     */
-    if((file_space_normalized = H5S_hyper_normalize_offset((H5S_t *)file_space, old_offset)) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to normalize dataspace by offset")
-
-    /* Decide the number of chunks in each dimension*/
-    for(u=0; u<f_ndims; u++) {
-        /* Keep the size of the chunk dimensions as hsize_t for various routines */
-        fm->chunk_dim[u]=fm->layout->u.chunk.dim[u];
-
-        /* Round up to the next integer # of chunks, to accomodate partial chunks */
-        fm->chunks[u] = ((fm->f_dims[u]+dataset->shared->layout.u.chunk.dim[u])-1) / dataset->shared->layout.u.chunk.dim[u];
-    } /* end for */
-
-    /* Compute the "down" size of 'chunks' information */
-    if(H5V_array_down(f_ndims,fm->chunks,fm->down_chunks) < 0)
-        HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "can't compute 'down' sizes")
-
-#ifdef H5_HAVE_PARALLEL
-    /* Calculate total chunk in file map*/
-    fm->select_chunk = NULL;
-    fm->total_chunks = 1;
-    for(u = 0; u < fm->f_ndims; u++)
-       fm->total_chunks = fm->total_chunks * fm->chunks[u];
-    if(io_info->using_mpi_vfd) {
-        H5_CHECK_OVERFLOW(fm->total_chunks, hsize_t, size_t);
-        if(NULL == (fm->select_chunk = (H5D_chunk_info_t **)H5MM_calloc((size_t)fm->total_chunks * sizeof(H5D_chunk_info_t *))))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
-    } /* end if */
-#endif /* H5_HAVE_PARALLEL */
-
-
-    /* Initialize "last chunk" information */
-    fm->last_index = (hsize_t)-1;
-    fm->last_chunk_info = NULL;
-
-    /* Point at the dataspaces */
-    fm->file_space = file_space;
-    fm->mem_space = mem_space;
-
-    /* Special case for only one element in selection */
-    /* (usually appending a record) */
-    if(nelmts == 1
-#ifdef H5_HAVE_PARALLEL
-            && !(io_info->using_mpi_vfd)
-#endif /* H5_HAVE_PARALLEL */
-        ) {
-        /* Initialize skip list for chunk selections */
-        fm->sel_chunks = NULL;
-        fm->use_single = TRUE;
-
-        /* Initialize single chunk dataspace */
-        if(NULL == dataset->shared->cache.chunk.single_space) {
-            /* Make a copy of the dataspace for the dataset */
-            if((dataset->shared->cache.chunk.single_space = H5S_copy(file_space, TRUE, FALSE)) == NULL)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy file space")
-
-            /* Resize chunk's dataspace dimensions to size of chunk */
-            if(H5S_set_extent_real(dataset->shared->cache.chunk.single_space, fm->chunk_dim) < 0)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "can't adjust chunk dimensions")
-
-            /* Set the single chunk dataspace to 'all' selection */
-            if(H5S_select_all(dataset->shared->cache.chunk.single_space, TRUE) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTSELECT, FAIL, "unable to set all selection")
-        } /* end if */
-        fm->single_space = dataset->shared->cache.chunk.single_space;
-        HDassert(fm->single_space);
-
-        /* Allocate the single chunk information */
-        if(NULL == dataset->shared->cache.chunk.single_chunk_info) {
-            if(NULL == (dataset->shared->cache.chunk.single_chunk_info = H5FL_MALLOC(H5D_chunk_info_t)))
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
-        } /* end if */
-        fm->single_chunk_info = dataset->shared->cache.chunk.single_chunk_info;
-        HDassert(fm->single_chunk_info);
-
-        /* Reset chunk template information */
-        fm->mchunk_tmpl = NULL;
-
-        /* Set up chunk mapping for single element */
-        if(H5D_create_chunk_map_single(fm, io_info) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create chunk selections for single element")
-    } /* end if */
-    else {
-        /* Initialize skip list for chunk selections */
-        if(NULL == dataset->shared->cache.chunk.sel_chunks) {
-            if(NULL == (dataset->shared->cache.chunk.sel_chunks = H5SL_create(H5SL_TYPE_HSIZE, 0.5, (size_t)H5D_DEFAULT_SKIPLIST_HEIGHT)))
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTCREATE, FAIL, "can't create skip list for chunk selections")
-        } /* end if */
-        fm->sel_chunks = dataset->shared->cache.chunk.sel_chunks;
-        HDassert(fm->sel_chunks);
-
-        /* We are not using single element mode */
-        fm->use_single = FALSE;
-
-        /* Get type of selection on disk & in memory */
-        if((fsel_type = H5S_GET_SELECT_TYPE(file_space)) < H5S_SEL_NONE)
-            HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to get type of selection")
-        if((fm->msel_type = H5S_GET_SELECT_TYPE(mem_space)) < H5S_SEL_NONE)
-            HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to get type of selection")
-
-        /* If the selection is NONE or POINTS, set the flag to FALSE */
-        if(fsel_type == H5S_SEL_POINTS || fsel_type == H5S_SEL_NONE)
-            sel_hyper_flag = FALSE;
-        else
-            sel_hyper_flag = TRUE;
-
-        /* Check if file selection is a not a hyperslab selection */
-        if(sel_hyper_flag) {
-            /* Build the file selection for each chunk */
-            if(H5D_create_chunk_file_map_hyper(fm, io_info) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create file chunk selections")
-
-            /* Clean file chunks' hyperslab span "scratch" information */
-            curr_node = H5SL_first(fm->sel_chunks);
-            while(curr_node) {
-                H5D_chunk_info_t *chunk_info;   /* Pointer chunk information */
-
-                /* Get pointer to chunk's information */
-                chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
-                HDassert(chunk_info);
-
-                /* Clean hyperslab span's "scratch" information */
-                if(H5S_hyper_reset_scratch(chunk_info->fspace) < 0)
-                    HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to reset span scratch info")
-
-                /* Get the next chunk node in the skip list */
-                curr_node = H5SL_next(curr_node);
-            } /* end while */
-        } /* end if */
-        else {
-            /* Create temporary datatypes for selection iteration */
-            if((f_tid = H5I_register(H5I_DATATYPE, H5T_copy(dataset->shared->type, H5T_COPY_ALL))) < 0)
-                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register file datatype")
-
-            /* Spaces might not be the same shape, iterate over the file selection directly */
-            if(H5S_select_iterate(&bogus, f_tid, file_space,  H5D_chunk_file_cb, fm) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create file chunk selections")
-
-            /* Reset "last chunk" info */
-            fm->last_index = (hsize_t)-1;
-            fm->last_chunk_info = NULL;
-        } /* end else */
-
-        /* Build the memory selection for each chunk */
-        if(sel_hyper_flag && H5S_select_shape_same(file_space, mem_space) == TRUE) {
-            /* Reset chunk template information */
-            fm->mchunk_tmpl = NULL;
-
-            /* If the selections are the same shape, use the file chunk information
-             * to generate the memory chunk information quickly.
-             */
-            if(H5D_create_chunk_mem_map_hyper(fm) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create memory chunk selections")
-        } /* end if */
-        else {
-            size_t elmt_size;           /* Memory datatype size */
-
-            /* Make a copy of equivalent memory space */
-            if((tmp_mspace = H5S_copy(mem_space, TRUE, FALSE)) == NULL)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy memory space")
-
-            /* De-select the mem space copy */
-            if(H5S_select_none(tmp_mspace) < 0)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to de-select memory space")
-
-            /* Save chunk template information */
-            fm->mchunk_tmpl = tmp_mspace;
-
-            /* Create temporary datatypes for selection iteration */
-            if(f_tid < 0) {
-                if((f_tid = H5I_register(H5I_DATATYPE, H5T_copy(dataset->shared->type, H5T_COPY_ALL))) < 0)
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register file datatype")
-            } /* end if */
-
-            /* Create selection iterator for memory selection */
-            if(0 == (elmt_size = H5T_get_size(mem_type)))
-                HGOTO_ERROR(H5E_DATATYPE, H5E_BADSIZE, FAIL, "datatype size invalid")
-            if(H5S_select_iter_init(&(fm->mem_iter), mem_space, elmt_size) < 0)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator")
-            iter_init = TRUE;	/* Selection iteration info has been initialized */
-
-            /* Spaces aren't the same shape, iterate over the memory selection directly */
-            if(H5S_select_iterate(&bogus, f_tid, file_space, H5D_chunk_mem_cb, fm) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create memory chunk selections")
-
-            /* Clean up hyperslab stuff, if necessary */
-            if(fm->msel_type != H5S_SEL_POINTS) {
-                /* Clean memory chunks' hyperslab span "scratch" information */
-                curr_node = H5SL_first(fm->sel_chunks);
-                while(curr_node) {
-                    H5D_chunk_info_t *chunk_info;   /* Pointer chunk information */
-
-                    /* Get pointer to chunk's information */
-                    chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
-                    HDassert(chunk_info);
-
-                    /* Clean hyperslab span's "scratch" information */
-                    if(H5S_hyper_reset_scratch(chunk_info->mspace) < 0)
-                        HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to reset span scratch info")
-
-                    /* Get the next chunk node in the skip list */
-                    curr_node = H5SL_next(curr_node);
-                } /* end while */
-            } /* end if */
-        } /* end else */
-    } /* end else */
-
-done:
-    /* Release the [potentially partially built] chunk mapping information if an error occurs */
-    if(ret_value < 0) {
-        if(tmp_mspace && !fm->mchunk_tmpl) {
-            if(H5S_close(tmp_mspace) < 0)
-                HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "can't release memory chunk dataspace template")
-        } /* end if */
-
-        if(H5D_chunk_io_term(fm) < 0)
-            HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release chunk mapping")
-    } /* end if */
-
-    /* Reset the global dataspace info */
-    fm->file_space = NULL;
-    fm->mem_space = NULL;
-
-    if(iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&(fm->mem_iter)) < 0)
-            HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator")
-    } /* end if */
-    if(f_tid!=(-1)) {
-        if(H5I_dec_ref(f_tid) < 0)
-            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
-    } /* end if */
-    if(file_space_normalized) {
-        if(H5S_hyper_denormalize_offset((H5S_t *)file_space, old_offset) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to normalize dataspace by offset")
-    } /* end if */
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_chunk_io_init() */
-
-
-/*--------------------------------------------------------------------------
- NAME
-    H5D_free_chunk_info
- PURPOSE
-    Internal routine to destroy a chunk info node
- USAGE
-    void H5D_free_chunk_info(chunk_info)
-        void *chunk_info;    IN: Pointer to chunk info to destroy
- RETURNS
-    No return value
- DESCRIPTION
-    Releases all the memory for a chunk info node.  Called by H5SL_free
- GLOBAL VARIABLES
- COMMENTS, BUGS, ASSUMPTIONS
- EXAMPLES
- REVISION LOG
---------------------------------------------------------------------------*/
-static herr_t
-H5D_free_chunk_info(void *item, void UNUSED *key, void UNUSED *opdata)
-{
-    H5D_chunk_info_t *chunk_info = (H5D_chunk_info_t *)item;
-
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_free_chunk_info)
-
-    HDassert(chunk_info);
-
-    /* Close the chunk's file dataspace, if it's not shared */
-    if(!chunk_info->fspace_shared)
-        (void)H5S_close(chunk_info->fspace);
-    else
-        H5S_select_all(chunk_info->fspace, TRUE);
-
-    /* Close the chunk's memory dataspace, if it's not shared */
-    if(!chunk_info->mspace_shared)
-        (void)H5S_close(chunk_info->mspace);
-
-    /* Free the actual chunk info */
-    H5FL_FREE(H5D_chunk_info_t, chunk_info);
-
-    FUNC_LEAVE_NOAPI(0)
-}   /* H5D_free_chunk_info() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_create_chunk_map_single
- *
- * Purpose:	Create chunk selections when appending a single record
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *		Tuesday, November 20, 2007
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_create_chunk_map_single(H5D_chunk_map_t *fm, const H5D_io_info_t
-#ifndef H5_HAVE_PARALLEL
-    UNUSED
-#endif /* H5_HAVE_PARALLEL */
-    *io_info)
-{
-    H5D_chunk_info_t *chunk_info;           /* Chunk information to insert into skip list */
-    hsize_t     sel_start[H5O_LAYOUT_NDIMS]; /* Offset of low bound of file selection */
-    hsize_t     sel_end[H5O_LAYOUT_NDIMS];  /* Offset of high bound of file selection */
-    unsigned    u;                          /* Local index variable */
-    herr_t	ret_value = SUCCEED;        /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_map_single)
-
-    /* Sanity check */
-    HDassert(fm->f_ndims > 0);
-
-    /* Get coordinate for selection */
-    if(H5S_SELECT_BOUNDS(fm->file_space, sel_start, sel_end) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
-
-    /* Initialize the 'single chunk' file & memory chunk information */
-    chunk_info = fm->single_chunk_info;
-    chunk_info->chunk_points = 1;
-
-    /* Set chunk location & hyperslab size */
-    for(u = 0; u < fm->f_ndims; u++) {
-        HDassert(sel_start[u] == sel_end[u]);
-        chunk_info->coords[u] = (sel_start[u] / fm->layout->u.chunk.dim[u]) * fm->layout->u.chunk.dim[u];
-    } /* end for */
-    chunk_info->coords[fm->f_ndims] = 0;
-
-    /* Calculate the index of this chunk */
-    if(H5V_chunk_index(fm->f_ndims, chunk_info->coords, fm->layout->u.chunk.dim, fm->down_chunks, &chunk_info->index) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
-
-    /* Copy selection for file's dataspace into chunk dataspace */
-    if(H5S_select_copy(fm->single_space, fm->file_space, FALSE) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy file selection")
-
-    /* Move selection back to have correct offset in chunk */
-    if(H5S_SELECT_ADJUST_U(fm->single_space, chunk_info->coords) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk selection")
-
-#ifdef H5_HAVE_PARALLEL
-    /* store chunk selection information */
-    if(io_info->using_mpi_vfd)
-        fm->select_chunk[chunk_info->index] = chunk_info;
-#endif /* H5_HAVE_PARALLEL */
-
-    /* Set the file dataspace for the chunk to the shared 'single' dataspace */
-    chunk_info->fspace = fm->single_space;
-
-    /* Indicate that the chunk's file dataspace is shared */
-    chunk_info->fspace_shared = TRUE;
-
-    /* Just point at the memory dataspace & selection */
-    /* (Casting away const OK -QAK) */
-    chunk_info->mspace = (H5S_t *)fm->mem_space;
-
-    /* Indicate that the chunk's memory dataspace is shared */
-    chunk_info->mspace_shared = TRUE;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_create_chunk_map_single() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_create_chunk_file_map_hyper
- *
- * Purpose:	Create all chunk selections in file.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *		Thursday, May 29, 2003
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
-#ifndef H5_HAVE_PARALLEL
-    UNUSED
-#endif /* H5_HAVE_PARALLEL */
-    *io_info)
-{
-    hsize_t     sel_start[H5O_LAYOUT_NDIMS];   /* Offset of low bound of file selection */
-    hsize_t     sel_end[H5O_LAYOUT_NDIMS];   /* Offset of high bound of file selection */
-    hsize_t     sel_points;                 /* Number of elements in file selection */
-    hsize_t     start_coords[H5O_LAYOUT_NDIMS];   /* Starting coordinates of selection */
-    hsize_t     coords[H5O_LAYOUT_NDIMS];   /* Current coordinates of chunk */
-    hsize_t     end[H5O_LAYOUT_NDIMS];      /* Current coordinates of chunk */
-    hsize_t     chunk_index;                /* Index of chunk */
-    int         curr_dim;                   /* Current dimension to increment */
-    unsigned    u;                          /* Local index variable */
-    herr_t	ret_value = SUCCEED;        /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_file_map_hyper)
-
-    /* Sanity check */
-    assert(fm->f_ndims>0);
-
-    /* Get number of elements selected in file */
-    sel_points = fm->nelmts;
-
-    /* Get bounding box for selection (to reduce the number of chunks to iterate over) */
-    if(H5S_SELECT_BOUNDS(fm->file_space, sel_start, sel_end) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
-
-    /* Set initial chunk location & hyperslab size */
-
-    for(u=0; u<fm->f_ndims; u++) {
-        start_coords[u]=(sel_start[u]/fm->layout->u.chunk.dim[u])*fm->layout->u.chunk.dim[u];
-        coords[u]=start_coords[u];
-        end[u]=(coords[u]+fm->chunk_dim[u])-1;
-    } /* end for */
-
-
-    /* Calculate the index of this chunk */
-    if(H5V_chunk_index(fm->f_ndims,coords,fm->layout->u.chunk.dim,fm->down_chunks,&chunk_index) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
-
-    /* Iterate through each chunk in the dataset */
-    while(sel_points) {
-        /* Check for intersection of temporary chunk and file selection */
-        /* (Casting away const OK - QAK) */
-        if(H5S_hyper_intersect_block((H5S_t *)fm->file_space,coords,end)==TRUE) {
-            H5S_t *tmp_fchunk;                  /* Temporary file dataspace */
-            H5D_chunk_info_t *new_chunk_info;   /* chunk information to insert into skip list */
-            hssize_t    schunk_points;          /* Number of elements in chunk selection */
-
-            /* Create "temporary" chunk for selection operations (copy file space) */
-            if((tmp_fchunk = H5S_copy(fm->file_space, TRUE, FALSE)) == NULL)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy memory space")
-
-            /* Make certain selections are stored in span tree form (not "optimized hyperslab" or "all") */
-            if(H5S_hyper_convert(tmp_fchunk) < 0) {
-                (void)H5S_close(tmp_fchunk);
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to convert selection to span trees")
-            } /* end if */
-
-            /* "AND" temporary chunk and current chunk */
-            if(H5S_select_hyperslab(tmp_fchunk,H5S_SELECT_AND,coords,NULL,fm->chunk_dim,NULL) < 0) {
-                (void)H5S_close(tmp_fchunk);
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't create chunk selection")
-            } /* end if */
-
-            /* Resize chunk's dataspace dimensions to size of chunk */
-            if(H5S_set_extent_real(tmp_fchunk,fm->chunk_dim) < 0) {
-                (void)H5S_close(tmp_fchunk);
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk dimensions")
-            } /* end if */
-
-            /* Move selection back to have correct offset in chunk */
-            if(H5S_SELECT_ADJUST_U(tmp_fchunk, coords) < 0) {
-                (void)H5S_close(tmp_fchunk);
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk selection")
-            } /* end if */
-
-            /* Add temporary chunk to the list of chunks */
-
-            /* Allocate the file & memory chunk information */
-            if (NULL==(new_chunk_info = H5FL_MALLOC (H5D_chunk_info_t))) {
-                (void)H5S_close(tmp_fchunk);
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
-            } /* end if */
-
-            /* Initialize the chunk information */
-
-            /* Set the chunk index */
-            new_chunk_info->index=chunk_index;
-
-#ifdef H5_HAVE_PARALLEL
-            /* store chunk selection information */
-            if(io_info->using_mpi_vfd)
-                fm->select_chunk[chunk_index] = new_chunk_info;
-#endif /* H5_HAVE_PARALLEL */
-
-            /* Set the file chunk dataspace */
-            new_chunk_info->fspace = tmp_fchunk;
-            new_chunk_info->fspace_shared = FALSE;
-
-            /* Set the memory chunk dataspace */
-            new_chunk_info->mspace=NULL;
-            new_chunk_info->mspace_shared = FALSE;
-
-            /* Copy the chunk's coordinates */
-            for(u=0; u<fm->f_ndims; u++)
-                new_chunk_info->coords[u]=coords[u];
-            new_chunk_info->coords[fm->f_ndims]=0;
-
-            /* Insert the new chunk into the skip list */
-            if(H5SL_insert(fm->sel_chunks,new_chunk_info,&new_chunk_info->index) < 0) {
-                H5D_free_chunk_info(new_chunk_info,NULL,NULL);
-                HGOTO_ERROR(H5E_DATASPACE,H5E_CANTINSERT,FAIL,"can't insert chunk into skip list")
-            } /* end if */
-
-            /* Get number of elements selected in chunk */
-            if((schunk_points=H5S_GET_SELECT_NPOINTS(tmp_fchunk)) < 0)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection # of elements")
-            H5_ASSIGN_OVERFLOW(new_chunk_info->chunk_points,schunk_points,hssize_t,size_t);
-
-            /* Decrement # of points left in file selection */
-            sel_points-=(hsize_t)schunk_points;
-
-            /* Leave if we are done */
-            if(sel_points==0)
-                HGOTO_DONE(SUCCEED)
-            assert(sel_points>0);
-        } /* end if */
-
-        /* Increment chunk index */
-        chunk_index++;
-
-        /* Set current increment dimension */
-        curr_dim=(int)fm->f_ndims-1;
-
-        /* Increment chunk location in fastest changing dimension */
-        H5_CHECK_OVERFLOW(fm->chunk_dim[curr_dim],hsize_t,hssize_t);
-        coords[curr_dim]+=fm->chunk_dim[curr_dim];
-        end[curr_dim]+=fm->chunk_dim[curr_dim];
-
-        /* Bring chunk location back into bounds, if necessary */
-        if(coords[curr_dim]>sel_end[curr_dim]) {
-            do {
-                /* Reset current dimension's location to 0 */
-                coords[curr_dim]=start_coords[curr_dim]; /*lint !e771 The start_coords will always be initialized */
-                end[curr_dim]=(coords[curr_dim]+(hssize_t)fm->chunk_dim[curr_dim])-1;
-
-                /* Decrement current dimension */
-                curr_dim--;
-
-                /* Increment chunk location in current dimension */
-                coords[curr_dim]+=fm->chunk_dim[curr_dim];
-                end[curr_dim]=(coords[curr_dim]+fm->chunk_dim[curr_dim])-1;
-            } while(coords[curr_dim]>sel_end[curr_dim]);
-
-            /* Re-Calculate the index of this chunk */
-            if(H5V_chunk_index(fm->f_ndims,coords,fm->layout->u.chunk.dim,fm->down_chunks,&chunk_index) < 0)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
-        } /* end if */
-    } /* end while */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_create_chunk_file_map_hyper() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_create_chunk_mem_map_hyper
- *
- * Purpose:	Create all chunk selections in memory by copying the file
- *              chunk selections and adjusting their offsets to be correct
- *              for the memory.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *		Thursday, May 29, 2003
- *
- * Assumptions: That the file and memory selections are the same shape.
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm)
-{
-    H5SL_node_t *curr_node;                 /* Current node in skip list */
-    hsize_t    file_sel_start[H5O_LAYOUT_NDIMS];    /* Offset of low bound of file selection */
-    hsize_t    file_sel_end[H5O_LAYOUT_NDIMS];  /* Offset of high bound of file selection */
-    hsize_t    mem_sel_start[H5O_LAYOUT_NDIMS]; /* Offset of low bound of file selection */
-    hsize_t    mem_sel_end[H5O_LAYOUT_NDIMS];   /* Offset of high bound of file selection */
-    hssize_t adjust[H5O_LAYOUT_NDIMS];      /* Adjustment to make to all file chunks */
-    hssize_t chunk_adjust[H5O_LAYOUT_NDIMS];  /* Adjustment to make to a particular chunk */
-    unsigned    u;                          /* Local index variable */
-    herr_t	ret_value = SUCCEED;        /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_mem_map_hyper)
-
-    /* Sanity check */
-    assert(fm->f_ndims>0);
-
-    /* Check for all I/O going to a single chunk */
-    if(H5SL_count(fm->sel_chunks)==1) {
-        H5D_chunk_info_t *chunk_info;   /* Pointer to chunk information */
-
-        /* Get the node */
-        curr_node=H5SL_first(fm->sel_chunks);
-
-        /* Get pointer to chunk's information */
-        chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
-        assert(chunk_info);
-
-        /* Just point at the memory dataspace & selection */
-        /* (Casting away const OK -QAK) */
-        chunk_info->mspace=(H5S_t *)fm->mem_space;
-
-        /* Indicate that the chunk's memory space is shared */
-        chunk_info->mspace_shared = TRUE;
-    } /* end if */
-    else {
-        /* Get bounding box for file selection */
-        if(H5S_SELECT_BOUNDS(fm->file_space, file_sel_start, file_sel_end) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
-
-        /* Get bounding box for memory selection */
-        if(H5S_SELECT_BOUNDS(fm->mem_space, mem_sel_start, mem_sel_end) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
-
-        /* Calculate the adjustment for memory selection from file selection */
-        assert(fm->m_ndims==fm->f_ndims);
-        for(u=0; u<fm->f_ndims; u++) {
-            H5_CHECK_OVERFLOW(file_sel_start[u],hsize_t,hssize_t);
-            H5_CHECK_OVERFLOW(mem_sel_start[u],hsize_t,hssize_t);
-            adjust[u]=(hssize_t)file_sel_start[u]-(hssize_t)mem_sel_start[u];
-        } /* end for */
-
-        /* Iterate over each chunk in the chunk list */
-        curr_node=H5SL_first(fm->sel_chunks);
-        while(curr_node) {
-            H5D_chunk_info_t *chunk_info;   /* Pointer to chunk information */
-
-            /* Get pointer to chunk's information */
-            chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
-            assert(chunk_info);
-
-            /* Copy the information */
-
-            /* Copy the memory dataspace */
-            if((chunk_info->mspace = H5S_copy(fm->mem_space, TRUE, FALSE)) == NULL)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy memory space")
-
-            /* Release the current selection */
-            if(H5S_SELECT_RELEASE(chunk_info->mspace) < 0)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection")
-
-            /* Copy the file chunk's selection */
-            if(H5S_select_copy(chunk_info->mspace,chunk_info->fspace,FALSE) < 0)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy selection")
-
-            /* Compensate for the chunk offset */
-            for(u=0; u<fm->f_ndims; u++) {
-                H5_CHECK_OVERFLOW(chunk_info->coords[u],hsize_t,hssize_t);
-                chunk_adjust[u]=adjust[u]-(hssize_t)chunk_info->coords[u]; /*lint !e771 The adjust array will always be initialized */
-            } /* end for */
-
-            /* Adjust the selection */
-            if(H5S_hyper_adjust_s(chunk_info->mspace,chunk_adjust) < 0) /*lint !e772 The chunk_adjust array will always be initialized */
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk selection")
-
-            /* Get the next chunk node in the skip list */
-            curr_node=H5SL_next(curr_node);
-        } /* end while */
-    } /* end else */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_create_chunk_mem_map_hyper() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_chunk_file_cb
- *
- * Purpose:	Callback routine for file selection iterator.  Used when
- *              creating selections in file for each point selected.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *		Wednesday, July 23, 2003
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const hsize_t *coords, void *_fm)
-{
-    H5D_chunk_map_t      *fm = (H5D_chunk_map_t *)_fm;  /* File<->memory chunk mapping info */
-    H5D_chunk_info_t *chunk_info;               /* Chunk information for current chunk */
-    hsize_t    coords_in_chunk[H5O_LAYOUT_NDIMS];        /* Coordinates of element in chunk */
-    hsize_t     chunk_index;                    /* Chunk index */
-    unsigned    u;                              /* Local index variable */
-    herr_t	ret_value = SUCCEED;            /* Return value		*/
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_file_cb)
-
-    /* Calculate the index of this chunk */
-    if(H5V_chunk_index(ndims,coords,fm->layout->u.chunk.dim,fm->down_chunks,&chunk_index) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
-
-    /* Find correct chunk in file & memory skip list */
-    if(chunk_index==fm->last_index) {
-        /* If the chunk index is the same as the last chunk index we used,
-         * get the cached info to operate on.
-         */
-        chunk_info=fm->last_chunk_info;
-    } /* end if */
-    else {
-        /* If the chunk index is not the same as the last chunk index we used,
-         * find the chunk in the skip list.
-         */
-        /* Get the chunk node from the skip list */
-        if(NULL == (chunk_info = (H5D_chunk_info_t *)H5SL_search(fm->sel_chunks, &chunk_index))) {
-            H5S_t *fspace;                      /* Memory chunk's dataspace */
-
-            /* Allocate the file & memory chunk information */
-            if (NULL==(chunk_info = H5FL_MALLOC (H5D_chunk_info_t)))
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
-
-            /* Initialize the chunk information */
-
-            /* Set the chunk index */
-            chunk_info->index=chunk_index;
-
-            /* Create a dataspace for the chunk */
-            if((fspace = H5S_create_simple(fm->f_ndims,fm->chunk_dim,NULL))==NULL) {
-                H5FL_FREE(H5D_chunk_info_t,chunk_info);
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "unable to create dataspace for chunk")
-            } /* end if */
-
-            /* De-select the chunk space */
-            if(H5S_select_none(fspace) < 0) {
-                (void)H5S_close(fspace);
-                H5FL_FREE(H5D_chunk_info_t,chunk_info);
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to de-select dataspace")
-            } /* end if */
-
-            /* Set the file chunk dataspace */
-            chunk_info->fspace = fspace;
-            chunk_info->fspace_shared = FALSE;
-
-            /* Set the memory chunk dataspace */
-            chunk_info->mspace=NULL;
-            chunk_info->mspace_shared = FALSE;
-
-            /* Set the number of selected elements in chunk to zero */
-            chunk_info->chunk_points=0;
-
-            /* Compute the chunk's coordinates */
-            for(u=0; u<fm->f_ndims; u++) {
-                H5_CHECK_OVERFLOW(fm->layout->u.chunk.dim[u],hsize_t,hssize_t);
-                chunk_info->coords[u]=(coords[u]/(hssize_t)fm->layout->u.chunk.dim[u])*(hssize_t)fm->layout->u.chunk.dim[u];
-            } /* end for */
-            chunk_info->coords[fm->f_ndims]=0;
-
-            /* Insert the new chunk into the skip list */
-            if(H5SL_insert(fm->sel_chunks,chunk_info,&chunk_info->index) < 0) {
-                H5D_free_chunk_info(chunk_info,NULL,NULL);
-                HGOTO_ERROR(H5E_DATASPACE,H5E_CANTINSERT,FAIL,"can't insert chunk into skip list")
-            } /* end if */
-        } /* end if */
-
-        /* Update the "last chunk seen" information */
-        fm->last_index=chunk_index;
-        fm->last_chunk_info=chunk_info;
-    } /* end else */
-
-    /* Get the coordinates of the element in the chunk */
-    for(u=0; u<fm->f_ndims; u++)
-        coords_in_chunk[u]=coords[u]%fm->layout->u.chunk.dim[u];
-
-    /* Add point to file selection for chunk */
-    if(H5S_select_elements(chunk_info->fspace, H5S_SELECT_APPEND, (size_t)1, coords_in_chunk) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element")
-
-    /* Increment the number of elemented selected in chunk */
-    chunk_info->chunk_points++;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_chunk_file_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_chunk_mem_cb
- *
- * Purpose:	Callback routine for file selection iterator.  Used when
- *              creating selections in memory for each chunk.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Raymond Lu
- *		Thursday, April 10, 2003
- *
- *-------------------------------------------------------------------------
- */
-/* ARGSUSED */
-static herr_t
-H5D_chunk_mem_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const hsize_t *coords, void *_fm)
-{
-    H5D_chunk_map_t      *fm = (H5D_chunk_map_t *)_fm;  /* File<->memory chunk mapping info */
-    H5D_chunk_info_t *chunk_info;               /* Chunk information for current chunk */
-    hsize_t    coords_in_mem[H5O_LAYOUT_NDIMS];        /* Coordinates of element in memory */
-    hsize_t     chunk_index;                    /* Chunk index */
-    herr_t	ret_value = SUCCEED;            /* Return value		*/
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_mem_cb)
-
-    /* Calculate the index of this chunk */
-    if(H5V_chunk_index(ndims,coords,fm->layout->u.chunk.dim,fm->down_chunks,&chunk_index) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
-
-    /* Find correct chunk in file & memory skip list */
-    if(chunk_index==fm->last_index) {
-        /* If the chunk index is the same as the last chunk index we used,
-         * get the cached spaces to operate on.
-         */
-        chunk_info=fm->last_chunk_info;
-    } /* end if */
-    else {
-        /* If the chunk index is not the same as the last chunk index we used,
-         * find the chunk in the skip list.
-         */
-        /* Get the chunk node from the skip list */
-        if(NULL == (chunk_info = (H5D_chunk_info_t *)H5SL_search(fm->sel_chunks, &chunk_index)))
-            HGOTO_ERROR(H5E_DATASPACE, H5E_NOTFOUND, FAIL, "can't locate chunk in skip list")
-
-        /* Check if the chunk already has a memory space */
-        if(chunk_info->mspace==NULL) {
-            /* Copy the template memory chunk dataspace */
-            if((chunk_info->mspace = H5S_copy(fm->mchunk_tmpl, FALSE, FALSE)) == NULL)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy file space")
-        } /* end else */
-
-        /* Update the "last chunk seen" information */
-        fm->last_index=chunk_index;
-        fm->last_chunk_info=chunk_info;
-    } /* end else */
-
-    /* Get coordinates of selection iterator for memory */
-    if(H5S_SELECT_ITER_COORDS(&fm->mem_iter,coords_in_mem) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get iterator coordinates")
-
-    /* Add point to memory selection for chunk */
-    if(fm->msel_type==H5S_SEL_POINTS) {
-        if(H5S_select_elements(chunk_info->mspace, H5S_SELECT_APPEND, (size_t)1, coords_in_mem) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element")
-    } /* end if */
-    else {
-        if(H5S_hyper_add_span_element(chunk_info->mspace, fm->m_ndims, coords_in_mem) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element")
-    } /* end else */
-
-    /* Move memory selection iterator to next element in selection */
-    if(H5S_SELECT_ITER_NEXT(&fm->mem_iter, (size_t)1) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTNEXT, FAIL, "unable to move to next iterator location")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_chunk_mem_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_chunk_cacheable
- *
- * Purpose:	A small internal function to if it's possible to load the
- *              chunk into cache.
- *
- * Return:	TRUE or FALSE
- *
- * Programmer:	Raymond Lu
- *		17 July 2007
- *
- *-------------------------------------------------------------------------
- */
-hbool_t 
-H5D_chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr)
-{
-    const H5D_t *dataset = io_info->dset;
-    hbool_t ret_value;
- 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_cacheable)
-
-    HDassert(io_info);
-    HDassert(dataset);
-
-    /* Must bring the whole chunk in if there are any filters */
-    if(dataset->shared->dcpl_cache.pline.nused > 0)
-        ret_value = TRUE;
-    else
-#ifdef H5_HAVE_PARALLEL
-         /* If MPI based VFD is used and the file is opened for write access, must
-          *         bypass the chunk-cache scheme because other MPI processes could
-          *         be writing to other elements in the same chunk.  Do a direct
-          *         write-through of only the elements requested.
-          */
-        if(io_info->using_mpi_vfd && (H5F_ACC_RDWR & H5F_INTENT(dataset->oloc.file)))
-            ret_value = FALSE;
-        else
-#endif /* H5_HAVE_PARALLEL */
-            /* If the chunk is too large to keep in the cache and if the address
-             * for the chunk has been defined, then don't load the chunk into the
-             * cache, just write the data to it directly.
-             */
-            if(dataset->shared->layout.u.chunk.size > dataset->shared->cache.chunk.nbytes
-                    && H5F_addr_defined(caddr))
-                ret_value = FALSE;
-            else
-                ret_value = TRUE;
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_chunk_cacheable() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_chunk_in_cache
- *
- * Purpose:	Check if a chunk is in the cache.
- *
- * Return:	TRUE or FALSE
- *
- * Programmer:	Quincey Koziol
- *		1 April 2008
- *
- *-------------------------------------------------------------------------
- */
-static hbool_t 
-H5D_chunk_in_cache(const H5D_io_info_t *io_info)
-{
-    H5D_rdcc_t	*rdcc = &(io_info->dset->shared->cache.chunk);/*raw data chunk cache*/
-    hbool_t	found = FALSE;		/*already in cache?	*/
- 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_in_cache)
-
-    HDassert(io_info);
-
-    /* Check if the chunk is in the cache (but hasn't been written to disk yet) */
-    if(rdcc->nslots > 0) {
-        unsigned idx = H5D_CHUNK_HASH(io_info->dset->shared, io_info->store->chunk.index); /* Cache entry index */
-        H5D_rdcc_ent_t	*ent = rdcc->slot[idx]; /* Cache entry */
-
-        /* Potential match... */
-        if(ent) {
-            size_t u;           /* Local index variable */
-
-            for(u = 0, found = TRUE; u < io_info->dset->shared->layout.u.chunk.ndims; u++) {
-                if(io_info->store->chunk.offset[u] != ent->offset[u]) {
-                    found = FALSE;
-                    break;
-                } /* end if */
-            } /* end for */
-        } /* end if */
-    } /* end if */
-
-    FUNC_LEAVE_NOAPI(found)
-} /* end H5D_chunk_in_cache() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_chunk_read
- *
- * Purpose:	Read from a chunked dataset.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Raymond Lu
- *		Thursday, April 10, 2003
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
-    H5D_chunk_map_t *fm)
-{
-    H5SL_node_t *chunk_node;            /* Current node in chunk skip list */
-    H5D_io_info_t nul_io_info;          /* "null" I/O info object */
-    H5D_io_info_t ctg_io_info;          /* Contiguous I/O info object */
-    H5D_storage_t ctg_store;            /* Chunk storage information as contiguous dataset */
-    H5D_io_info_t cpt_io_info;          /* Compact I/O info object */
-    H5D_storage_t cpt_store;            /* Chunk storage information as compact dataset */
-    hbool_t     cpt_dirty;              /* Temporary placeholder for compact storage "dirty" flag */
-    size_t      src_accessed_bytes = 0; /* Total accessed size in a chunk */
-    hbool_t     skip_missing_chunks = FALSE;    /* Whether to skip missing chunks */
-    unsigned    idx_hint = 0;           /* Cache index hint      */
-    herr_t	ret_value = SUCCEED;	/*return value		*/
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_read)
-
-    /* Sanity check */
-    HDassert(io_info);
-    HDassert(io_info->u.rbuf);
-    HDassert(type_info);
-    HDassert(fm);
-
-    /* Set up "null" I/O info object */
-    HDmemcpy(&nul_io_info, io_info, sizeof(nul_io_info));
-    nul_io_info.layout_ops = *H5D_LOPS_NULL;
-
-    /* Set up contiguous I/O info object */
-    HDmemcpy(&ctg_io_info, io_info, sizeof(ctg_io_info));
-    ctg_io_info.store = &ctg_store;
-    ctg_io_info.layout_ops = *H5D_LOPS_CONTIG;
-
-    /* Initialize temporary contiguous storage info */
-    ctg_store.contig.dset_size = (hsize_t)io_info->dset->shared->layout.u.chunk.size;
-
-    /* Set up compact I/O info object */
-    HDmemcpy(&cpt_io_info, io_info, sizeof(cpt_io_info));
-    cpt_io_info.store = &cpt_store;
-    cpt_io_info.layout_ops = *H5D_LOPS_COMPACT;
-
-    /* Initialize temporary compact storage info */
-    cpt_store.compact.dirty = &cpt_dirty;
-
-    {
-        const H5O_fill_t *fill = &(io_info->dset->shared->dcpl_cache.fill);    /* Fill value info */
-        H5D_fill_value_t fill_status;       /* Fill value status */
-
-        /* Check the fill value status */
-        if(H5P_is_fill_value_defined(fill, &fill_status) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't tell if fill value defined")
-
-        /* If we are never to return fill values, or if we would return them
-         * but they aren't set, set the flag to skip missing chunks.
-         */
-        if(fill->fill_time == H5D_FILL_TIME_NEVER ||
-                (fill->fill_time == H5D_FILL_TIME_IFSET && fill_status != H5D_FILL_VALUE_USER_DEFINED))
-            skip_missing_chunks = TRUE;
-    }
-
-    /* Iterate through nodes in chunk skip list */
-    chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm);
-    while(chunk_node) {
-        H5D_chunk_info_t *chunk_info;   /* Chunk information */
-        H5D_io_info_t *chk_io_info;     /* Pointer to I/O info object for this chunk */
-        void *chunk;                    /* Pointer to locked chunk buffer */
-        haddr_t	chunk_addr;             /* Chunk address on disk */
-        H5D_istore_ud1_t udata;		/* B-tree pass-through	*/
-
-        /* Get the actual chunk information from the skip list node */
-        chunk_info = H5D_CHUNK_GET_NODE_INFO(fm, chunk_node);
-
-        /* Pass in chunk's coordinates in a union. */
-        io_info->store->chunk.offset = chunk_info->coords;
-        io_info->store->chunk.index = chunk_info->index;
-
-        /* Get the address of the chunk in the file */
-        chunk_addr = H5D_istore_get_addr(io_info, &udata);
-
-        /* Check for non-existant chunk & skip it if appropriate */
-        if(!H5F_addr_defined(chunk_addr) && !H5D_chunk_in_cache(io_info)
-                && skip_missing_chunks) {
-            /* No chunk cached */
-            chunk = NULL;
-
-            /* Point I/O info at "null" I/O info for this chunk */
-            chk_io_info = &nul_io_info;
-        } /* end if */
-        else {
-            /* Load the chunk into cache and lock it. */
-            if(H5D_chunk_cacheable(io_info, chunk_addr)) {
-                /* Compute # of bytes accessed in chunk */
-                src_accessed_bytes = chunk_info->chunk_points * type_info->src_type_size;
-
-                /* Lock the chunk into the cache */
-                if(NULL == (chunk = H5D_istore_lock(io_info, &udata, FALSE, &idx_hint)))
-                    HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
-
-                /* Set up the storage buffer information for this chunk */
-                cpt_store.compact.buf = chunk;
-
-                /* Point I/O info at contiguous I/O info for this chunk */
-                chk_io_info = &cpt_io_info;
-            } /* end if */
-            else {
-                /* Sanity check */
-                HDassert(H5F_addr_defined(chunk_addr));
-
-                /* Set up the storage address information for this chunk */
-                ctg_store.contig.dset_addr = chunk_addr;
-
-                /* No chunk cached */
-                chunk = NULL;
-
-                /* Point I/O info at temporary I/O info for this chunk */
-                chk_io_info = &ctg_io_info;
-            } /* end else */
-        } /* end else */
-
-        /* Perform the actual read operation */
-        if((io_info->io_ops.single_read)(chk_io_info, type_info,
-                (hsize_t)chunk_info->chunk_points, chunk_info->fspace, chunk_info->mspace) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "chunked read failed")
-
-        /* Release the cache lock on the chunk. */
-        if(chunk && H5D_istore_unlock(io_info, FALSE, idx_hint, chunk, src_accessed_bytes) < 0)
-            HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
-
-        /* Advance to next chunk in list */
-        chunk_node = H5D_CHUNK_GET_NEXT_NODE(fm, chunk_node);
-    } /* end while */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5D_chunk_read() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_chunk_write
- *
- * Purpose:	Writes to a chunked dataset.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Raymond Lu
- *		Thursday, April 10, 2003
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
-    H5D_chunk_map_t *fm)
-{
-    H5SL_node_t *chunk_node;            /* Current node in chunk skip list */
-    H5D_io_info_t ctg_io_info;          /* Contiguous I/O info object */
-    H5D_storage_t ctg_store;            /* Chunk storage information as contiguous dataset */
-    H5D_io_info_t cpt_io_info;          /* Compact I/O info object */
-    H5D_storage_t cpt_store;            /* Chunk storage information as compact dataset */
-    hbool_t     cpt_dirty;              /* Temporary placeholder for compact storage "dirty" flag */
-    size_t      dst_accessed_bytes = 0; /* Total accessed size in a chunk */
-    unsigned    idx_hint = 0;           /* Cache index hint      */
-    herr_t	ret_value = SUCCEED;	/* Return value		*/
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_write)
-
-    /* Sanity check */
-    HDassert(io_info);
-    HDassert(io_info->u.wbuf);
-    HDassert(type_info);
-    HDassert(fm);
-
-    /* Set up contiguous I/O info object */
-    HDmemcpy(&ctg_io_info, io_info, sizeof(ctg_io_info));
-    ctg_io_info.store = &ctg_store;
-    ctg_io_info.layout_ops = *H5D_LOPS_CONTIG;
-
-    /* Initialize temporary contiguous storage info */
-    ctg_store.contig.dset_size = (hsize_t)io_info->dset->shared->layout.u.chunk.size;
-
-    /* Set up compact I/O info object */
-    HDmemcpy(&cpt_io_info, io_info, sizeof(cpt_io_info));
-    cpt_io_info.store = &cpt_store;
-    cpt_io_info.layout_ops = *H5D_LOPS_COMPACT;
-
-    /* Initialize temporary compact storage info */
-    cpt_store.compact.dirty = &cpt_dirty;
-
-    /* Iterate through nodes in chunk skip list */
-    chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm);
-    while(chunk_node) {
-        H5D_chunk_info_t *chunk_info;   /* Chunk information */
-        H5D_io_info_t *chk_io_info;     /* Pointer to I/O info object for this chunk */
-        void *chunk;                    /* Pointer to locked chunk buffer */
-        haddr_t	chunk_addr;             /* Chunk address on disk */
-        H5D_istore_ud1_t udata;		/* B-tree pass-through	*/
-
-        /* Get the actual chunk information from the skip list node */
-        chunk_info = H5D_CHUNK_GET_NODE_INFO(fm, chunk_node);
-
-        /* Pass in chunk's coordinates in a union. */
-        io_info->store->chunk.offset = chunk_info->coords;
-        io_info->store->chunk.index = chunk_info->index;
-
-        /* Load the chunk into cache.  But if the whole chunk is written,
-         * simply allocate space instead of load the chunk. */
-        chunk_addr = H5D_istore_get_addr(io_info, &udata);
-        if(H5D_chunk_cacheable(io_info, chunk_addr)) {
-            hbool_t entire_chunk = TRUE;       /* Whether whole chunk is selected */
-
-            /* Compute # of bytes accessed in chunk */
-            dst_accessed_bytes = chunk_info->chunk_points * type_info->dst_type_size;
-
-            /* Determine if we will access all the data in the chunk */
-            if(dst_accessed_bytes != ctg_store.contig.dset_size ||
-                    (chunk_info->chunk_points * type_info->src_type_size) != ctg_store.contig.dset_size)
-                entire_chunk = FALSE;
-
-            /* Lock the chunk into the cache */
-            if(NULL == (chunk = H5D_istore_lock(io_info, &udata, entire_chunk, &idx_hint)))
-                HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
-
-            /* Set up the storage buffer information for this chunk */
-            cpt_store.compact.buf = chunk;
-
-            /* Point I/O info at main I/O info for this chunk */
-            chk_io_info = &cpt_io_info;
-        } /* end if */
-        else {
-            /* Sanity check */
-            HDassert(H5F_addr_defined(chunk_addr));
-
-            /* Set up the storage address information for this chunk */
-            ctg_store.contig.dset_addr = chunk_addr;
-
-            /* No chunk cached */
-            chunk = NULL;
-
-            /* Point I/O info at temporary I/O info for this chunk */
-            chk_io_info = &ctg_io_info;
-        } /* end else */
-
-        /* Perform the actual write operation */
-        if((io_info->io_ops.single_write)(chk_io_info, type_info,
-                (hsize_t)chunk_info->chunk_points, chunk_info->fspace, chunk_info->mspace) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "chunked write failed")
-
-        /* Release the cache lock on the chunk. */
-        if(chunk && H5D_istore_unlock(io_info, TRUE, idx_hint, chunk, dst_accessed_bytes) < 0)
-            HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
-
-        /* Advance to next chunk in list */
-        chunk_node = H5D_CHUNK_GET_NEXT_NODE(fm, chunk_node);
-    } /* end while */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5D_chunk_write() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_chunk_io_term
- *
- * Purpose:	Destroy I/O operation information.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *		Saturday, May 17, 2003
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_chunk_io_term(const H5D_chunk_map_t *fm)
-{
-    herr_t	ret_value = SUCCEED;	/*return value		*/
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_io_term)
-
-    /* Single element I/O vs. multiple element I/O cleanup */
-    if(fm->use_single) {
-        /* Sanity checks */
-        HDassert(fm->sel_chunks == NULL);
-        HDassert(fm->single_chunk_info);
-        HDassert(fm->single_chunk_info->fspace_shared);
-        HDassert(fm->single_chunk_info->mspace_shared);
-
-        /* Reset the selection for the single element I/O */
-        H5S_select_all(fm->single_space, TRUE);
-    } /* end if */
-    else {
-        /* Release the nodes on the list of selected chunks */
-        if(fm->sel_chunks)
-            if(H5SL_free(fm->sel_chunks, H5D_free_chunk_info, NULL) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTNEXT, FAIL, "can't iterate over chunks")
-    } /* end else */
-
-    /* Free the memory chunk dataspace template */
-    if(fm->mchunk_tmpl)
-        if(H5S_close(fm->mchunk_tmpl) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "can't release memory chunk dataspace template")
-#ifdef H5_HAVE_PARALLEL
-    if(fm->select_chunk)
-        H5MM_xfree(fm->select_chunk);
-#endif /* H5_HAVE_PARALLEL */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_chunk_io_term() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_null_readvv
- *
- * Purpose:	Performs "no-op" I/O operation, advancing through two I/O
- *              vectors, until one runs out.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *		Tuesday, April  1, 2008
- *
- *-------------------------------------------------------------------------
- */
-static ssize_t
-H5D_null_readvv(const H5D_io_info_t UNUSED *io_info,
-    size_t chunk_max_nseq, size_t *chunk_curr_seq, size_t chunk_len_arr[], hsize_t chunk_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[])
-{
-    size_t u, v;                /* Local index variables */
-    size_t size;                /* Size of sequence in bytes */
-    ssize_t bytes_processed = 0; /* Eventual return value */
-
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_null_readvv)
-
-    /* Check args */
-    HDassert(chunk_len_arr);
-    HDassert(chunk_offset_arr);
-    HDassert(mem_len_arr);
-    HDassert(mem_offset_arr);
-
-    /* Work through all the sequences */
-    for(u = *mem_curr_seq, v = *chunk_curr_seq; u < mem_max_nseq && v < chunk_max_nseq; ) {
-        /* Choose smallest buffer to write */
-        if(chunk_len_arr[v] < mem_len_arr[u])
-            size = chunk_len_arr[v];
-        else
-            size = mem_len_arr[u];
-
-        /* Update source information */
-        chunk_len_arr[v] -= size;
-        chunk_offset_arr[v] += size;
-        if(chunk_len_arr[v] == 0)
-            v++;
-
-        /* Update destination information */
-        mem_len_arr[u] -= size;
-        mem_offset_arr[u] += size;
-        if(mem_len_arr[u] == 0)
-            u++;
-
-        /* Increment number of bytes copied */
-        bytes_processed += (ssize_t)size;
-    } /* end for */
-
-    /* Update current sequence vectors */
-    *mem_curr_seq = u;
-    *chunk_curr_seq = v;
-
-    FUNC_LEAVE_NOAPI(bytes_processed)
-} /* H5D_null_readvv() */
-
diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c
index c3abab6..2e4d3f7 100644
--- a/src/H5Dcompact.c
+++ b/src/H5Dcompact.c
@@ -41,52 +41,22 @@
 #include "H5Oprivate.h"		/* Object headers		  	*/
 #include "H5Vprivate.h"		/* Vector and array functions		*/
 
-
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-/* Layout operation callbacks */
-static herr_t H5D_compact_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *cm);
-static ssize_t H5D_compact_readvv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_size_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[]);
-static ssize_t H5D_compact_writevv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_size_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[]);
-
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-/* Compact storage layout I/O ops */
-const H5D_layout_ops_t H5D_LOPS_COMPACT[1] = {{
-    H5D_compact_io_init,
-    H5D_contig_read,
-    H5D_contig_write,
-#ifdef H5_HAVE_PARALLEL
-    NULL,
-    NULL,
-#endif /* H5_HAVE_PARALLEL */
-    H5D_compact_readvv,
-    H5D_compact_writevv,
-    NULL
-}};
-
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -94,7 +64,6 @@ const H5D_layout_ops_t H5D_LOPS_COMPACT[1] = {{
 /* Declare extern the free list to manage blocks of type conversion data */
 H5FL_BLK_EXTERN(type_conv);
 
-
 
 /*-------------------------------------------------------------------------
  * Function:	H5D_compact_fill
@@ -149,32 +118,6 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5D_compact_io_init
- *
- * Purpose:	Performs initialization before any sort of I/O on the raw data
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Thursday, March 20, 2008
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_compact_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *type_info,
-    hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
-    H5D_chunk_map_t UNUSED *cm)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_compact_io_init)
-
-    io_info->store->compact.buf = io_info->dset->shared->layout.u.compact.buf;
-    io_info->store->compact.dirty = &io_info->dset->shared->layout.u.compact.dirty;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5D_compact_io_init() */
-
-
-/*-------------------------------------------------------------------------
  * Function:    H5D_compact_readvv
  *
  * Purpose:     Reads some data vectors from a dataset into a buffer.
@@ -192,19 +135,20 @@ H5D_compact_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *
  *
  *-------------------------------------------------------------------------
  */
-static ssize_t
+ssize_t
 H5D_compact_readvv(const H5D_io_info_t *io_info,
     size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_size_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[])
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[],
+    haddr_t UNUSED addr, void UNUSED *pointer/*in*/, void *buf)
 {
-    ssize_t ret_value;                  /* Return value */
+    ssize_t ret_value;          /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_compact_readvv)
+    FUNC_ENTER_NOAPI(H5D_compact_readvv, FAIL)
 
-    HDassert(io_info);
+    assert(io_info->dset);
 
     /* Use the vectorized memory copy routine to do actual work */
-    if((ret_value = H5V_memcpyvv(io_info->u.rbuf, mem_max_nseq, mem_curr_seq, mem_size_arr, mem_offset_arr, io_info->store->compact.buf, dset_max_nseq, dset_curr_seq, dset_size_arr, dset_offset_arr)) < 0)
+    if((ret_value=H5V_memcpyvv(buf,mem_max_nseq,mem_curr_seq,mem_size_arr,mem_offset_arr,io_info->dset->shared->layout.u.compact.buf,dset_max_nseq,dset_curr_seq,dset_size_arr,dset_offset_arr))<0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vectorized memcpy failed")
 
 done:
@@ -233,23 +177,24 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static ssize_t
+ssize_t
 H5D_compact_writevv(const H5D_io_info_t *io_info,
     size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_size_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[])
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[],
+    haddr_t UNUSED addr, void UNUSED *pointer/*in*/, const void *buf)
 {
-    ssize_t ret_value;                  /* Return value */
+    ssize_t ret_value;          /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_compact_writevv)
+    FUNC_ENTER_NOAPI(H5D_compact_writevv, FAIL)
 
-    HDassert(io_info);
+    assert(io_info->dset);
 
     /* Use the vectorized memory copy routine to do actual work */
-    if((ret_value = H5V_memcpyvv(io_info->store->compact.buf, dset_max_nseq, dset_curr_seq, dset_size_arr, dset_offset_arr, io_info->u.wbuf, mem_max_nseq, mem_curr_seq, mem_size_arr, mem_offset_arr)) < 0)
+    if((ret_value=H5V_memcpyvv(io_info->dset->shared->layout.u.compact.buf,dset_max_nseq,dset_curr_seq,dset_size_arr,dset_offset_arr,buf,mem_max_nseq,mem_curr_seq,mem_size_arr,mem_offset_arr))<0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vectorized memcpy failed")
 
     /* Mark the compact dataset's buffer as dirty */
-    *io_info->store->compact.dirty = TRUE;
+    io_info->dset->shared->layout.u.compact.dirty = TRUE;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -426,11 +371,11 @@ done:
         if(H5I_dec_ref(tid_mem) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
     if(buf)
-        (void)H5FL_BLK_FREE(type_conv, buf);
+        H5FL_BLK_FREE(type_conv, buf);
     if(reclaim_buf)
-        (void)H5FL_BLK_FREE(type_conv, reclaim_buf);
+        H5FL_BLK_FREE(type_conv, reclaim_buf);
     if(bkg)
-        (void)H5FL_BLK_FREE(type_conv, bkg);
+        H5FL_BLK_FREE(type_conv, bkg);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_compact_copy() */
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index 1a3fda5..bdb8294 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -45,50 +45,24 @@
 #include "H5Pprivate.h"		/* Property lists			*/
 #include "H5Vprivate.h"		/* Vector and array functions		*/
 
-
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-
-/* Layout operation callbacks */
-static herr_t H5D_contig_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *cm);
-
-/* Helper routines */
-static herr_t H5D_contig_write_one(H5D_io_info_t *io_info, hsize_t offset,
-    size_t size);
-
+static herr_t H5D_contig_write(H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
+    hid_t dxpl_id, const H5D_storage_t *store, hsize_t offset, size_t size, const void *buf);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-/* Contiguous storage layout I/O ops */
-const H5D_layout_ops_t H5D_LOPS_CONTIG[1] = {{
-    H5D_contig_io_init,
-    H5D_contig_read,
-    H5D_contig_write,
-#ifdef H5_HAVE_PARALLEL
-    H5D_contig_collective_read,
-    H5D_contig_collective_write,
-#endif /* H5_HAVE_PARALLEL */
-    H5D_contig_readvv,
-    H5D_contig_writevv,
-    NULL
-}};
-
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -99,7 +73,6 @@ H5FL_BLK_DEFINE(sieve_buf);
 /* Declare extern the free list to manage blocks of type conversion data */
 H5FL_BLK_EXTERN(type_conv);
 
-
 
 /*-------------------------------------------------------------------------
  * Function:	H5D_contig_create
@@ -148,8 +121,7 @@ done:
 herr_t
 H5D_contig_fill(H5D_t *dset, hid_t dxpl_id)
 {
-    H5D_io_info_t ioinfo;       /* Dataset I/O info */
-    H5D_storage_t store;        /* Union of storage info for dataset */
+    H5D_storage_t store;                /* Union of storage info for dataset */
     H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
     H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
     hssize_t    snpoints;       /* Number of points in space (for error checking) */
@@ -226,9 +198,6 @@ H5D_contig_fill(H5D_t *dset, hid_t dxpl_id)
     /* Start at the beginning of the dataset */
     offset = 0;
 
-    /* Simple setup for dataset I/O info struct */
-    H5D_BUILD_IO_INFO_WRT(&ioinfo, dset, dxpl_cache, my_dxpl_id, &store, fb_info.fill_buf);
-
     /*
      * Fill the entire current extent with the fill value.  We can do
      * this quite efficiently by making sure we copy the fill value
@@ -256,7 +225,7 @@ H5D_contig_fill(H5D_t *dset, hid_t dxpl_id)
                 /* Write the chunks out from only one process */
                 /* !! Use the internal "independent" DXPL!! -QAK */
                 if(H5_PAR_META_WRITE == mpi_rank)
-                    if(H5D_contig_write_one(&ioinfo, offset, size) < 0)
+                    if(H5D_contig_write(dset, dxpl_cache, my_dxpl_id, &store, offset, size, fb_info.fill_buf) < 0)
                         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to write fill value to dataset")
 
                 /* Indicate that blocks are being written */
@@ -265,7 +234,7 @@ H5D_contig_fill(H5D_t *dset, hid_t dxpl_id)
             else {
 #endif /* H5_HAVE_PARALLEL */
                 H5_CHECK_OVERFLOW(size, size_t, hsize_t);
-                if(H5D_contig_write_one(&ioinfo, offset, size) < 0)
+                if(H5D_contig_write(dset, dxpl_cache, my_dxpl_id, &store, offset, size, fb_info.fill_buf) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to write fill value to dataset")
 #ifdef H5_HAVE_PARALLEL
             } /* end else */
@@ -355,108 +324,8 @@ H5D_contig_get_addr(const H5D_t *dset)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5D_contig_io_init
- *
- * Purpose:	Performs initialization before any sort of I/O on the raw data
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Thursday, March 20, 2008
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_contig_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *type_info,
-    hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
-    H5D_chunk_map_t UNUSED *cm)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_contig_io_init)
-
-    io_info->store->contig.dset_addr = io_info->dset->shared->layout.u.contig.addr;
-    io_info->store->contig.dset_size = io_info->dset->shared->layout.u.contig.size;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5D_contig_io_init() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_contig_read
- *
- * Purpose:	Read from a contiguous dataset.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Raymond Lu
- *		Thursday, April 10, 2003
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5D_contig_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t UNUSED *fm)
-{
-    herr_t	ret_value = SUCCEED;	/*return value		*/
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_contig_read)
-
-    /* Sanity check */
-    HDassert(io_info);
-    HDassert(io_info->u.rbuf);
-    HDassert(type_info);
-    HDassert(mem_space);
-    HDassert(file_space);
-
-    /* Read data */
-    if((io_info->io_ops.single_read)(io_info, type_info, nelmts, file_space, mem_space) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "contiguous read failed")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_contig_read() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5D_contig_write
  *
- * Purpose:	Write to a contiguous dataset.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Raymond Lu
- *		Thursday, April 10, 2003
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5D_contig_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t UNUSED *fm)
-{
-    herr_t	ret_value = SUCCEED;	/*return value		*/
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_contig_write)
-
-    /* Sanity check */
-    HDassert(io_info);
-    HDassert(io_info->u.wbuf);
-    HDassert(type_info);
-    HDassert(mem_space);
-    HDassert(file_space);
-
-    /* Write data */
-    if((io_info->io_ops.single_write)(io_info, type_info, nelmts, file_space, mem_space) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "contiguous write failed")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_contig_write() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_contig_write_one
- *
  * Purpose:	Writes some data from a dataset into a buffer.
  *		The data is contiguous.	 The address is relative to the base
  *		address for the file.
@@ -469,27 +338,34 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_contig_write_one(H5D_io_info_t *io_info, hsize_t offset, size_t size)
+H5D_contig_write(H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
+    hid_t dxpl_id, const H5D_storage_t *store,
+    hsize_t offset, size_t size, const void *buf)
 {
-    hsize_t dset_off = offset;  /* Offset in dataset */
-    size_t dset_len = size;     /* Length in dataset */
-    size_t dset_curr_seq = 0;   /* "Current sequence" in dataset */
-    hsize_t mem_off = 0;        /* Offset in memory */
-    size_t mem_len = size;      /* Length in memory */
-    size_t mem_curr_seq = 0;    /* "Current sequence" in memory */
-    herr_t ret_value = SUCCEED; /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_contig_write_one)
-
-    HDassert(io_info);
-
-    if(H5D_contig_writevv(io_info, (size_t)1, &dset_curr_seq, &dset_len, &dset_off, 
-            (size_t)1, &mem_curr_seq, &mem_len, &mem_off) < 0)
+    H5D_io_info_t io_info;      /* Dataset I/O info */
+    hsize_t dset_off=offset;    /* Offset in dataset */
+    size_t dset_len=size;       /* Length in dataset */
+    size_t dset_curr_seq=0;     /* "Current sequence" in dataset */
+    hsize_t mem_off=0;          /* Offset in memory */
+    size_t mem_len=size;        /* Length in memory */
+    size_t mem_curr_seq=0;      /* "Current sequence" in memory */
+    herr_t ret_value=SUCCEED;   /* Return value */
+
+    FUNC_ENTER_NOAPI(H5D_contig_write, FAIL)
+
+    assert (dset);
+    assert (dxpl_cache);
+    assert (store);
+    assert (buf);
+
+    H5D_BUILD_IO_INFO(&io_info,dset,dxpl_cache,dxpl_id,store);
+    if(H5D_contig_writevv(&io_info, (size_t)1, &dset_curr_seq, &dset_len, &dset_off, 
+            (size_t)1, &mem_curr_seq, &mem_len, &mem_off, (haddr_t)0, NULL, buf) < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vector write failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-}   /* end H5D_contig_write_one() */
+}   /* end H5D_contig_write() */
 
 
 /*-------------------------------------------------------------------------
@@ -513,76 +389,67 @@ done:
 ssize_t
 H5D_contig_readvv(const H5D_io_info_t *io_info,
     size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[])
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
+    haddr_t UNUSED address, void UNUSED *pointer, void *_buf)
 {
     H5F_t *file = io_info->dset->oloc.file;        /* File for dataset */
-    H5D_rdcdc_t *dset_contig = &(io_info->dset->shared->cache.contig); /* Cached information about contiguous data */
-    const H5D_contig_storage_t *store_contig = &(io_info->store->contig);    /* Contiguous storage info for this I/O operation */
-    unsigned char *buf = (unsigned char *)io_info->u.rbuf;   /* Pointer to buffer to fill */
+    H5D_rdcdc_t *dset_contig=&(io_info->dset->shared->cache.contig); /* Cached information about contiguous data */
+    const H5D_contig_storage_t *store_contig=&(io_info->store->contig);    /* Contiguous storage info for this I/O operation */
+    unsigned char *buf=(unsigned char *)_buf;   /* Pointer to buffer to fill */
     haddr_t addr;               /* Actual address to read */
-    size_t total_size = 0;      /* Total size of sequence in bytes */
+    size_t total_size=0;        /* Total size of sequence in bytes */
     size_t size;                /* Size of sequence in bytes */
     size_t u;                   /* Counting variable */
     size_t v;                   /* Counting variable */
     ssize_t ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI(H5D_contig_readvv, FAIL)
-#ifdef QAK
-HDfprintf(stderr, "%s: dset_max_nseq = %Zu\n", FUNC, dset_max_nseq);
-HDfprintf(stderr, "%s: mem_max_nseq = %Zu\n", FUNC, mem_max_nseq);
-HDfprintf(stderr, "%s: *dset_curr_seq= %Zu\n", FUNC, *dset_curr_seq);
-HDfprintf(stderr, "%s: *mem_curr_seq= %Zu\n", FUNC, *mem_curr_seq);
-for(u = 0; u < dset_max_nseq; u++)
-    HDfprintf(stderr, "%s: dset_len_arr[%Zu] = %Zu, dset_offset_arr[%Zu] = %Hu\n", FUNC, u, dset_len_arr[u], u, dset_offset_arr[u]);
-for(u = 0; u < mem_max_nseq; u++)
-    HDfprintf(stderr, "%s: mem_len_arr[%Zu] = %Zu, mem_offset_arr[%Zu] = %Hu\n", FUNC, u, mem_len_arr[u], u, mem_offset_arr[u]);
-#endif /* QAK */
 
     /* Check args */
-    HDassert(io_info);
-    HDassert(io_info->dset);
-    HDassert(io_info->store);
-    HDassert(buf);
+    assert(io_info);
+    assert(io_info->dset);
+    assert(io_info->store);
+    assert(buf);
 
     /* Check if data sieving is enabled */
-    if(H5F_HAS_FEATURE(file, H5FD_FEAT_DATA_SIEVE)) {
-        haddr_t sieve_start = HADDR_UNDEF, sieve_end = HADDR_UNDEF;     /* Start & end locations of sieve buffer */
+    if(H5F_HAS_FEATURE(file,H5FD_FEAT_DATA_SIEVE)) {
+        haddr_t sieve_start=HADDR_UNDEF, sieve_end=HADDR_UNDEF;     /* Start & end locations of sieve buffer */
         haddr_t contig_end;             /* End locations of block to write */
-        size_t sieve_size = (size_t)-1;   /* size of sieve buffer */
+        size_t sieve_size=(size_t)-1;   /* size of sieve buffer */
         haddr_t abs_eoa;	        /* Absolute end of file address		*/
         haddr_t rel_eoa;	        /* Relative end of file address		*/
         hsize_t max_data;               /* Actual maximum size of data to cache */
 
         /* Set offsets in sequence lists */
-        u = *dset_curr_seq;
-        v = *mem_curr_seq;
+        u=*dset_curr_seq;
+        v=*mem_curr_seq;
 
         /* Stash local copies of these value */
-        if(dset_contig->sieve_buf != NULL) {
-            sieve_start = dset_contig->sieve_loc;
-            sieve_size = dset_contig->sieve_size;
-            sieve_end = sieve_start+sieve_size;
+        if(dset_contig->sieve_buf!=NULL) {
+            sieve_start=dset_contig->sieve_loc;
+            sieve_size=dset_contig->sieve_size;
+            sieve_end=sieve_start+sieve_size;
         } /* end if */
 
         /* Works through sequences as fast as possible */
-        for(; u < dset_max_nseq && v < mem_max_nseq; ) {
+        for(; u<dset_max_nseq && v<mem_max_nseq; ) {
             /* Choose smallest buffer to write */
-            if(mem_len_arr[v] < dset_len_arr[u])
-                size = mem_len_arr[v];
+            if(mem_len_arr[v]<dset_len_arr[u])
+                size=mem_len_arr[v];
             else
-                size = dset_len_arr[u];
+                size=dset_len_arr[u];
 
             /* Compute offset on disk */
-            addr = store_contig->dset_addr + dset_offset_arr[u];
+            addr=store_contig->dset_addr+dset_offset_arr[u];
 
             /* Compute offset in memory */
-            buf = (unsigned char *)io_info->u.rbuf + mem_offset_arr[v];
+            buf = (unsigned char *)_buf + mem_offset_arr[v];
 
             /* Check if the sieve buffer is allocated yet */
-            if(dset_contig->sieve_buf == NULL) {
+            if(dset_contig->sieve_buf==NULL) {
                 /* Check if we can actually hold the I/O request in the sieve buffer */
                 if(size>dset_contig->sieve_buf_size) {
-                    if(H5F_block_read(file, H5FD_MEM_DRAW, addr, size, io_info->dxpl_id, buf) < 0)
+                    if (H5F_block_read(file, H5FD_MEM_DRAW, addr, size, io_info->dxpl_id, buf)<0)
                         HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "block read failed")
                 } /* end if */
                 else {
@@ -598,40 +465,40 @@ for(u = 0; u < mem_max_nseq; u++)
                         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "unable to determine file size")
 
                     /* Adjust absolute EOA address to relative EOA address */
-                    rel_eoa = abs_eoa - H5F_get_base_addr(file);
+                    rel_eoa=abs_eoa-H5F_get_base_addr(file);
 
                     /* Set up the buffer parameters */
-                    max_data = store_contig->dset_size-dset_offset_arr[u];
+                    max_data=store_contig->dset_size-dset_offset_arr[u];
 
                     /* Compute the size of the sieve buffer */
-                    H5_ASSIGN_OVERFLOW(dset_contig->sieve_size, MIN3(rel_eoa-dset_contig->sieve_loc, max_data, dset_contig->sieve_buf_size), hsize_t, size_t);
+                    H5_ASSIGN_OVERFLOW(dset_contig->sieve_size,MIN3(rel_eoa-dset_contig->sieve_loc,max_data,dset_contig->sieve_buf_size),hsize_t,size_t);
 
                     /* Read the new sieve buffer */
-                    if(H5F_block_read(file, H5FD_MEM_DRAW, dset_contig->sieve_loc, dset_contig->sieve_size, io_info->dxpl_id, dset_contig->sieve_buf) < 0)
+                    if (H5F_block_read(file, H5FD_MEM_DRAW, dset_contig->sieve_loc, dset_contig->sieve_size, io_info->dxpl_id, dset_contig->sieve_buf)<0)
                         HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "block read failed")
 
                     /* Grab the data out of the buffer (must be first piece of data in buffer ) */
-                    HDmemcpy(buf, dset_contig->sieve_buf, size);
+                    HDmemcpy(buf,dset_contig->sieve_buf,size);
 
                     /* Reset sieve buffer dirty flag */
-                    dset_contig->sieve_dirty = 0;
+                    dset_contig->sieve_dirty=0;
 
                     /* Stash local copies of these value */
-                    sieve_start = dset_contig->sieve_loc;
-                    sieve_size = dset_contig->sieve_size;
-                    sieve_end = sieve_start+sieve_size;
+                    sieve_start=dset_contig->sieve_loc;
+                    sieve_size=dset_contig->sieve_size;
+                    sieve_end=sieve_start+sieve_size;
                 } /* end else */
             } /* end if */
             else {
                 /* Compute end of sequence to retrieve */
-                contig_end = addr + size - 1;
+                contig_end=addr+size-1;
 
                 /* If entire read is within the sieve buffer, read it from the buffer */
                 if(addr>=sieve_start && contig_end<sieve_end) {
                     unsigned char *base_sieve_buf=dset_contig->sieve_buf+(addr-sieve_start);
 
                     /* Grab the data out of the buffer */
-                    HDmemcpy(buf, base_sieve_buf, size);
+                    HDmemcpy(buf,base_sieve_buf,size);
                 } /* end if */
                 /* Entire request is not within this data sieve buffer */
                 else {
@@ -643,16 +510,16 @@ for(u = 0; u < mem_max_nseq; u++)
                             /* Flush the sieve buffer, if it's dirty */
                             if(dset_contig->sieve_dirty) {
                                 /* Write to file */
-                                if(H5F_block_write(file, H5FD_MEM_DRAW, sieve_start, sieve_size, io_info->dxpl_id, dset_contig->sieve_buf) < 0)
+                                if (H5F_block_write(file, H5FD_MEM_DRAW, sieve_start, sieve_size, io_info->dxpl_id, dset_contig->sieve_buf)<0)
                                     HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "block write failed")
 
                                 /* Reset sieve buffer dirty flag */
-                                dset_contig->sieve_dirty = 0;
+                                dset_contig->sieve_dirty=0;
                             } /* end if */
                         } /* end if */
 
                         /* Read directly into the user's buffer */
-                        if(H5F_block_read(file, H5FD_MEM_DRAW, addr, size, io_info->dxpl_id, buf) < 0)
+                        if (H5F_block_read(file, H5FD_MEM_DRAW, addr, size, io_info->dxpl_id, buf)<0)
                             HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "block read failed")
                     } /* end if */
                     /* Element size fits within the buffer size */
@@ -694,72 +561,72 @@ for(u = 0; u < mem_max_nseq; u++)
                             HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "block read failed")
 
                         /* Grab the data out of the buffer (must be first piece of data in buffer ) */
-                        HDmemcpy(buf, dset_contig->sieve_buf, size);
+                        HDmemcpy(buf,dset_contig->sieve_buf,size);
 
                         /* Reset sieve buffer dirty flag */
-                        dset_contig->sieve_dirty = 0;
+                        dset_contig->sieve_dirty=0;
                     } /* end else */
                 } /* end else */
             } /* end else */
 
             /* Update memory information */
-            mem_len_arr[v] -= size;
-            mem_offset_arr[v] += size;
-            if(mem_len_arr[v] == 0)
+            mem_len_arr[v]-=size;
+            mem_offset_arr[v]+=size;
+            if(mem_len_arr[v]==0)
                 v++;
 
             /* Update file information */
-            dset_len_arr[u] -= size;
-            dset_offset_arr[u] += size;
-            if(dset_len_arr[u] == 0)
+            dset_len_arr[u]-=size;
+            dset_offset_arr[u]+=size;
+            if(dset_len_arr[u]==0)
                 u++;
 
             /* Increment number of bytes copied */
-            total_size += size;
+            total_size+=size;
         } /* end for */
     } /* end if */
     else {
         /* Work through all the sequences */
-        for(u = *dset_curr_seq, v = *mem_curr_seq; u < dset_max_nseq && v < mem_max_nseq; ) {
+        for(u=*dset_curr_seq, v=*mem_curr_seq; u<dset_max_nseq && v<mem_max_nseq; ) {
             /* Choose smallest buffer to write */
-            if(mem_len_arr[v] < dset_len_arr[u])
-                size = mem_len_arr[v];
+            if(mem_len_arr[v]<dset_len_arr[u])
+                size=mem_len_arr[v];
             else
-                size = dset_len_arr[u];
+                size=dset_len_arr[u];
 
             /* Compute offset on disk */
-            addr = store_contig->dset_addr + dset_offset_arr[u];
+            addr=store_contig->dset_addr+dset_offset_arr[u];
 
             /* Compute offset in memory */
-            buf = (unsigned char *)io_info->u.rbuf + mem_offset_arr[v];
+            buf = (unsigned char *)_buf + mem_offset_arr[v];
 
             /* Write data */
-            if(H5F_block_read(file, H5FD_MEM_DRAW, addr, size, io_info->dxpl_id, buf) < 0)
+            if (H5F_block_read(file, H5FD_MEM_DRAW, addr, size, io_info->dxpl_id, buf)<0)
                 HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "block write failed")
 
             /* Update memory information */
-            mem_len_arr[v] -= size;
-            mem_offset_arr[v] += size;
-            if(mem_len_arr[v] == 0)
+            mem_len_arr[v]-=size;
+            mem_offset_arr[v]+=size;
+            if(mem_len_arr[v]==0)
                 v++;
 
             /* Update file information */
-            dset_len_arr[u] -= size;
-            dset_offset_arr[u] += size;
-            if(dset_len_arr[u] == 0)
+            dset_len_arr[u]-=size;
+            dset_offset_arr[u]+=size;
+            if(dset_len_arr[u]==0)
                 u++;
 
             /* Increment number of bytes copied */
-            total_size += size;
+            total_size+=size;
         } /* end for */
     } /* end else */
 
     /* Update current sequence vectors */
-    *dset_curr_seq = u;
-    *mem_curr_seq = v;
+    *dset_curr_seq=u;
+    *mem_curr_seq=v;
 
     /* Set return value */
-    H5_ASSIGN_OVERFLOW(ret_value, total_size, size_t, ssize_t);
+    H5_ASSIGN_OVERFLOW(ret_value,total_size,size_t,ssize_t);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -787,14 +654,15 @@ done:
 ssize_t
 H5D_contig_writevv(const H5D_io_info_t *io_info,
     size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[])
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
+    haddr_t UNUSED address, void UNUSED *pointer, const void *_buf)
 {
     H5F_t *file = io_info->dset->oloc.file;        /* File for dataset */
-    H5D_rdcdc_t *dset_contig = &(io_info->dset->shared->cache.contig); /* Cached information about contiguous data */
-    const H5D_contig_storage_t *store_contig = &(io_info->store->contig);    /* Contiguous storage info for this I/O operation */
-    const unsigned char *buf = (const unsigned char *)io_info->u.wbuf;      /* Pointer to buffer to fill */
+    H5D_rdcdc_t *dset_contig=&(io_info->dset->shared->cache.contig); /* Cached information about contiguous data */
+    const H5D_contig_storage_t *store_contig=&(io_info->store->contig);    /* Contiguous storage info for this I/O operation */
+    const unsigned char *buf=(const unsigned char *)_buf;      /* Pointer to buffer to fill */
     haddr_t addr;               /* Actual address to read */
-    size_t total_size = 0;      /* Size of sequence in bytes */
+    size_t total_size=0;        /* Size of sequence in bytes */
     size_t size;                /* Size of sequence in bytes */
     size_t u;                   /* Counting variable */
     size_t v;                   /* Counting variable */
@@ -803,10 +671,10 @@ H5D_contig_writevv(const H5D_io_info_t *io_info,
     FUNC_ENTER_NOAPI(H5D_contig_writevv, FAIL)
 
     /* Check args */
-    HDassert(io_info);
-    HDassert(io_info->dset);
-    HDassert(io_info->store);
-    HDassert(buf);
+    assert(io_info);
+    assert(io_info->dset);
+    assert(io_info->store);
+    assert(buf);
 
     /* Check if data sieving is enabled */
     if(H5F_HAS_FEATURE(file,H5FD_FEAT_DATA_SIEVE)) {
@@ -840,18 +708,18 @@ H5D_contig_writevv(const H5D_io_info_t *io_info,
             addr=store_contig->dset_addr+dset_offset_arr[u];
 
             /* Compute offset in memory */
-            buf = (const unsigned char *)io_info->u.wbuf + mem_offset_arr[v];
+            buf = (const unsigned char *)_buf + mem_offset_arr[v];
 
             /* No data sieve buffer yet, go allocate one */
             if(dset_contig->sieve_buf==NULL) {
                 /* Check if we can actually hold the I/O request in the sieve buffer */
                 if(size>dset_contig->sieve_buf_size) {
-                    if(H5F_block_write(file, H5FD_MEM_DRAW, addr, size, io_info->dxpl_id, buf) < 0)
+                    if (H5F_block_write(file, H5FD_MEM_DRAW, addr, size, io_info->dxpl_id, buf)<0)
                         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "block write failed")
                 } /* end if */
                 else {
                     /* Allocate room for the data sieve buffer */
-                    if(NULL == (dset_contig->sieve_buf = H5FL_BLK_MALLOC(sieve_buf, dset_contig->sieve_buf_size)))
+                    if (NULL==(dset_contig->sieve_buf=H5FL_BLK_MALLOC(sieve_buf,dset_contig->sieve_buf_size)))
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 #ifdef H5_CLEAR_MEMORY
 if(dset_contig->sieve_size > size)
@@ -882,15 +750,15 @@ if(dset_contig->sieve_size > size)
                     } /* end if */
 
                     /* Grab the data out of the buffer (must be first piece of data in buffer ) */
-                    HDmemcpy(dset_contig->sieve_buf, buf, size);
+                    HDmemcpy(dset_contig->sieve_buf,buf,size);
 
                     /* Set sieve buffer dirty flag */
-                    dset_contig->sieve_dirty = 1;
+                    dset_contig->sieve_dirty=1;
 
                     /* Stash local copies of these values */
-                    sieve_start = dset_contig->sieve_loc;
-                    sieve_size = dset_contig->sieve_size;
-                    sieve_end = sieve_start + sieve_size;
+                    sieve_start=dset_contig->sieve_loc;
+                    sieve_size=dset_contig->sieve_size;
+                    sieve_end=sieve_start+sieve_size;
                 } /* end else */
             } /* end if */
             else {
@@ -899,13 +767,13 @@ if(dset_contig->sieve_size > size)
 
                 /* If entire write is within the sieve buffer, write it to the buffer */
                 if(addr>=sieve_start && contig_end<sieve_end) {
-                    unsigned char *base_sieve_buf = dset_contig->sieve_buf + (addr - sieve_start);
+                    unsigned char *base_sieve_buf=dset_contig->sieve_buf+(addr-sieve_start);
 
                     /* Put the data into the sieve buffer */
-                    HDmemcpy(base_sieve_buf, buf, size);
+                    HDmemcpy(base_sieve_buf,buf,size);
 
                     /* Set sieve buffer dirty flag */
-                    dset_contig->sieve_dirty = 1;
+                    dset_contig->sieve_dirty=1;
                 } /* end if */
                 /* Entire request is not within this data sieve buffer */
                 else {
@@ -930,7 +798,7 @@ if(dset_contig->sieve_size > size)
                         } /* end if */
 
                         /* Write directly from the user's buffer */
-                        if(H5F_block_write(file, H5FD_MEM_DRAW, addr, size, io_info->dxpl_id, buf) < 0)
+                        if (H5F_block_write(file, H5FD_MEM_DRAW, addr, size, io_info->dxpl_id, buf)<0)
                             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "block write failed")
                     } /* end if */
                     /* Element size fits within the buffer size */
@@ -940,30 +808,30 @@ if(dset_contig->sieve_size > size)
                                 (size+sieve_size)<=dset_contig->sieve_buf_size &&
                                 dset_contig->sieve_dirty) {
                             /* Prepend to existing sieve buffer */
-                            if((addr + size) == sieve_start) {
+                            if((addr+size)==sieve_start) {
                                 /* Move existing sieve information to correct location */
-                                HDmemmove(dset_contig->sieve_buf + size, dset_contig->sieve_buf, dset_contig->sieve_size);
+                                HDmemmove(dset_contig->sieve_buf+size,dset_contig->sieve_buf,dset_contig->sieve_size);
 
                                 /* Copy in new information (must be first in sieve buffer) */
-                                HDmemcpy(dset_contig->sieve_buf, buf, size);
+                                HDmemcpy(dset_contig->sieve_buf,buf,size);
 
                                 /* Adjust sieve location */
-                                dset_contig->sieve_loc = addr;
+                                dset_contig->sieve_loc=addr;
 
                             } /* end if */
                             /* Append to existing sieve buffer */
                             else {
                                 /* Copy in new information */
-                                HDmemcpy(dset_contig->sieve_buf + sieve_size, buf, size);
+                                HDmemcpy(dset_contig->sieve_buf+sieve_size,buf,size);
                             } /* end else */
 
                             /* Adjust sieve size */
                             dset_contig->sieve_size += size;
 
                             /* Update local copies of sieve information */
-                            sieve_start = dset_contig->sieve_loc;
-                            sieve_size = dset_contig->sieve_size;
-                            sieve_end = sieve_start + sieve_size;
+                            sieve_start=dset_contig->sieve_loc;
+                            sieve_size=dset_contig->sieve_size;
+                            sieve_end=sieve_start+sieve_size;
                         } /* end if */
                         /* Can't add the new data onto the existing sieve buffer */
                         else {
@@ -1007,73 +875,73 @@ if(dset_contig->sieve_size > size)
                             } /* end if */
 
                             /* Grab the data out of the buffer (must be first piece of data in buffer ) */
-                            HDmemcpy(dset_contig->sieve_buf, buf, size);
+                            HDmemcpy(dset_contig->sieve_buf,buf,size);
 
                             /* Set sieve buffer dirty flag */
-                            dset_contig->sieve_dirty = 1;
+                            dset_contig->sieve_dirty=1;
                         } /* end else */
                     } /* end else */
                 } /* end else */
             } /* end else */
 
             /* Update memory information */
-            mem_len_arr[v] -= size;
-            mem_offset_arr[v] += size;
-            if(mem_len_arr[v] == 0)
+            mem_len_arr[v]-=size;
+            mem_offset_arr[v]+=size;
+            if(mem_len_arr[v]==0)
                 v++;
 
             /* Update file information */
-            dset_len_arr[u] -= size;
-            dset_offset_arr[u] += size;
-            if(dset_len_arr[u] == 0)
+            dset_len_arr[u]-=size;
+            dset_offset_arr[u]+=size;
+            if(dset_len_arr[u]==0)
                 u++;
 
             /* Increment number of bytes copied */
-            total_size += size;
+            total_size+=size;
         } /* end for */
     } /* end if */
     else {
         /* Work through all the sequences */
-        for(u = *dset_curr_seq, v = *mem_curr_seq; u < dset_max_nseq && v < mem_max_nseq; ) {
+        for(u=*dset_curr_seq, v=*mem_curr_seq; u<dset_max_nseq && v<mem_max_nseq; ) {
             /* Choose smallest buffer to write */
-            if(mem_len_arr[v] < dset_len_arr[u])
-                size = mem_len_arr[v];
+            if(mem_len_arr[v]<dset_len_arr[u])
+                size=mem_len_arr[v];
             else
-                size = dset_len_arr[u];
+                size=dset_len_arr[u];
 
             /* Compute offset on disk */
-            addr = store_contig->dset_addr + dset_offset_arr[u];
+            addr=store_contig->dset_addr+dset_offset_arr[u];
 
             /* Compute offset in memory */
-            buf = (const unsigned char *)io_info->u.wbuf + mem_offset_arr[v];
+            buf = (const unsigned char *)_buf + mem_offset_arr[v];
 
             /* Write data */
-            if(H5F_block_write(file, H5FD_MEM_DRAW, addr, size, io_info->dxpl_id, buf) < 0)
+            if (H5F_block_write(file, H5FD_MEM_DRAW, addr, size, io_info->dxpl_id, buf)<0)
                 HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "block write failed")
 
             /* Update memory information */
-            mem_len_arr[v] -= size;
-            mem_offset_arr[v] += size;
-            if(mem_len_arr[v] == 0)
+            mem_len_arr[v]-=size;
+            mem_offset_arr[v]+=size;
+            if(mem_len_arr[v]==0)
                 v++;
 
             /* Update file information */
-            dset_len_arr[u] -= size;
-            dset_offset_arr[u] += size;
-            if(dset_len_arr[u] == 0)
+            dset_len_arr[u]-=size;
+            dset_offset_arr[u]+=size;
+            if(dset_len_arr[u]==0)
                 u++;
 
             /* Increment number of bytes copied */
-            total_size += size;
+            total_size+=size;
         } /* end for */
     } /* end else */
 
     /* Update current sequence vectors */
-    *dset_curr_seq = u;
-    *mem_curr_seq = v;
+    *dset_curr_seq=u;
+    *mem_curr_seq=v;
 
     /* Set return value */
-    H5_ASSIGN_OVERFLOW(ret_value, total_size, size_t, ssize_t);
+    H5_ASSIGN_OVERFLOW(ret_value,total_size,size_t,ssize_t);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c
index fd1d2e8..8f8aa50 100644
--- a/src/H5Ddeprec.c
+++ b/src/H5Ddeprec.c
@@ -156,7 +156,7 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
     if(H5I_DATATYPE != H5I_get_type(type_id))
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype ID")
-    if(NULL == (space = (const H5S_t *)H5I_object_verify(space_id,H5I_DATASPACE)))
+    if(NULL == (space = H5I_object_verify(space_id,H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace ID")
     if(H5P_DEFAULT == dcpl_id)
         dcpl_id = H5P_DATASET_CREATE_DEFAULT;
diff --git a/src/H5Defl.c b/src/H5Defl.c
index 7dac29b..c8d1098 100644
--- a/src/H5Defl.c
+++ b/src/H5Defl.c
@@ -33,88 +33,30 @@
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fprivate.h"		/* Files				*/
 
-
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
-
-/* Layout operation callbacks */
-static herr_t H5D_efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *cm);
-static ssize_t H5D_efl_readvv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
-static ssize_t H5D_efl_writevv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
-
-/* Helper routines */
-static herr_t H5D_efl_read(const H5O_efl_t *efl, haddr_t addr, size_t size,
+static herr_t H5D_efl_read (const H5O_efl_t *efl, haddr_t addr, size_t size,
     uint8_t *buf);
 static herr_t H5D_efl_write(const H5O_efl_t *efl, haddr_t addr, size_t size,
     const uint8_t *buf);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-/* External File List (EFL) storage layout I/O ops */
-const H5D_layout_ops_t H5D_LOPS_EFL[1] = {{
-    H5D_efl_io_init,
-    H5D_contig_read,
-    H5D_contig_write,
-#ifdef H5_HAVE_PARALLEL
-    NULL,
-    NULL,
-#endif /* H5_HAVE_PARALLEL */
-    H5D_efl_readvv,
-    H5D_efl_writevv,
-    NULL
-}};
-
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_efl_io_init
- *
- * Purpose:	Performs initialization before any sort of I/O on the raw data
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Thursday, March 20, 2008
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *type_info,
-    hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
-    H5D_chunk_map_t UNUSED *cm)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_efl_io_init)
-
-    HDmemcpy(&io_info->store->efl, &(io_info->dset->shared->dcpl_cache.efl), sizeof(H5O_efl_t));
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5D_efl_io_init() */
-
 
 /*-------------------------------------------------------------------------
  * Function:	H5D_efl_read
@@ -135,26 +77,26 @@ H5D_efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *type
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_efl_read(const H5O_efl_t *efl, haddr_t addr, size_t size, uint8_t *buf)
+H5D_efl_read (const H5O_efl_t *efl, haddr_t addr, size_t size, uint8_t *buf)
 {
-    int		fd = -1;
+    int		fd=-1;
     size_t	to_read;
 #ifndef NDEBUG
     hsize_t     tempto_read;
 #endif /* NDEBUG */
-    hsize_t     skip = 0;
+    hsize_t     skip=0;
     haddr_t     cur;
     ssize_t	n;
     size_t      u;                      /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_efl_read)
 
     /* Check args */
-    HDassert(efl && efl->nused>0);
-    HDassert(H5F_addr_defined(addr));
-    HDassert(size < SIZET_MAX);
-    HDassert(buf || 0 == size);
+    assert (efl && efl->nused>0);
+    assert (H5F_addr_defined (addr));
+    assert (size < SIZET_MAX);
+    assert (buf || 0==size);
 
     /* Find the first efl member from which to read */
     for (u=0, cur=0; u<efl->nused; u++) {
@@ -167,7 +109,7 @@ H5D_efl_read(const H5O_efl_t *efl, haddr_t addr, size_t size, uint8_t *buf)
 
     /* Read the data */
     while (size) {
-        HDassert(buf);
+        assert(buf);
 	if (u>=efl->nused)
 	    HGOTO_ERROR (H5E_EFL, H5E_OVERFLOW, FAIL, "read past logical end of file")
 	if (H5F_OVERFLOW_HSIZET2OFFT (efl->slot[u].offset+skip))
@@ -223,25 +165,25 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_efl_write(const H5O_efl_t *efl, haddr_t addr, size_t size, const uint8_t *buf)
+H5D_efl_write (const H5O_efl_t *efl, haddr_t addr, size_t size, const uint8_t *buf)
 {
-    int		fd = -1;
+    int		fd=-1;
     size_t	to_write;
 #ifndef NDEBUG
     hsize_t	tempto_write;
 #endif /* NDEBUG */
     haddr_t     cur;
-    hsize_t     skip = 0;
+    hsize_t     skip=0;
     size_t	u;                      /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_efl_write)
 
     /* Check args */
-    HDassert(efl && efl->nused>0);
-    HDassert(H5F_addr_defined(addr));
-    HDassert(size < SIZET_MAX);
-    HDassert(buf || 0 == size);
+    assert (efl && efl->nused>0);
+    assert (H5F_addr_defined (addr));
+    assert (size < SIZET_MAX);
+    assert (buf || 0==size);
 
     /* Find the first efl member in which to write */
     for (u=0, cur=0; u<efl->nused; u++) {
@@ -306,68 +248,71 @@ done:
  * Programmer:	Quincey Koziol
  *              Wednesday, May  7, 2003
  *
+ * Modifications:
+ *
  *-------------------------------------------------------------------------
  */
-static ssize_t
+ssize_t
 H5D_efl_readvv(const H5D_io_info_t *io_info,
     size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[])
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
+    haddr_t UNUSED address, void UNUSED *pointer/*in*/, void *_buf)
 {
-    const H5O_efl_t *efl = &(io_info->store->efl); /* Pointer to efl info */
+    const H5O_efl_t *efl=&(io_info->store->efl); /* Pointer to efl info */
     unsigned char *buf;         /* Pointer to buffer to write */
     haddr_t addr;               /* Actual address to read */
-    size_t total_size = 0;      /* Total size of sequence in bytes */
+    size_t total_size=0;        /* Total size of sequence in bytes */
     size_t size;                /* Size of sequence in bytes */
     size_t u;                   /* Counting variable */
     size_t v;                   /* Counting variable */
     ssize_t ret_value;          /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_efl_readvv)
+    FUNC_ENTER_NOAPI(H5D_efl_readvv, FAIL)
 
     /* Check args */
-    HDassert(efl && efl->nused > 0);
-    HDassert(io_info->u.rbuf);
+    assert (efl && efl->nused>0);
+    assert (_buf);
 
     /* Work through all the sequences */
-    for(u = *dset_curr_seq, v = *mem_curr_seq; u < dset_max_nseq && v < mem_max_nseq; ) {
+    for(u=*dset_curr_seq, v=*mem_curr_seq; u<dset_max_nseq && v<mem_max_nseq; ) {
         /* Choose smallest buffer to write */
-        if(mem_len_arr[v] < dset_len_arr[u])
-            size = mem_len_arr[v];
+        if(mem_len_arr[v]<dset_len_arr[u])
+            size=mem_len_arr[v];
         else
-            size = dset_len_arr[u];
+            size=dset_len_arr[u];
 
         /* Compute offset on disk */
-        addr = dset_offset_arr[u];
+        addr=dset_offset_arr[u];
 
         /* Compute offset in memory */
-        buf = (unsigned char *)io_info->u.rbuf + mem_offset_arr[v];
+        buf = (unsigned char *)_buf + mem_offset_arr[v];
 
         /* Read data */
-        if(H5D_efl_read(efl, addr, size, buf) < 0)
+        if (H5D_efl_read(efl, addr, size, buf)<0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "block write failed")
 
         /* Update memory information */
-        mem_len_arr[v] -= size;
-        mem_offset_arr[v] += size;
-        if(mem_len_arr[v] == 0)
+        mem_len_arr[v]-=size;
+        mem_offset_arr[v]+=size;
+        if(mem_len_arr[v]==0)
             v++;
 
         /* Update file information */
-        dset_len_arr[u] -= size;
-        dset_offset_arr[u] += size;
-        if(dset_len_arr[u] == 0)
+        dset_len_arr[u]-=size;
+        dset_offset_arr[u]+=size;
+        if(dset_len_arr[u]==0)
             u++;
 
         /* Increment number of bytes copied */
-        total_size += size;
+        total_size+=size;
     } /* end for */
 
     /* Update current sequence vectors */
-    *dset_curr_seq = u;
-    *mem_curr_seq = v;
+    *dset_curr_seq=u;
+    *mem_curr_seq=v;
 
     /* Set return value */
-    H5_ASSIGN_OVERFLOW(ret_value, total_size, size_t, ssize_t);
+    H5_ASSIGN_OVERFLOW(ret_value,total_size,size_t,ssize_t);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -387,68 +332,71 @@ done:
  * Programmer:	Quincey Koziol
  *              Friday, May  2, 2003
  *
+ * Modifications:
+ *
  *-------------------------------------------------------------------------
  */
-static ssize_t
+ssize_t
 H5D_efl_writevv(const H5D_io_info_t *io_info,
     size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[])
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
+    haddr_t UNUSED address, void UNUSED *pointer/*in*/, const void *_buf)
 {
-    const H5O_efl_t *efl = &(io_info->store->efl); /* Pointer to efl info */
+    const H5O_efl_t *efl=&(io_info->store->efl); /* Pointer to efl info */
     const unsigned char *buf;   /* Pointer to buffer to write */
     haddr_t addr;               /* Actual address to read */
-    size_t total_size = 0;      /* Total size of sequence in bytes */
+    size_t total_size=0;        /* Total size of sequence in bytes */
     size_t size;                /* Size of sequence in bytes */
     size_t u;                   /* Counting variable */
     size_t v;                   /* Counting variable */
     ssize_t ret_value;          /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_efl_writevv)
+    FUNC_ENTER_NOAPI(H5D_efl_writevv, FAIL)
 
     /* Check args */
-    HDassert(efl && efl->nused > 0);
-    HDassert(io_info->u.wbuf);
+    assert (efl && efl->nused>0);
+    assert (_buf);
 
     /* Work through all the sequences */
-    for(u = *dset_curr_seq, v = *mem_curr_seq; u < dset_max_nseq && v < mem_max_nseq; ) {
+    for(u=*dset_curr_seq, v=*mem_curr_seq; u<dset_max_nseq && v<mem_max_nseq; ) {
         /* Choose smallest buffer to write */
-        if(mem_len_arr[v] < dset_len_arr[u])
-            size = mem_len_arr[v];
+        if(mem_len_arr[v]<dset_len_arr[u])
+            size=mem_len_arr[v];
         else
-            size = dset_len_arr[u];
+            size=dset_len_arr[u];
 
         /* Compute offset on disk */
-        addr = dset_offset_arr[u];
+        addr=dset_offset_arr[u];
 
         /* Compute offset in memory */
-        buf = (const unsigned char *)io_info->u.wbuf + mem_offset_arr[v];
+        buf = (const unsigned char *)_buf + mem_offset_arr[v];
 
         /* Write data */
-        if(H5D_efl_write(efl, addr, size, buf) < 0)
+        if (H5D_efl_write(efl, addr, size, buf)<0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "block write failed")
 
         /* Update memory information */
-        mem_len_arr[v] -= size;
-        mem_offset_arr[v] += size;
-        if(mem_len_arr[v] == 0)
+        mem_len_arr[v]-=size;
+        mem_offset_arr[v]+=size;
+        if(mem_len_arr[v]==0)
             v++;
 
         /* Update file information */
-        dset_len_arr[u] -= size;
-        dset_offset_arr[u] += size;
-        if(dset_len_arr[u] == 0)
+        dset_len_arr[u]-=size;
+        dset_offset_arr[u]+=size;
+        if(dset_len_arr[u]==0)
             u++;
 
         /* Increment number of bytes copied */
-        total_size += size;
+        total_size+=size;
     } /* end for */
 
     /* Update current sequence vectors */
-    *dset_curr_seq = u;
-    *mem_curr_seq = v;
+    *dset_curr_seq=u;
+    *mem_curr_seq=v;
 
     /* Set return value */
-    H5_ASSIGN_OVERFLOW(ret_value, total_size, size_t, ssize_t);
+    H5_ASSIGN_OVERFLOW(ret_value,total_size,size_t,ssize_t);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Dfill.c b/src/H5Dfill.c
index 4879f4d..bfb4354 100644
--- a/src/H5Dfill.c
+++ b/src/H5Dfill.c
@@ -275,7 +275,7 @@ H5D_fill(const void *fill, const H5T_t *fill_type, void *buf,
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize memory selection information")
 
             /* Scatter the data into memory */
-            if(H5D_scatter_mem(tmp_buf, space, &mem_iter, (size_t)nelmts, dxpl_cache, buf/*out*/) < 0) {
+            if(H5D_select_mscat(tmp_buf, space, &mem_iter, (size_t)nelmts, dxpl_cache, buf/*out*/) < 0) {
                 H5S_SELECT_ITER_RELEASE(&mem_iter);
                 HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "scatter failed")
             } /* end if */
@@ -337,13 +337,13 @@ done:
     if(dst_id != (-1) && H5I_dec_ref(dst_id) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
     if(tmp_buf)
-        (void)H5FL_BLK_FREE(type_conv, tmp_buf);
+        H5FL_BLK_FREE(type_conv, tmp_buf);
     if(elem_wb && H5WB_unwrap(elem_wb) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
     if(bkg_elem_wb && H5WB_unwrap(bkg_elem_wb) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
     if(bkg_buf)
-        (void)H5FL_BLK_FREE(type_conv, bkg_buf);
+        H5FL_BLK_FREE(type_conv, bkg_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D_fill() */
@@ -636,9 +636,9 @@ H5D_fill_release(H5D_fill_buf_info_t *fb_info)
             fb_info->fill_free_func(fb_info->fill_buf, fb_info->fill_free_info);
         else {
             if(fb_info->fill->buf)
-                (void)H5FL_BLK_FREE(non_zero_fill, fb_info->fill_buf);
+                H5FL_BLK_FREE(non_zero_fill, fb_info->fill_buf);
             else
-                (void)H5FL_BLK_FREE(zero_fill, fb_info->fill_buf);
+                H5FL_BLK_FREE(zero_fill, fb_info->fill_buf);
         } /* end else */
         fb_info->fill_buf = NULL;
     } /* end if */
@@ -677,7 +677,7 @@ H5D_fill_term(H5D_fill_buf_info_t *fb_info)
         else if(fb_info->mem_type)
             H5T_close(fb_info->mem_type);
         if(fb_info->bkg_buf)
-            (void)H5FL_BLK_FREE(type_conv, fb_info->bkg_buf);
+            H5FL_BLK_FREE(type_conv, fb_info->bkg_buf);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5Dint.c b/src/H5Dint.c
index acb95d2..a5ea398 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -59,12 +59,10 @@ typedef struct {
 
 /* General stuff */
 static herr_t H5D_init_storage(H5D_t *dataset, hbool_t full_overwrite, hid_t dxpl_id);
-static herr_t H5D_get_dxpl_cache_real(hid_t dxpl_id, H5D_dxpl_cache_t *cache);
 static H5D_shared_t *H5D_new(hid_t dcpl_id, hbool_t creating, hbool_t vl_type);
 static herr_t H5D_init_type(H5F_t *file, const H5D_t *dset, hid_t type_id,
     const H5T_t *type);
 static herr_t H5D_init_space(H5F_t *file, const H5D_t *dset, const H5S_t *space);
-static herr_t H5D_set_io_ops(H5D_t *dataset);
 static herr_t H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset);
 static herr_t H5D_open_oid(H5D_t *dataset, hid_t dxpl_id);
 static herr_t H5D_flush_real(H5D_t *dataset, hid_t dxpl_id, unsigned flags);
@@ -252,133 +250,6 @@ H5D_term_interface(void)
 } /* end H5D_term_interface() */
 
 
-/*--------------------------------------------------------------------------
- NAME
-    H5D_get_dxpl_cache_real
- PURPOSE
-    Get all the values for the DXPL cache.
- USAGE
-    herr_t H5D_get_dxpl_cache_real(dxpl_id, cache)
-        hid_t dxpl_id;          IN: DXPL to query
-        H5D_dxpl_cache_t *cache;IN/OUT: DXPL cache to fill with values
- RETURNS
-    Non-negative on success/Negative on failure.
- DESCRIPTION
-    Query all the values from a DXPL that are needed by internal routines
-    within the library.
- GLOBAL VARIABLES
- COMMENTS, BUGS, ASSUMPTIONS
- EXAMPLES
- REVISION LOG
---------------------------------------------------------------------------*/
-static herr_t
-H5D_get_dxpl_cache_real(hid_t dxpl_id, H5D_dxpl_cache_t *cache)
-{
-    H5P_genplist_t *dx_plist;   /* Data transfer property list */
-    herr_t ret_value = SUCCEED; /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_get_dxpl_cache_real)
-
-    /* Check args */
-    HDassert(cache);
-
-    /* Get the dataset transfer property list */
-    if(NULL == (dx_plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
-
-    /* Get maximum temporary buffer size */
-    if(H5P_get(dx_plist, H5D_XFER_MAX_TEMP_BUF_NAME, &cache->max_temp_buf) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve maximum temporary buffer size")
-
-    /* Get temporary buffer pointer */
-    if(H5P_get(dx_plist, H5D_XFER_TCONV_BUF_NAME, &cache->tconv_buf) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve temporary buffer pointer")
-
-    /* Get background buffer pointer */
-    if(H5P_get(dx_plist, H5D_XFER_BKGR_BUF_NAME, &cache->bkgr_buf) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve background buffer pointer")
-
-    /* Get background buffer type */
-    if(H5P_get(dx_plist, H5D_XFER_BKGR_BUF_TYPE_NAME, &cache->bkgr_buf_type) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve background buffer type")
-
-    /* Get B-tree split ratios */
-    if(H5P_get(dx_plist, H5D_XFER_BTREE_SPLIT_RATIO_NAME, &cache->btree_split_ratio) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve B-tree split ratios")
-
-    /* Get I/O vector size */
-    if(H5P_get(dx_plist, H5D_XFER_HYPER_VECTOR_SIZE_NAME, &cache->vec_size) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve I/O vector size")
-
-#ifdef H5_HAVE_PARALLEL
-    /* Collect Parallel I/O information for possible later use */
-    if(H5P_get(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &cache->xfer_mode) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve parallel transfer method")
-    if(H5P_get(dx_plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &cache->coll_opt_mode) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve collective transfer option")
-#endif /* H5_HAVE_PARALLEL */
-
-    /* Get error detection properties */
-    if(H5P_get(dx_plist, H5D_XFER_EDC_NAME, &cache->err_detect) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve error detection info")
-
-    /* Get filter callback function */
-    if(H5P_get(dx_plist, H5D_XFER_FILTER_CB_NAME, &cache->filter_cb) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve filter callback function")
-
-    /* Get the data transform property */
-    if(H5P_get(dx_plist, H5D_XFER_XFORM_NAME, &cache->data_xform_prop) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve data transform info")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5D_get_dxpl_cache_real() */
-
-
-/*--------------------------------------------------------------------------
- NAME
-    H5D_get_dxpl_cache
- PURPOSE
-    Get all the values for the DXPL cache.
- USAGE
-    herr_t H5D_get_dxpl_cache(dxpl_id, cache)
-        hid_t dxpl_id;          IN: DXPL to query
-        H5D_dxpl_cache_t *cache;IN/OUT: DXPL cache to fill with values
- RETURNS
-    Non-negative on success/Negative on failure.
- DESCRIPTION
-    Query all the values from a DXPL that are needed by internal routines
-    within the library.
- GLOBAL VARIABLES
- COMMENTS, BUGS, ASSUMPTIONS
-    The CACHE pointer should point at already allocated memory to place
-    non-default property list info.  If a default property list is used, the
-    CACHE pointer will be changed to point at the default information.
- EXAMPLES
- REVISION LOG
---------------------------------------------------------------------------*/
-herr_t
-H5D_get_dxpl_cache(hid_t dxpl_id, H5D_dxpl_cache_t **cache)
-{
-    herr_t ret_value=SUCCEED;   /* Return value */
-
-    FUNC_ENTER_NOAPI(H5D_get_dxpl_cache,FAIL)
-
-    /* Check args */
-    assert(cache);
-
-    /* Check for the default DXPL */
-    if(dxpl_id==H5P_DATASET_XFER_DEFAULT)
-        *cache=&H5D_def_dxpl_cache;
-    else
-        if(H5D_get_dxpl_cache_real(dxpl_id,*cache) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "Can't retrieve DXPL values")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5D_get_dxpl_cache() */
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5D_create_named
  *
@@ -685,54 +556,6 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5D_set_io_ops
- *
- * Purpose:	Set the I/O operation function pointers for a dataset
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *		Thursday, March 20, 2008
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_set_io_ops(H5D_t *dataset)
-{
-    herr_t ret_value = SUCCEED;		/* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_set_io_ops)
-
-    /* check args */
-    HDassert(dataset);
-
-    /* Set the I/O functions for each layout type */
-    switch(dataset->shared->layout.type) {
-        case H5D_CONTIGUOUS:
-            if(dataset->shared->dcpl_cache.efl.nused > 0)
-                dataset->shared->layout_ops = H5D_LOPS_EFL;
-            else
-                dataset->shared->layout_ops = H5D_LOPS_CONTIG;
-            break;
-
-        case H5D_CHUNKED:
-            dataset->shared->layout_ops = H5D_LOPS_CHUNK;
-            break;
-
-        case H5D_COMPACT:
-            dataset->shared->layout_ops = H5D_LOPS_COMPACT;
-            break;
-
-        default:
-            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unknown storage method")
-    } /* end switch */ /*lint !e788 All appropriate cases are covered */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_set_io_ops() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5D_update_oh_info
  *
  * Purpose:	Create and fill object header for dataset
@@ -1156,10 +979,18 @@ H5D_create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
                     } else if(max_points * H5T_get_size(type) > max_storage) {
                         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "data space size exceeds external storage size")
                     }
+
+                    /* Set the I/O functions for this layout type */
+                    new_dset->shared->io_ops.readvv = H5D_efl_readvv;
+                    new_dset->shared->io_ops.writevv = H5D_efl_writevv;
                 } /* end if */
                 else {
                     if(ndims > 0 && max_dim[0] > dim[0])
                         HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, NULL, "extendible contiguous non-external dataset")
+
+                    /* Set the I/O functions for this layout type */
+                    new_dset->shared->io_ops.readvv = H5D_contig_readvv;
+                    new_dset->shared->io_ops.writevv = H5D_contig_writevv;
                 } /* end else */
 
                 /* Compute the total size of a chunk */
@@ -1211,6 +1042,10 @@ H5D_create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
                 for(u = 1, new_dset->shared->layout.u.chunk.size = new_dset->shared->layout.u.chunk.dim[0]; u < new_dset->shared->layout.u.chunk.ndims; u++)
                     new_dset->shared->layout.u.chunk.size *= new_dset->shared->layout.u.chunk.dim[u];
 
+                /* Set the I/O functions for this layout type */
+                new_dset->shared->io_ops.readvv = H5D_istore_readvv;
+                new_dset->shared->io_ops.writevv = H5D_istore_writevv;
+
                 /* Initialize the chunk cache for the dataset */
                 if(H5D_istore_init(file, new_dset) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "can't initialize chunk cache")
@@ -1238,6 +1073,10 @@ H5D_create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
                 comp_data_size = H5O_MESG_MAX_SIZE - H5O_layout_meta_size(file, &(new_dset->shared->layout));
                 if(new_dset->shared->layout.u.compact.size > comp_data_size)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "compact dataset size is bigger than header message maximum size")
+
+                /* Set the I/O functions for this layout type */
+                new_dset->shared->io_ops.readvv = H5D_compact_readvv;
+                new_dset->shared->io_ops.writevv = H5D_compact_writevv;
             } /* end case */
             break;
 
@@ -1245,10 +1084,6 @@ H5D_create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, NULL, "not implemented yet")
     } /* end switch */ /*lint !e788 All appropriate cases are covered */
 
-    /* Set the dataset's I/O operations */
-    if(H5D_set_io_ops(new_dset) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to initialize I/O operations")
-
     /* Update the dataset's object header info. */
     if(H5D_update_oh_info(file, dxpl_id, new_dset) != SUCCEED)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "can't update the metadata cache")
@@ -1417,9 +1252,9 @@ static herr_t
 H5D_open_oid(H5D_t *dataset, hid_t dxpl_id)
 {
     H5P_genplist_t *plist;              /* Property list */
+    H5O_pline_t  *pline;                /* I/O pipeline information */
     H5O_fill_t *fill_prop;              /* Pointer to dataset's fill value info */
     unsigned alloc_time_state;          /* Allocation time state */
-    htri_t msg_exists;                  /* Whether a particular type of message exists */
     herr_t ret_value = SUCCEED;		/* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_open_oid)
@@ -1450,17 +1285,13 @@ H5D_open_oid(H5D_t *dataset, hid_t dxpl_id)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get dataset creation property list")
 
     /* Get the optional filters message */
-    if((msg_exists = H5O_msg_exists(&(dataset->oloc), H5O_PLINE_ID, dxpl_id)) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't check if message exists")
-    if(msg_exists) {
-        /* Retrieve the I/O pipeline message */
-        if(NULL == H5O_msg_read(&(dataset->oloc), H5O_PLINE_ID, &dataset->shared->dcpl_cache.pline, dxpl_id))
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't retrieve message")
-
-        /* Set the I/O pipeline info in the property list */
-        if(H5P_set(plist, H5D_CRT_DATA_PIPELINE_NAME, &dataset->shared->dcpl_cache.pline) < 0)
+    pline = &dataset->shared->dcpl_cache.pline;
+    if(NULL != H5O_msg_read(&(dataset->oloc), H5O_PLINE_ID, pline, dxpl_id)) {
+        if(H5P_set(plist, H5D_CRT_DATA_PIPELINE_NAME, pline) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set pipeline")
     } /* end if */
+    else
+        H5E_clear_stack(NULL);
 
     /*
      * Get the raw data layout info.  It's actually stored in two locations:
@@ -1485,6 +1316,10 @@ H5D_open_oid(H5D_t *dataset, hid_t dxpl_id)
                 H5_ASSIGN_OVERFLOW(dataset->shared->layout.u.contig.size, tmp_size, hssize_t, hsize_t);
             } /* end if */
 
+            /* Set the I/O functions for this layout type */
+            dataset->shared->io_ops.readvv = H5D_contig_readvv;
+            dataset->shared->io_ops.writevv = H5D_contig_writevv;
+
             /* Get the sieve buffer size for this dataset */
             dataset->shared->cache.contig.sieve_buf_size = H5F_SIEVE_BUF_SIZE(dataset->oloc.file);
             break;
@@ -1509,34 +1344,33 @@ H5D_open_oid(H5D_t *dataset, hid_t dxpl_id)
                 if(H5D_istore_init(dataset->oloc.file, dataset) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize chunk cache")
             }
+
+            /* Set the I/O functions for this layout type */
+            dataset->shared->io_ops.readvv = H5D_istore_readvv;
+            dataset->shared->io_ops.writevv = H5D_istore_writevv;
             break;
 
         case H5D_COMPACT:
+            /* Set the I/O functions for this layout type */
+            dataset->shared->io_ops.readvv = H5D_compact_readvv;
+            dataset->shared->io_ops.writevv = H5D_compact_writevv;
             break;
 
         default:
-            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unknown storage method")
+            HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "not implemented yet")
     } /* end switch */ /*lint !e788 All appropriate cases are covered */
 
     /* Point at dataset's copy, to cache it for later */
     fill_prop = &dataset->shared->dcpl_cache.fill;
 
     /* Try to get the new fill value message from the object header */
-    if((msg_exists = H5O_msg_exists(&(dataset->oloc), H5O_FILL_NEW_ID, dxpl_id)) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't check if message exists")
-    if(msg_exists) {
-        if(NULL == H5O_msg_read(&(dataset->oloc), H5O_FILL_NEW_ID, fill_prop, dxpl_id))
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't retrieve message")
-    } /* end if */
-    else {
+    if(NULL == H5O_msg_read(&(dataset->oloc), H5O_FILL_NEW_ID, fill_prop, dxpl_id)) {
+        H5E_clear_stack(NULL);
+
 	/* For backward compatibility, try to retrieve the old fill value message */
-        if((msg_exists = H5O_msg_exists(&(dataset->oloc), H5O_FILL_ID, dxpl_id)) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't check if message exists")
-        if(msg_exists) {
-            if(NULL == H5O_msg_read(&(dataset->oloc), H5O_FILL_ID, fill_prop, dxpl_id))
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't retrieve message")
-        } /* end if */
-        else {
+        if(NULL == H5O_msg_read(&(dataset->oloc), H5O_FILL_ID, fill_prop, dxpl_id)) {
+            H5E_clear_stack(NULL);
+
             /* Set the space allocation time appropriately, based on the type of dataset storage */
             switch(dataset->shared->layout.type) {
                 case H5D_COMPACT:
@@ -1554,7 +1388,7 @@ H5D_open_oid(H5D_t *dataset, hid_t dxpl_id)
                 default:
                     HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "not implemented yet")
             } /* end switch */ /*lint !e788 All appropriate cases are covered */
-        } /* end else */
+        } /* end if */
 
         /* If "old" fill value size is 0 (undefined), map it to -1 */
         if(fill_prop->size == 0)
@@ -1578,23 +1412,18 @@ H5D_open_oid(H5D_t *dataset, hid_t dxpl_id)
      * also undefined when space allocate time is H5D_ALLOC_TIME_LATE. */
     if((dataset->shared->layout.type == H5D_CONTIGUOUS && !H5F_addr_defined(dataset->shared->layout.u.contig.addr))
             || (dataset->shared->layout.type == H5D_CHUNKED && !H5F_addr_defined(dataset->shared->layout.u.chunk.addr))) {
-        if((msg_exists = H5O_msg_exists(&(dataset->oloc), H5O_EFL_ID, dxpl_id)) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't check if message exists")
-        if(msg_exists) {
-            /* Retrieve the EFL  message */
-            if(NULL == H5O_msg_read(&(dataset->oloc), H5O_EFL_ID, &dataset->shared->dcpl_cache.efl, dxpl_id))
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't retrieve message")
-
-            /* Set the EFL info in the property list */
+        if(NULL != H5O_msg_read(&(dataset->oloc), H5O_EFL_ID, &dataset->shared->dcpl_cache.efl, dxpl_id)) {
             if(H5P_set(plist, H5D_CRT_EXT_FILE_LIST_NAME, &dataset->shared->dcpl_cache.efl) < 0)
             	HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set external file list")
+
+            /* Override the I/O functions for this layout type */
+            dataset->shared->io_ops.readvv = H5D_efl_readvv;
+            dataset->shared->io_ops.writevv = H5D_efl_writevv;
         } /* end if */
+        else
+            H5E_clear_stack(NULL);
     } /* end if */
 
-    /* Set the dataset's I/O operations */
-    if(H5D_set_io_ops(dataset) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize I/O operations")
-
     /*
      * Make sure all storage is properly initialized.
      * This is important only for parallel I/O where the space must
@@ -2505,7 +2334,7 @@ H5D_set_extent(H5D_t *dset, const hsize_t *size, hid_t dxpl_id)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
             /* Construct dataset I/O info */
-            H5D_BUILD_IO_INFO_RD(&io_info, dset, dxpl_cache, dxpl_id, NULL, NULL);
+            H5D_BUILD_IO_INFO(&io_info, dset, dxpl_cache, dxpl_id, NULL);
 
             /* Remove excess chunks */
             if(H5D_istore_prune_by_extent(&io_info, curr_dims) < 0)
diff --git a/src/H5Dio.c b/src/H5Dio.c
index 17bab19..8576464 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -28,17 +28,27 @@
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FLprivate.h"	/* Free Lists                           */
 #include "H5Iprivate.h"		/* IDs			  		*/
+#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5Sprivate.h"		/* Dataspace functions			*/
+#include "H5SLprivate.h"	/* Skip lists				*/
+#include "H5Vprivate.h"		/* Vector and array functions		*/
 
 #ifdef H5_HAVE_PARALLEL
 /* Remove this if H5R_DATASET_REGION is no longer used in this file */
-#include "H5Rpublic.h"
+#   include "H5Rpublic.h"
 #endif /*H5_HAVE_PARALLEL*/
 
-
 /****************/
 /* Local Macros */
 /****************/
 
+#define H5D_DEFAULT_SKIPLIST_HEIGHT     8
+
+/* Macros for iterating over chunks to operate on */
+#define H5D_CHUNK_GET_FIRST_NODE(map) (map.use_single ? (H5SL_node_t *)(1) : H5SL_first(map.sel_chunks))
+#define H5D_CHUNK_GET_NODE_INFO(map, node)  (map.use_single ? map.single_chunk_info : (H5D_chunk_info_t *)H5SL_item(node))
+#define H5D_CHUNK_GET_NEXT_NODE(map, node)  (map.use_single ? (H5SL_node_t *)NULL : H5SL_next(node))
+
 
 /******************/
 /* Local Typedefs */
@@ -49,36 +59,64 @@
 /* Local Prototypes */
 /********************/
 
-/* Internal I/O routines */
 static herr_t H5D_read(H5D_t *dataset, hid_t mem_type_id,
-    const H5S_t *mem_space, const H5S_t *file_space, hid_t dset_xfer_plist,
-    void *buf/*out*/);
+			const H5S_t *mem_space, const H5S_t *file_space,
+			hid_t dset_xfer_plist, void *buf/*out*/);
 static herr_t H5D_write(H5D_t *dataset, hid_t mem_type_id,
-    const H5S_t *mem_space, const H5S_t *file_space, hid_t dset_xfer_plist,
-    const void *buf);
+			 const H5S_t *mem_space, const H5S_t *file_space,
+			 hid_t dset_xfer_plist, const void *buf);
+static herr_t H5D_contig_read(H5D_io_info_t *io_info, hsize_t nelmts,
+            const H5T_t *mem_type, const H5S_t *mem_space,
+            const H5S_t *file_space, H5T_path_t *tpath,
+            hid_t src_id, hid_t dst_id,  void *buf/*out*/);
+static herr_t H5D_contig_write(H5D_io_info_t *io_info, hsize_t nelmts,
+            const H5T_t *mem_type, const H5S_t *mem_space,
+	    const H5S_t *file_space, H5T_path_t *tpath,
+            hid_t src_id, hid_t dst_id, const void *buf);
+static herr_t H5D_chunk_read(H5D_io_info_t *io_info, hsize_t nelmts,
+            const H5T_t *mem_type, const H5S_t *mem_space,
+            const H5S_t *file_space, H5T_path_t *tpath,
+            hid_t src_id, hid_t dst_id, void *buf/*out*/);
+static herr_t H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
+            const H5T_t *mem_type, const H5S_t *mem_space,
+	    const H5S_t *file_space, H5T_path_t *tpath,
+            hid_t src_id, hid_t dst_id, const void *buf);
+static herr_t H5D_compound_opt_read(size_t nelmts, const H5S_t *mem_space,
+            H5S_sel_iter_t *iter, const H5D_dxpl_cache_t *dxpl_cache, 
+            hid_t src_id, hid_t dst_id, H5T_subset_t subset, void *data_buf, 
+            void *user_buf/*out*/);
+static herr_t H5D_compound_opt_write(size_t nelmts, hid_t src_id, hid_t dst_id, 
+            void *data_buf);
 
-/* Setup/teardown routines */
-static herr_t H5D_ioinfo_init(H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
-    hid_t dxpl_id, const H5D_type_info_t *type_info, H5D_storage_t *store,
-    H5D_io_info_t *io_info);
-static herr_t H5D_typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
-    hid_t dxpl_id, hid_t mem_type_id, hbool_t do_write,
-    H5D_type_info_t *type_info);
 #ifdef H5_HAVE_PARALLEL
-static herr_t H5D_ioinfo_adjust(H5D_io_info_t *io_info, const H5D_t *dset,
-    const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
-    const H5S_t *file_space, const H5S_t *mem_space,
-    const H5D_type_info_t *type_info, const H5D_chunk_map_t *fm);
 static herr_t H5D_ioinfo_term(H5D_io_info_t *io_info);
 #endif /* H5_HAVE_PARALLEL */
-static herr_t H5D_typeinfo_term(const H5D_type_info_t *type_info);
 
+/* I/O info operations */
+static herr_t H5D_ioinfo_init(H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
+    hid_t dxpl_id, const H5S_t *mem_space, const H5S_t *file_space,
+    H5T_path_t *tpath, H5D_io_info_t *io_info);
+
+/* Chunk operations */
+static herr_t H5D_create_chunk_map(H5D_chunk_map_t *fm, const H5D_io_info_t *io_info,
+    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+    const H5T_t *mem_type);
+static herr_t H5D_destroy_chunk_map(const H5D_chunk_map_t *fm);
+static herr_t H5D_free_chunk_info(void *item, void *key, void *opdata);
+static herr_t H5D_create_chunk_map_single(H5D_chunk_map_t *fm,
+    const H5D_io_info_t *io_info);
+static herr_t H5D_create_chunk_file_map_hyper(H5D_chunk_map_t *fm,
+    const H5D_io_info_t *io_info);
+static herr_t H5D_create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm);
+static herr_t H5D_chunk_file_cb(void *elem, hid_t type_id, unsigned ndims,
+    const hsize_t *coords, void *fm);
+static herr_t H5D_chunk_mem_cb(void *elem, hid_t type_id, unsigned ndims,
+    const hsize_t *coords, void *fm);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -86,6 +124,142 @@ static herr_t H5D_typeinfo_term(const H5D_type_info_t *type_info);
 /* Declare a free list to manage blocks of type conversion data */
 H5FL_BLK_DEFINE(type_conv);
 
+/* Declare a free list to manage the H5D_chunk_info_t struct */
+H5FL_DEFINE(H5D_chunk_info_t);
+
+/* Declare a free list to manage sequences of size_t */
+H5FL_SEQ_DEFINE_STATIC(size_t);
+
+/* Declare a free list to manage sequences of hsize_t */
+H5FL_SEQ_DEFINE_STATIC(hsize_t);
+
+
+
+/*--------------------------------------------------------------------------
+ NAME
+    H5D_get_dxpl_cache_real
+ PURPOSE
+    Get all the values for the DXPL cache.
+ USAGE
+    herr_t H5D_get_dxpl_cache_real(dxpl_id, cache)
+        hid_t dxpl_id;          IN: DXPL to query
+        H5D_dxpl_cache_t *cache;IN/OUT: DXPL cache to fill with values
+ RETURNS
+    Non-negative on success/Negative on failure.
+ DESCRIPTION
+    Query all the values from a DXPL that are needed by internal routines
+    within the library.
+ GLOBAL VARIABLES
+ COMMENTS, BUGS, ASSUMPTIONS
+ EXAMPLES
+ REVISION LOG
+--------------------------------------------------------------------------*/
+herr_t
+H5D_get_dxpl_cache_real(hid_t dxpl_id, H5D_dxpl_cache_t *cache)
+{
+    H5P_genplist_t *dx_plist;   /* Data transfer property list */
+    herr_t ret_value=SUCCEED;   /* Return value */
+
+    FUNC_ENTER_NOAPI(H5D_get_dxpl_cache_real,FAIL)
+
+    /* Check args */
+    assert(cache);
+
+    /* Get the dataset transfer property list */
+    if (NULL == (dx_plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
+
+    /* Get maximum temporary buffer size */
+    if(H5P_get(dx_plist, H5D_XFER_MAX_TEMP_BUF_NAME, &cache->max_temp_buf) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve maximum temporary buffer size")
+
+    /* Get temporary buffer pointer */
+    if(H5P_get(dx_plist, H5D_XFER_TCONV_BUF_NAME, &cache->tconv_buf) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve temporary buffer pointer")
+
+    /* Get background buffer pointer */
+    if(H5P_get(dx_plist, H5D_XFER_BKGR_BUF_NAME, &cache->bkgr_buf) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve background buffer pointer")
+
+    /* Get background buffer type */
+    if(H5P_get(dx_plist, H5D_XFER_BKGR_BUF_TYPE_NAME, &cache->bkgr_buf_type) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve background buffer type")
+
+    /* Get B-tree split ratios */
+    if(H5P_get(dx_plist, H5D_XFER_BTREE_SPLIT_RATIO_NAME, &cache->btree_split_ratio) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve B-tree split ratios")
+
+    /* Get I/O vector size */
+    if(H5P_get(dx_plist, H5D_XFER_HYPER_VECTOR_SIZE_NAME, &cache->vec_size) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve I/O vector size")
+
+#ifdef H5_HAVE_PARALLEL
+    /* Collect Parallel I/O information for possible later use */
+     if(H5P_get(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &cache->xfer_mode) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve parallel transfer method")
+     if(H5P_get(dx_plist, H5D_XFER_IO_XFER_OPT_MODE_NAME, &cache->xfer_opt_mode) < 0)
+       HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve parallel transfer method")
+#endif /*H5_HAVE_PARALLEL*/
+
+    /* Get error detection properties */
+    if(H5P_get(dx_plist, H5D_XFER_EDC_NAME, &cache->err_detect) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve error detection info")
+
+    /* Get filter callback function */
+    if(H5P_get(dx_plist, H5D_XFER_FILTER_CB_NAME, &cache->filter_cb) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve filter callback function")
+
+    /* Get the data transform property */
+    if(H5P_get(dx_plist, H5D_XFER_XFORM_NAME, &cache->data_xform_prop) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve data transform info")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+}   /* H5D_get_dxpl_cache_real() */
+
+
+/*--------------------------------------------------------------------------
+ NAME
+    H5D_get_dxpl_cache
+ PURPOSE
+    Get all the values for the DXPL cache.
+ USAGE
+    herr_t H5D_get_dxpl_cache(dxpl_id, cache)
+        hid_t dxpl_id;          IN: DXPL to query
+        H5D_dxpl_cache_t *cache;IN/OUT: DXPL cache to fill with values
+ RETURNS
+    Non-negative on success/Negative on failure.
+ DESCRIPTION
+    Query all the values from a DXPL that are needed by internal routines
+    within the library.
+ GLOBAL VARIABLES
+ COMMENTS, BUGS, ASSUMPTIONS
+    The CACHE pointer should point at already allocated memory to place
+    non-default property list info.  If a default property list is used, the
+    CACHE pointer will be changed to point at the default information.
+ EXAMPLES
+ REVISION LOG
+--------------------------------------------------------------------------*/
+herr_t
+H5D_get_dxpl_cache(hid_t dxpl_id, H5D_dxpl_cache_t **cache)
+{
+    herr_t ret_value=SUCCEED;   /* Return value */
+
+    FUNC_ENTER_NOAPI(H5D_get_dxpl_cache,FAIL)
+
+    /* Check args */
+    assert(cache);
+
+    /* Check for the default DXPL */
+    if(dxpl_id==H5P_DATASET_XFER_DEFAULT)
+        *cache=&H5D_def_dxpl_cache;
+    else
+        if(H5D_get_dxpl_cache_real(dxpl_id,*cache) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "Can't retrieve DXPL values")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+}   /* H5D_get_dxpl_cache() */
 
 
 /*-------------------------------------------------------------------------
@@ -126,7 +300,7 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
     const H5S_t		   *mem_space = NULL;
     const H5S_t		   *file_space = NULL;
     char                    fake_char;
-    herr_t                  ret_value = SUCCEED;  /* Return value */
+    herr_t                  ret_value=SUCCEED;  /* Return value */
 
     FUNC_ENTER_API(H5Dread, FAIL)
     H5TRACE6("e", "iiiiix", dset_id, mem_type_id, mem_space_id, file_space_id,
@@ -142,7 +316,7 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
 	/* Check for valid selection */
-	if(H5S_SELECT_VALID(mem_space) != TRUE)
+	if(H5S_SELECT_VALID(mem_space)!=TRUE)
 	    HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "selection+offset not within extent")
     } /* end if */
     if(H5S_ALL != file_space_id) {
@@ -150,33 +324,33 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
 	/* Check for valid selection */
-	if(H5S_SELECT_VALID(file_space) != TRUE)
+	if(H5S_SELECT_VALID(file_space)!=TRUE)
 	    HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "selection+offset not within extent")
-    } /* end if */
+    }
 
     /* Get the default dataset transfer property list if the user didn't provide one */
     if (H5P_DEFAULT == plist_id)
         plist_id= H5P_DATASET_XFER_DEFAULT;
     else
-        if(TRUE != H5P_isa_class(plist_id, H5P_DATASET_XFER))
+        if (TRUE!=H5P_isa_class(plist_id,H5P_DATASET_XFER))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
-    if(!buf && H5S_GET_SELECT_NPOINTS(file_space) != 0)
+    if (!buf && H5S_GET_SELECT_NPOINTS(file_space)!=0)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no output buffer")
 
     /* If the buffer is nil, and 0 element is selected, make a fake buffer.
      * This is for some MPI package like ChaMPIon on NCSA's tungsten which 
      * doesn't support this feature. 
      */ 
-    if(!buf)
+    if (!buf)
         buf = &fake_char;
 
     /* read raw data */
-    if(H5D_read(dset, mem_type_id, mem_space, file_space, plist_id, buf/*out*/) < 0)
+    if (H5D_read(dset, mem_type_id, mem_space, file_space, plist_id, buf/*out*/) < 0)
 	HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data")
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Dread() */
+}
 
 
 /*-------------------------------------------------------------------------
@@ -218,7 +392,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
     const H5S_t		   *mem_space = NULL;
     const H5S_t		   *file_space = NULL;
     char                    fake_char;
-    herr_t                  ret_value = SUCCEED;  /* Return value */
+    herr_t                  ret_value=SUCCEED;  /* Return value */
 
     FUNC_ENTER_API(H5Dwrite, FAIL)
     H5TRACE6("e", "iiiii*x", dset_id, mem_type_id, mem_space_id, file_space_id,
@@ -234,7 +408,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
 	/* Check for valid selection */
-	if(H5S_SELECT_VALID(mem_space) != TRUE)
+	if (H5S_SELECT_VALID(mem_space)!=TRUE)
 	    HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "memory selection+offset not within extent")
     } /* end if */
     if(H5S_ALL != file_space_id) {
@@ -242,7 +416,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
 	/* Check for valid selection */
-	if(H5S_SELECT_VALID(file_space) != TRUE)
+	if(H5S_SELECT_VALID(file_space)!=TRUE)
 	    HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "file selection+offset not within extent")
     } /* end if */
 
@@ -250,16 +424,16 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
     if(H5P_DEFAULT == plist_id)
         plist_id= H5P_DATASET_XFER_DEFAULT;
     else
-        if(TRUE != H5P_isa_class(plist_id, H5P_DATASET_XFER))
+        if(TRUE!=H5P_isa_class(plist_id,H5P_DATASET_XFER))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
-    if(!buf && H5S_GET_SELECT_NPOINTS(file_space) != 0)
+    if(!buf && H5S_GET_SELECT_NPOINTS(file_space)!=0)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no output buffer")
     
     /* If the buffer is nil, and 0 element is selected, make a fake buffer.
      * This is for some MPI package like ChaMPIon on NCSA's tungsten which 
      * doesn't support this feature. 
      */ 
-    if(!buf)
+    if (!buf)
         buf = &fake_char;
 
     /* write raw data */
@@ -268,7 +442,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Dwrite() */
+}
 
 
 /*-------------------------------------------------------------------------
@@ -288,18 +462,16 @@ static herr_t
 H5D_read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
 	 const H5S_t *file_space, hid_t dxpl_id, void *buf/*out*/)
 {
-    H5D_chunk_map_t fm;                 /* Chunk file<->memory mapping */
-    H5D_io_info_t io_info;              /* Dataset I/O info     */
-    H5D_type_info_t type_info;          /* Datatype info for operation */
-    H5D_storage_t store;                /*union of EFL and chunk pointer in file space */
     hssize_t	snelmts;                /*total number of elmts	(signed) */
     hsize_t	nelmts;                 /*total number of elmts	*/
+    H5T_path_t	*tpath = NULL;		/*type conversion info	*/
+    const H5T_t	*mem_type = NULL;       /* Memory datatype */
+    H5D_io_info_t io_info;              /* Dataset I/O info     */
 #ifdef H5_HAVE_PARALLEL
     hbool_t     io_info_init = FALSE;   /* Whether the I/O info has been initialized */
 #endif /*H5_HAVE_PARALLEL*/
-    hbool_t     io_op_init = FALSE;     /* Whether the I/O op has been initialized */
     H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
+    H5D_dxpl_cache_t *dxpl_cache=&_dxpl_cache;   /* Data transfer property cache */
     herr_t	ret_value = SUCCEED;	/* Return value	*/
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_read)
@@ -307,6 +479,10 @@ H5D_read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
     /* check args */
     HDassert(dataset && dataset->oloc.file);
 
+    /* Get memory datatype */
+    if(NULL == (mem_type = (const H5T_t *)H5I_object_verify(mem_type_id, H5I_DATATYPE)))
+	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+
     if(!file_space)
         file_space = dataset->shared->space;
     if(!mem_space)
@@ -316,27 +492,23 @@ H5D_read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
     H5_ASSIGN_OVERFLOW(nelmts,snelmts,hssize_t,hsize_t);
 
     /* Fill the DXPL cache values for later use */
-    if(H5D_get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+    if(H5D_get_dxpl_cache(dxpl_id,&dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
-    /* Set up datatype info for operation */
-    if(H5D_typeinfo_init(dataset, dxpl_cache, dxpl_id, mem_type_id, FALSE, &type_info) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set up type info")
-
 #ifdef H5_HAVE_PARALLEL
     /* Collective access is not permissible without a MPI based VFD */
-    if(dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE && !IS_H5FD_MPI(dataset->oloc.file))
+    if (dxpl_cache->xfer_mode==H5FD_MPIO_COLLECTIVE && !IS_H5FD_MPI(dataset->oloc.file))
         HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "collective access for MPI-based drivers only")
 #endif /*H5_HAVE_PARALLEL*/
 
     /* Make certain that the number of elements in each selection is the same */
-    if(nelmts != (hsize_t)H5S_GET_SELECT_NPOINTS(file_space))
+    if (nelmts!=(hsize_t)H5S_GET_SELECT_NPOINTS(file_space))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "src and dest data spaces have different sizes")
 
     /* Make sure that both selections have their extents set */
-    if(!(H5S_has_extent(file_space)))
+    if( !(H5S_has_extent(file_space)) )
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file dataspace does not have extent set")
-    if(!(H5S_has_extent(mem_space)))
+    if( !(H5S_has_extent(mem_space)) )
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "memory dataspace does not have extent set")
 
     /* Retrieve dataset properties */
@@ -367,56 +539,49 @@ H5D_read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
             HGOTO_DONE(SUCCEED)
 
         /* Go fill the user's selection with the dataset's fill value */
-        if(H5D_fill(dataset->shared->dcpl_cache.fill.buf, dataset->shared->type, buf, type_info.mem_type, mem_space, dxpl_id) < 0)
+        if(H5D_fill(dataset->shared->dcpl_cache.fill.buf, dataset->shared->type, buf, mem_type, mem_space, dxpl_id) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "filling buf failed")
         else
             HGOTO_DONE(SUCCEED)
     } /* end if */
 
+    /*
+     * Locate the type conversion function and data space conversion
+     * functions, and set up the element numbering information. If a data
+     * type conversion is necessary then register datatype atoms. Data type
+     * conversion is necessary if the user has set the `need_bkg' to a high
+     * enough value in xfer_parms since turning off datatype conversion also
+     * turns off background preservation.
+     */
+    if (NULL==(tpath=H5T_path_find(dataset->shared->type, mem_type, NULL, NULL, dxpl_id, FALSE)))
+        HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatype")
+
     /* Set up I/O operation */
-    io_info.op_type = H5D_IO_OP_READ;
-    io_info.u.rbuf = buf;
-    if(H5D_ioinfo_init(dataset, dxpl_cache, dxpl_id, &type_info, &store, &io_info) < 0)
+    if(H5D_ioinfo_init(dataset,dxpl_cache,dxpl_id,mem_space,file_space,tpath,&io_info) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to set up I/O operation")
 #ifdef H5_HAVE_PARALLEL
     io_info_init = TRUE;
 #endif /*H5_HAVE_PARALLEL*/
 
-    /* Sanity check that space is allocated, if there are elements */
-    if(nelmts > 0)
-        HDassert(((dataset->shared->layout.type == H5D_CONTIGUOUS && H5F_addr_defined(dataset->shared->layout.u.contig.addr))
-                || (dataset->shared->layout.type == H5D_CHUNKED && H5F_addr_defined(dataset->shared->layout.u.chunk.addr)))
-                || dataset->shared->dcpl_cache.efl.nused > 0
-                || dataset->shared->layout.type == H5D_COMPACT);
-
-    /* Call storage method's I/O initialization routine */
-    if(io_info.layout_ops.init && (*io_info.layout_ops.init)(&io_info, &type_info, nelmts, file_space, mem_space, &fm) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize I/O info")
-    io_op_init = TRUE;
-
-#ifdef H5_HAVE_PARALLEL
-    /* Adjust I/O info for any parallel I/O */
-    if(H5D_ioinfo_adjust(&io_info, dataset, dxpl_cache, dxpl_id, file_space, mem_space, &type_info, &fm) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to adjust I/O info for parallel I/O")
-#endif /*H5_HAVE_PARALLEL*/
-
-    /* Invoke correct "high level" I/O routine */
-    if((*io_info.io_ops.multi_read)(&io_info, &type_info, nelmts, file_space, mem_space, &fm) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data")
+    /* Determine correct I/O routine to invoke */
+    if(dataset->shared->layout.type!=H5D_CHUNKED) {
+        if(H5D_contig_read(&io_info, nelmts, mem_type, mem_space, file_space, tpath,
+                dataset->shared->type_id, mem_type_id, buf) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data")
+    } /* end if */
+    else {
+        if(H5D_chunk_read(&io_info, nelmts, mem_type, mem_space, file_space, tpath,
+                dataset->shared->type_id, mem_type_id, buf) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data")
+    } /* end else */
 
 done:
-    /* Shut down the I/O op information */
-    if(io_op_init && io_info.layout_ops.term && (*io_info.layout_ops.term)(&fm) < 0)
-        HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to shut down I/O op info")
 #ifdef H5_HAVE_PARALLEL
     /* Shut down io_info struct */
-    if(io_info_init)
+    if (io_info_init)
         if(H5D_ioinfo_term(&io_info) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "can't shut down io_info")
 #endif /*H5_HAVE_PARALLEL*/
-    /* Shut down datatype info for operation */
-    if(H5D_typeinfo_term(&type_info) < 0)
-        HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to shut down type info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_read() */
@@ -439,18 +604,16 @@ static herr_t
 H5D_write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
 	  const H5S_t *file_space, hid_t dxpl_id, const void *buf)
 {
-    H5D_chunk_map_t fm;                 /* Chunk file<->memory mapping */
-    H5D_io_info_t io_info;              /* Dataset I/O info     */
-    H5D_type_info_t type_info;          /* Datatype info for operation */
-    H5D_storage_t store;                /*union of EFL and chunk pointer in file space */
     hssize_t	snelmts;                /*total number of elmts	(signed) */
     hsize_t	nelmts;                 /*total number of elmts	*/
+    H5T_path_t	*tpath = NULL;		/*type conversion info	*/
+    const H5T_t	*mem_type = NULL;       /* Memory datatype */
+    H5D_io_info_t io_info;              /* Dataset I/O info     */
 #ifdef H5_HAVE_PARALLEL
     hbool_t     io_info_init = FALSE;   /* Whether the I/O info has been initialized */
 #endif /*H5_HAVE_PARALLEL*/
-    hbool_t     io_op_init = FALSE;     /* Whether the I/O op has been initialized */
     H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
+    H5D_dxpl_cache_t *dxpl_cache=&_dxpl_cache;   /* Data transfer property cache */
     herr_t	ret_value = SUCCEED;	/* Return value	*/
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_write)
@@ -458,33 +621,33 @@ H5D_write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
     /* check args */
     HDassert(dataset && dataset->oloc.file);
 
+    /* Get the memory datatype */
+    if(NULL == (mem_type = (const H5T_t *)H5I_object_verify(mem_type_id, H5I_DATATYPE)))
+	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+
     /* All filters in the DCPL must have encoding enabled. */
     if(!dataset->shared->checked_filters) {
-        if(H5Z_can_apply(dataset->shared->dcpl_id, dataset->shared->type_id) < 0)
+        if(H5Z_can_apply(dataset->shared->dcpl_id, dataset->shared->type_id) <0)
             HGOTO_ERROR(H5E_PLINE, H5E_CANAPPLY, FAIL, "can't apply filters")
 
         dataset->shared->checked_filters = TRUE;
     } /* end if */
 
     /* Check if we are allowed to write to this file */
-    if(0 == (H5F_INTENT(dataset->oloc.file) & H5F_ACC_RDWR))
+    if(0==(H5F_get_intent(dataset->oloc.file) & H5F_ACC_RDWR))
 	HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "no write intent on file")
 
     /* Fill the DXPL cache values for later use */
-    if(H5D_get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+    if(H5D_get_dxpl_cache(dxpl_id,&dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
-    /* Set up datatype info for operation */
-    if(H5D_typeinfo_init(dataset, dxpl_cache, dxpl_id, mem_type_id, TRUE, &type_info) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set up type info")
-
     /* Various MPI based checks */
 #ifdef H5_HAVE_PARALLEL
     if(IS_H5FD_MPI(dataset->oloc.file)) {
         /* If MPI based VFD is used, no VL datatype support yet. */
         /* This is because they use the global heap in the file and we don't */
         /* support parallel access of that yet */
-        if(H5T_detect_class(type_info.mem_type, H5T_VLEN) > 0)
+        if(H5T_detect_class(mem_type, H5T_VLEN)>0)
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "Parallel IO does not support writing VL datatypes yet")
 
         /* If MPI based VFD is used, no VL datatype support yet. */
@@ -493,48 +656,42 @@ H5D_write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
         /* We should really use H5T_detect_class() here, but it will be difficult
          * to detect the type of the reference if it is nested... -QAK
          */
-        if(H5T_get_class(type_info.mem_type, TRUE) == H5T_REFERENCE &&
-                H5T_get_ref_type(type_info.mem_type) == H5R_DATASET_REGION)
+        if (H5T_get_class(mem_type, TRUE)==H5T_REFERENCE &&
+                H5T_get_ref_type(mem_type)==H5R_DATASET_REGION)
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "Parallel IO does not support writing region reference datatypes yet")
-
-        /* Can't write to chunked datasets with filters, in parallel */
-        if(dataset->shared->layout.type == H5D_CHUNKED &&
-                dataset->shared->dcpl_cache.pline.nused > 0)
-            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "cannot write to chunked storage with filters in parallel")
     } /* end if */
     else {
         /* Collective access is not permissible without a MPI based VFD */
-        if(dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE)
+        if (dxpl_cache->xfer_mode==H5FD_MPIO_COLLECTIVE)
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "collective access for MPI-based driver only")
     } /* end else */
 #endif /*H5_HAVE_PARALLEL*/
 
-    /* Initialize dataspace information */
-    if(!file_space)
+    if (!file_space)
         file_space = dataset->shared->space;
-    if(!mem_space)
+    if (!mem_space)
         mem_space = file_space;
     if((snelmts = H5S_GET_SELECT_NPOINTS(mem_space)) < 0)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "src dataspace has invalid selection")
-    H5_ASSIGN_OVERFLOW(nelmts, snelmts, hssize_t, hsize_t);
+    H5_ASSIGN_OVERFLOW(nelmts,snelmts,hssize_t,hsize_t);
 
     /* Make certain that the number of elements in each selection is the same */
-    if(nelmts != (hsize_t)H5S_GET_SELECT_NPOINTS(file_space))
+    if (nelmts!=(hsize_t)H5S_GET_SELECT_NPOINTS(file_space))
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "src and dest data spaces have different sizes")
 
     /* Make sure that both selections have their extents set */
-    if(!(H5S_has_extent(file_space)))
+    if( !(H5S_has_extent(file_space)) )
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file dataspace does not have extent set")
-    if(!(H5S_has_extent(mem_space)))
+    if( !(H5S_has_extent(mem_space)) )
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "memory dataspace does not have extent set")
 
     /* Retrieve dataset properties */
     /* <none needed currently> */
 
     /* Allocate data space and initialize it if it hasn't been. */
-    if(nelmts > 0 && dataset->shared->dcpl_cache.efl.nused == 0 &&
-            ((dataset->shared->layout.type == H5D_CONTIGUOUS && !H5F_addr_defined(dataset->shared->layout.u.contig.addr))
-                || (dataset->shared->layout.type == H5D_CHUNKED && !H5F_addr_defined(dataset->shared->layout.u.chunk.addr)))) {
+    if(nelmts > 0 && dataset->shared->dcpl_cache.efl.nused==0 &&
+            ((dataset->shared->layout.type==H5D_CONTIGUOUS && !H5F_addr_defined(dataset->shared->layout.u.contig.addr))
+                || (dataset->shared->layout.type==H5D_CHUNKED && !H5F_addr_defined(dataset->shared->layout.u.chunk.addr)))) {
         hssize_t file_nelmts;   /* Number of elements in file dataset's dataspace */
         hbool_t full_overwrite; /* Whether we are over-writing all the elements */
 
@@ -546,36 +703,42 @@ H5D_write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
         if(H5T_detect_class(dataset->shared->type, H5T_VLEN))
             full_overwrite = FALSE;
         else
-            full_overwrite = (hsize_t)file_nelmts == nelmts ? TRUE : FALSE;
+            full_overwrite = (hsize_t)file_nelmts==nelmts ? TRUE : FALSE;
 
  	/* Allocate storage */
         if(H5D_alloc_storage(dataset->oloc.file, dxpl_id, dataset, H5D_ALLOC_WRITE, full_overwrite) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize storage")
     } /* end if */
 
+    /*
+     * Locate the type conversion function and data space conversion
+     * functions, and set up the element numbering information. If a data
+     * type conversion is necessary then register datatype atoms. Data type
+     * conversion is necessary if the user has set the `need_bkg' to a high
+     * enough value in xfer_parms since turning off datatype conversion also
+     * turns off background preservation.
+     */
+    if (NULL==(tpath=H5T_path_find(mem_type, dataset->shared->type, NULL, NULL, dxpl_id, FALSE)))
+	HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatype")
+
     /* Set up I/O operation */
-    io_info.op_type = H5D_IO_OP_WRITE;
-    io_info.u.wbuf = buf;
-    if(H5D_ioinfo_init(dataset, dxpl_cache, dxpl_id, &type_info, &store, &io_info) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set up I/O operation")
+    if(H5D_ioinfo_init(dataset,dxpl_cache,dxpl_id,mem_space,file_space,tpath,&io_info) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to set up I/O operation")
 #ifdef H5_HAVE_PARALLEL
     io_info_init = TRUE;
 #endif /*H5_HAVE_PARALLEL*/
 
-    /* Call storage method's I/O initialization routine */
-    if(io_info.layout_ops.init && (*io_info.layout_ops.init)(&io_info, &type_info, nelmts, file_space, mem_space, &fm) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize I/O info")
-    io_op_init = TRUE;
-
-#ifdef H5_HAVE_PARALLEL
-    /* Adjust I/O info for any parallel I/O */
-    if(H5D_ioinfo_adjust(&io_info, dataset, dxpl_cache, dxpl_id, file_space, mem_space, &type_info, &fm) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to adjust I/O info for parallel I/O")
-#endif /*H5_HAVE_PARALLEL*/
-
-    /* Invoke correct "high level" I/O routine */
-    if((*io_info.io_ops.multi_write)(&io_info, &type_info, nelmts, file_space, mem_space, &fm) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data")
+    /* Determine correct I/O routine to invoke */
+    if(dataset->shared->layout.type!=H5D_CHUNKED) {
+        if(H5D_contig_write(&io_info, nelmts, mem_type, mem_space, file_space, tpath,
+                mem_type_id, dataset->shared->type_id, buf) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data")
+    } /* end if */
+    else {
+        if(H5D_chunk_write(&io_info, nelmts, mem_type, mem_space, file_space, tpath,
+                mem_type_id, dataset->shared->type_id, buf) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data")
+    } /* end else */
 
 #ifdef OLD_WAY
 /*
@@ -593,325 +756,2667 @@ H5D_write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
 #endif /* OLD_WAY */
 
 done:
-    /* Shut down the I/O op information */
-    if(io_op_init && io_info.layout_ops.term && (*io_info.layout_ops.term)(&fm) < 0)
-        HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to shut down I/O op info")
 #ifdef H5_HAVE_PARALLEL
     /* Shut down io_info struct */
-    if(io_info_init && H5D_ioinfo_term(&io_info) < 0)
-        HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "can't shut down io_info")
+    if (io_info_init)
+        if(H5D_ioinfo_term(&io_info) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "can't shut down io_info")
 #endif /*H5_HAVE_PARALLEL*/
-    /* Shut down datatype info for operation */
-    if(H5D_typeinfo_term(&type_info) < 0)
-        HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to shut down type info")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_write() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5D_ioinfo_init
+ * Function:	H5D_contig_read
  *
- * Purpose:	Routine for determining correct I/O operations for
- *              each I/O action.
+ * Purpose:	Read from a contiguous dataset.
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		Thursday, September 30, 2004
+ * Programmer:	Raymond Lu
+ *		Thursday, April 10, 2003
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_ioinfo_init(H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
-    const H5D_type_info_t *type_info, H5D_storage_t *store, H5D_io_info_t *io_info)
+H5D_contig_read(H5D_io_info_t *io_info, hsize_t nelmts,
+    const H5T_t *mem_type, const H5S_t *mem_space,
+    const H5S_t *file_space, H5T_path_t *tpath,
+    hid_t src_id, hid_t dst_id, void *buf/*out*/)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_ioinfo_init)
+    H5D_t *dataset=io_info->dset;       /* Local pointer to dataset info */
+    const H5D_dxpl_cache_t *dxpl_cache=io_info->dxpl_cache;     /* Local pointer to dataset transfer info */
+    herr_t      status;                 /*function return status*/
+#ifdef H5S_DEBUG
+    H5_timer_t	timer;
+#endif
+    size_t	src_type_size;		/*size of source type	*/
+    size_t	dst_type_size;	        /*size of destination type*/
+    size_t	max_type_size;	        /* Size of largest source/destination type */
+    size_t	target_size;		/*desired buffer size	*/
+    size_t	request_nelmts;		/*requested strip mine	*/
+    H5S_sel_iter_t mem_iter;            /*memory selection iteration info*/
+    hbool_t	mem_iter_init=0;	/*memory selection iteration info has been initialized */
+    H5S_sel_iter_t bkg_iter;            /*background iteration info*/
+    hbool_t	bkg_iter_init=0;	/*background iteration info has been initialized */
+    H5S_sel_iter_t file_iter;           /*file selection iteration info*/
+    hbool_t	file_iter_init=0;	/*file selection iteration info has been initialized */
+    H5T_bkg_t	need_bkg;		/*type of background buf*/
+    uint8_t	*tconv_buf = NULL;	/*datatype conv buffer	*/
+    uint8_t	*bkg_buf = NULL;	/*background buffer	*/
+    hsize_t	smine_start;		/*strip mine start loc	*/
+    size_t	n, smine_nelmts;	/*elements per strip	*/
+    H5D_storage_t store;                /*union of storage info for dataset */
 
-    /* check args */
-    HDassert(dset);
-    HDassert(dset->oloc.file);
-    HDassert(type_info);
-    HDassert(type_info->tpath);
-    HDassert(io_info);
 
-    /* Set up "normal" I/O fields */
-    io_info->dset = dset;
-    io_info->dxpl_cache = dxpl_cache;
-    io_info->dxpl_id = dxpl_id;
-    io_info->store = store;
+    herr_t	ret_value = SUCCEED;	/*return value		*/
 
-    /* Set I/O operations to initial values */
-    io_info->layout_ops = *dset->shared->layout_ops;
+    FUNC_ENTER_NOAPI_NOINIT(H5D_contig_read)
+
+    assert (buf);
+
+    /* Initialize storage info for this dataset */
+    if (dataset->shared->dcpl_cache.efl.nused > 0)
+        HDmemcpy(&store.efl, &(dataset->shared->dcpl_cache.efl), sizeof(H5O_efl_t));
+    else {
+        store.contig.dset_addr = dataset->shared->layout.u.contig.addr;
+        store.contig.dset_size = dataset->shared->layout.u.contig.size;
+    } /* end if */
+
+    /* Set dataset storage for I/O info */
+    io_info->store=&store;
+
+    /*
+     * If there is no type conversion then read directly into the
+     * application's buffer.  This saves at least one mem-to-mem copy.
+     */
+    if ( H5Z_xform_noop(dxpl_cache->data_xform_prop) && H5T_path_noop(tpath)) {
+#ifdef H5S_DEBUG
+	H5_timer_begin(&timer);
+#endif
+  	/* Sanity check dataset, then read it */
+        assert(((dataset->shared->layout.type == H5D_CONTIGUOUS && H5F_addr_defined(dataset->shared->layout.u.contig.addr))
+                || (dataset->shared->layout.type == H5D_CHUNKED && H5F_addr_defined(dataset->shared->layout.u.chunk.addr)))
+                || dataset->shared->dcpl_cache.efl.nused > 0 || 0 == nelmts
+                || dataset->shared->layout.type==H5D_COMPACT);
+        H5_CHECK_OVERFLOW(nelmts,hsize_t,size_t);
+
+#ifdef H5_HAVE_PARALLEL
+	if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) {
+	  if(H5D_contig_collective_io(io_info,file_space,mem_space,buf,FALSE) < 0)
+	    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "contiguous read failed in collective mode");
+	}
+	else
+#endif
+        {
+            if((io_info->ops.read)(io_info, (size_t)nelmts,
+                    H5T_get_size(dataset->shared->type), file_space, mem_space,
+                    (haddr_t)0, NULL, buf/*out*/) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "contiguous read failed ");
+	}
+
+#ifdef H5S_DEBUG
+        H5_timer_end(&(io_info->stats->stats[1].read_timer), &timer);
+        io_info->stats->stats[1].read_nbytes += nelmts * H5T_get_size(dataset->shared->type);
+        io_info->stats->stats[1].read_ncalls++;
+#endif
+
+            /* direct xfer accomplished successfully */
+            HGOTO_DONE(SUCCEED)
+    } /* end if */
 
-    /* Set the "high-level" I/O operations for the dataset */
-    io_info->io_ops.multi_read = dset->shared->layout_ops->ser_read;
-    io_info->io_ops.multi_write = dset->shared->layout_ops->ser_write;
+    /*
+     * This is the general case (type conversion, usually).
+     */
+    if(nelmts==0)
+        HGOTO_DONE(SUCCEED)
+
+    /* Compute element sizes and other parameters */
+    src_type_size = H5T_get_size(dataset->shared->type);
+    dst_type_size = H5T_get_size(mem_type);
+    max_type_size = MAX(src_type_size, dst_type_size);
+    target_size = dxpl_cache->max_temp_buf;
+    /* XXX: This could cause a problem if the user sets their buffer size
+     * to the same size as the default, and then the dataset elements are
+     * too large for the buffer... - QAK
+     */
+    if(target_size == H5D_TEMP_BUF_SIZE) {
+        /* If the buffer is too small to hold even one element, make it bigger */
+        if(target_size<max_type_size)
+            target_size = max_type_size;
+        /* If the buffer is too large to hold all the elements, make it smaller */
+        else if(target_size>(nelmts*max_type_size))
+            target_size=(size_t)(nelmts*max_type_size);
+    } /* end if */
+    request_nelmts = target_size / max_type_size;
+
+    /* Sanity check elements in temporary buffer */
+    if (request_nelmts==0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "temporary buffer max size is too small")
+
+    /* Figure out the strip mine size. */
+    if (H5S_select_iter_init(&file_iter, file_space, src_type_size) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize file selection information")
+    file_iter_init=1;	/*file selection iteration info has been initialized */
+    if (H5S_select_iter_init(&mem_iter, mem_space, dst_type_size) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize memory selection information")
+    mem_iter_init=1;	/*file selection iteration info has been initialized */
+    if (H5S_select_iter_init(&bkg_iter, mem_space, dst_type_size) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize background selection information")
+    bkg_iter_init=1;	/*file selection iteration info has been initialized */
+
+    /*
+     * Get a temporary buffer for type conversion unless the app has already
+     * supplied one through the xfer properties. Instead of allocating a
+     * buffer which is the exact size, we allocate the target size.  The
+     * malloc() is usually less resource-intensive if we allocate/free the
+     * same size over and over.
+     */
+    if (H5T_path_bkg(tpath)) {
+        H5T_bkg_t path_bkg;     /* Type conversion's background info */
+
+        /* Retrieve the bkgr buffer property */
+        need_bkg=dxpl_cache->bkgr_buf_type;
+        path_bkg = H5T_path_bkg(tpath);
+        need_bkg = MAX(path_bkg, need_bkg);
+    } else {
+        need_bkg = H5T_BKG_NO; /*never needed even if app says yes*/
+    } /* end else */
+    if(NULL == (tconv_buf = (uint8_t *)dxpl_cache->tconv_buf)) {
+        /* Allocate temporary buffer */
+        if(NULL == (tconv_buf = H5FL_BLK_MALLOC(type_conv, target_size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
+    } /* end if */
+    if(need_bkg && NULL == (bkg_buf = (uint8_t *)dxpl_cache->bkgr_buf)) {
+        /* Allocate background buffer */
+        /* (Need calloc()-like call since memory needs to be initialized) */
+        if(NULL == (bkg_buf = H5FL_BLK_CALLOC(type_conv, (request_nelmts * dst_type_size))))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for background conversion")
+    } /* end if */
+
+    /* Start strip mining... */
+    for (smine_start=0; smine_start<nelmts; smine_start+=smine_nelmts) {
+        /* Go figure out how many elements to read from the file */
+        assert(H5S_SELECT_ITER_NELMTS(&file_iter)==(nelmts-smine_start));
+        smine_nelmts = (size_t)MIN(request_nelmts, (nelmts-smine_start));
 
-    /* Set the I/O operations for reading/writing single blocks on disk */
-    if(type_info->is_xform_noop && type_info->is_conv_noop) {
         /*
-         * If there is no data transform or type conversion then read directly into
-         *  the application's buffer.  This saves at least one mem-to-mem copy.
+         * Gather the data from disk into the datatype conversion
+         * buffer. Also gather data from application to background buffer
+         * if necessary.
          */
-        io_info->io_ops.single_read = H5D_select_read;
-        io_info->io_ops.single_write = H5D_select_write;
+#ifdef H5S_DEBUG
+	H5_timer_begin(&timer);
+#endif
+	/* Sanity check that space is allocated, then read data from it */
+        HDassert(((dataset->shared->layout.type == H5D_CONTIGUOUS && H5F_addr_defined(dataset->shared->layout.u.contig.addr))
+                || (dataset->shared->layout.type == H5D_CHUNKED && H5F_addr_defined(dataset->shared->layout.u.chunk.addr)))
+            || dataset->shared->dcpl_cache.efl.nused > 0 ||
+             dataset->shared->layout.type == H5D_COMPACT);
+        n = H5D_select_fgath(io_info, file_space, &file_iter, smine_nelmts, (haddr_t)0, NULL, tconv_buf/*out*/);
+
+#ifdef H5S_DEBUG
+	H5_timer_end(&(io_info->stats->stats[1].gath_timer), &timer);
+	io_info->stats->stats[1].gath_nbytes += n * src_type_size;
+	io_info->stats->stats[1].gath_ncalls++;
+#endif
+	if (n!=smine_nelmts)
+            HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed")
+
+        /* If the source and destination are compound types and subset of each other
+         * and no conversion is needed, copy the data directly into user's buffer and 
+         * bypass the rest of steps.  This optimization is for Chicago company */
+        if(H5T_SUBSET_SRC==H5T_path_compound_subset(tpath)) {
+            if(H5D_compound_opt_read(smine_nelmts, mem_space, &mem_iter, dxpl_cache,
+                src_id, dst_id, H5T_SUBSET_SRC, tconv_buf, buf /*out*/)<0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
+
+            continue;
+        } else if(H5T_SUBSET_DST==H5T_path_compound_subset(tpath)) {
+            if(H5D_compound_opt_read(smine_nelmts, mem_space, &mem_iter, dxpl_cache,
+                src_id, dst_id, H5T_SUBSET_DST, tconv_buf, buf /*out*/)<0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
+
+            continue;
+        }
+
+        if (H5T_BKG_YES==need_bkg) {
+#ifdef H5S_DEBUG
+            H5_timer_begin(&timer);
+#endif
+            n = H5D_select_mgath(buf, mem_space, &bkg_iter,
+				 smine_nelmts, dxpl_cache, bkg_buf/*out*/);
+#ifdef H5S_DEBUG
+            H5_timer_end(&(io_info->stats->stats[1].bkg_timer), &timer);
+            io_info->stats->stats[1].bkg_nbytes += n * dst_type_size;
+            io_info->stats->stats[1].bkg_ncalls++;
+#endif
+            if (n!=smine_nelmts)
+                HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "mem gather failed")
+        } /* end if */
+
+	/*
+         * Perform datatype conversion.
+         */
+        if (H5T_convert(tpath, src_id, dst_id, smine_nelmts, (size_t)0, (size_t)0, tconv_buf, bkg_buf, io_info->dxpl_id) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
+
+	/* Do the data transform after the conversion (since we're using type mem_type) */
+        if(!H5Z_xform_noop(dxpl_cache->data_xform_prop))
+             if( H5Z_xform_eval(dxpl_cache->data_xform_prop, tconv_buf, smine_nelmts, mem_type) < 0)
+		    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Error performing data transform")
+
+        /*
+         * Scatter the data into memory.
+         */
+#ifdef H5S_DEBUG
+	H5_timer_begin(&timer);
+#endif
+        status = H5D_select_mscat(tconv_buf, mem_space,
+                          &mem_iter, smine_nelmts, dxpl_cache, buf/*out*/);
+#ifdef H5S_DEBUG
+	H5_timer_end(&(io_info->stats->stats[1].scat_timer), &timer);
+	io_info->stats->stats[1].scat_nbytes += smine_nelmts * dst_type_size;
+	io_info->stats->stats[1].scat_ncalls++;
+#endif
+	if (status<0)
+            HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "scatter failed")
+    } /* end for */
+
+done:
+    /* Release selection iterators */
+    if(file_iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
     } /* end if */
+    if(mem_iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+    } /* end if */
+    if(bkg_iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&bkg_iter) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+    } /* end if */
+
+    if (tconv_buf && NULL==dxpl_cache->tconv_buf)
+        (void)H5FL_BLK_FREE(type_conv,tconv_buf);
+    if (bkg_buf && NULL==dxpl_cache->bkgr_buf)
+        (void)H5FL_BLK_FREE(type_conv,bkg_buf);
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_contig_read() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_contig_write
+ *
+ * Purpose:	Write to a contiguous dataset.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Raymond Lu
+ *		Thursday, April 10, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_contig_write(H5D_io_info_t *io_info, hsize_t nelmts,
+    const H5T_t *mem_type, const H5S_t *mem_space,
+    const H5S_t *file_space, H5T_path_t *tpath,
+    hid_t src_id, hid_t dst_id, const void *buf)
+{
+    H5D_t *dataset=io_info->dset;       /* Local pointer to dataset info */
+    const H5D_dxpl_cache_t *dxpl_cache=io_info->dxpl_cache;     /* Local pointer to dataset transfer info */
+    herr_t      status;                 /*function return status*/
+#ifdef H5S_DEBUG
+    H5_timer_t	timer;
+#endif
+    size_t	src_type_size;		/*size of source type	*/
+    size_t	dst_type_size;	        /*size of destination type*/
+    size_t	max_type_size;	        /* Size of largest source/destination type */
+    size_t	target_size;		/*desired buffer size	*/
+    size_t	request_nelmts;		/*requested strip mine	*/
+    H5S_sel_iter_t mem_iter;            /*memory selection iteration info*/
+    hbool_t	mem_iter_init=0;	/*memory selection iteration info has been initialized */
+    H5S_sel_iter_t bkg_iter;            /*background iteration info*/
+    hbool_t	bkg_iter_init=0;	/*background iteration info has been initialized */
+    H5S_sel_iter_t file_iter;           /*file selection iteration info*/
+    hbool_t	file_iter_init=0;	/*file selection iteration info has been initialized */
+    H5T_bkg_t	need_bkg;		/*type of background buf*/
+    uint8_t	*tconv_buf = NULL;	/*datatype conv buffer	*/
+    uint8_t	*bkg_buf = NULL;	/*background buffer	*/
+    hsize_t	smine_start;		/*strip mine start loc	*/
+    size_t	n, smine_nelmts;	/*elements per strip	*/
+    H5D_storage_t store;                /*union of storage info for dataset */
+
+    herr_t	ret_value = SUCCEED;	/*return value		*/
+
+    FUNC_ENTER_NOAPI_NOINIT(H5D_contig_write)
+
+    assert (buf);
+
+    /* Initialize storage info for this dataset */
+    if(dataset->shared->dcpl_cache.efl.nused > 0)
+        HDmemcpy(&store.efl, &(dataset->shared->dcpl_cache.efl), sizeof(H5O_efl_t));
     else {
+        store.contig.dset_addr = dataset->shared->layout.u.contig.addr;
+        store.contig.dset_size = dataset->shared->layout.u.contig.size;
+    } /* end if */
+
+    /* Set dataset storage for I/O info */
+    io_info->store = &store;
+
+    /*
+     * If there is no type conversion then write directly from the
+     * application's buffer.  This saves at least one mem-to-mem copy.
+     */
+    if(H5Z_xform_noop(dxpl_cache->data_xform_prop) && H5T_path_noop(tpath)) {
+#ifdef H5S_DEBUG
+	H5_timer_begin(&timer);
+#endif
+        H5_CHECK_OVERFLOW(nelmts,hsize_t,size_t);
+#ifdef H5_HAVE_PARALLEL
+	if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) {
+	  if(H5D_contig_collective_io(io_info, file_space, mem_space, buf, TRUE) < 0)
+	    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "contiguous write failed in collective mode")
+	}
+	else
+#endif
+        {
+            if((io_info->ops.write)(io_info, (size_t)nelmts,
+                    H5T_get_size(dataset->shared->type), file_space, mem_space,
+                    (haddr_t)0, NULL, buf/*out*/) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "contiguous write failed ")
+	}
+
+#ifdef H5S_DEBUG
+        H5_timer_end(&(io_info->stats->stats[0].write_timer), &timer);
+        io_info->stats->stats[0].write_nbytes += nelmts * H5T_get_size(mem_type);
+        io_info->stats->stats[0].write_ncalls++;
+#endif
+
+	    /* direct xfer accomplished successfully */
+	    HGOTO_DONE(SUCCEED)
+    } /* end if */
+
+    /*
+     * This is the general case.
+     */
+    if(nelmts==0)
+        HGOTO_DONE(SUCCEED)
+
+    /* Compute element sizes and other parameters */
+    src_type_size = H5T_get_size(mem_type);
+    dst_type_size = H5T_get_size(dataset->shared->type);
+    max_type_size = MAX(src_type_size, dst_type_size);
+    target_size = dxpl_cache->max_temp_buf;
+    /* XXX: This could cause a problem if the user sets their buffer size
+     * to the same size as the default, and then the dataset elements are
+     * too large for the buffer... - QAK
+     */
+    if(target_size == H5D_TEMP_BUF_SIZE) {
+        /* If the buffer is too small to hold even one element, make it bigger */
+        if(target_size<max_type_size)
+            target_size = max_type_size;
+        /* If the buffer is too large to hold all the elements, make it smaller */
+        else if(target_size>(nelmts*max_type_size))
+            target_size=(size_t)(nelmts*max_type_size);
+    } /* end if */
+    request_nelmts = target_size / max_type_size;
+
+    /* Sanity check elements in temporary buffer */
+    if (request_nelmts==0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "temporary buffer max size is too small")
+
+    /* Figure out the strip mine size. */
+    if (H5S_select_iter_init(&file_iter, file_space, dst_type_size) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize file selection information")
+    file_iter_init=1;	/*file selection iteration info has been initialized */
+    if (H5S_select_iter_init(&mem_iter, mem_space, src_type_size) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize memory selection information")
+    mem_iter_init=1;	/*file selection iteration info has been initialized */
+    if (H5S_select_iter_init(&bkg_iter, file_space, dst_type_size) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize background selection information")
+    bkg_iter_init=1;	/*file selection iteration info has been initialized */
+
+    /*
+     * Get a temporary buffer for type conversion unless the app has already
+     * supplied one through the xfer properties.  Instead of allocating a
+     * buffer which is the exact size, we allocate the target size. The
+     * malloc() is usually less resource-intensive if we allocate/free the
+     * same size over and over.
+     */
+    if(H5T_detect_class(dataset->shared->type, H5T_VLEN)) {
+	/* Old data is retrieved into background buffer for VL datatype.  The
+	 * data is used later for freeing heap objects. */
+        need_bkg = H5T_BKG_YES;
+    } else if (H5T_path_bkg(tpath)) {
+        H5T_bkg_t path_bkg;     /* Type conversion's background info */
+
+        /* Retrieve the bkgr buffer property */
+        need_bkg=dxpl_cache->bkgr_buf_type;
+        path_bkg = H5T_path_bkg(tpath);
+        need_bkg = MAX (path_bkg, need_bkg);
+    } else {
+        need_bkg = H5T_BKG_NO; /*never needed even if app says yes*/
+    } /* end else */
+    if(NULL == (tconv_buf = (uint8_t *)dxpl_cache->tconv_buf)) {
+        /* Allocate temporary buffer */
+        if(NULL == (tconv_buf = H5FL_BLK_MALLOC(type_conv, target_size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
+    } /* end if */
+    if(need_bkg && NULL == (bkg_buf = (uint8_t *)dxpl_cache->bkgr_buf)) {
+        /* Allocate background buffer */
+        /* (Don't need calloc()-like call since file data is already initialized) */
+        if(NULL == (bkg_buf = H5FL_BLK_MALLOC(type_conv, (request_nelmts * dst_type_size))))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for background conversion")
+    } /* end if */
+
+    /* Start strip mining... */
+    for (smine_start=0; smine_start<nelmts; smine_start+=smine_nelmts) {
+        /* Go figure out how many elements to read from the file */
+        assert(H5S_SELECT_ITER_NELMTS(&file_iter)==(nelmts-smine_start));
+        smine_nelmts = (size_t)MIN(request_nelmts, (nelmts-smine_start));
+
         /*
-         * This is the general case (type conversion, usually).
+         * Gather data from application buffer into the datatype conversion
+         * buffer. Also gather data from the file into the background buffer
+         * if necessary.
          */
-        io_info->io_ops.single_read = H5D_scatgath_read;
-        io_info->io_ops.single_write = H5D_scatgath_write;
-    } /* end else */
+#ifdef H5S_DEBUG
+	H5_timer_begin(&timer);
+#endif
+        n = H5D_select_mgath(buf, mem_space, &mem_iter,
+			     smine_nelmts, dxpl_cache, tconv_buf/*out*/);
+#ifdef H5S_DEBUG
+	H5_timer_end(&(io_info->stats->stats[0].gath_timer), &timer);
+	io_info->stats->stats[0].gath_nbytes += n * src_type_size;
+	io_info->stats->stats[0].gath_ncalls++;
+#endif
+        if (n!=smine_nelmts)
+            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "mem gather failed")
+
+        /* If the source and destination are compound types and the destination is
+         * is a subset of the source and no conversion is needed, copy the data 
+         * directly into user's buffer and bypass the rest of steps.  If the source
+         * is a subset of the destination, the optimization is done in conversion
+         * function H5T_conv_struct_opt to protect the background data.  This
+         * optimization is for Chicago company */
+        if(H5T_SUBSET_DST==H5T_path_compound_subset(tpath)) {
+            if(H5D_compound_opt_write(smine_nelmts, src_id, dst_id, tconv_buf)<0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
+        } else {
+            if (H5T_BKG_YES==need_bkg) {
+#ifdef H5S_DEBUG
+                H5_timer_begin(&timer);
+#endif
+                n = H5D_select_fgath(io_info, file_space, &bkg_iter, smine_nelmts,
+                                    (haddr_t)0, NULL, bkg_buf/*out*/);
+
+#ifdef H5S_DEBUG
+                H5_timer_end(&(io_info->stats->stats[0].bkg_timer), &timer);
+                io_info->stats->stats[0].bkg_nbytes += n * dst_type_size;
+                io_info->stats->stats[0].bkg_ncalls++;
+#endif
+                if (n!=smine_nelmts)
+                    HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file gather failed")
+            } /* end if */
+
+	    /*
+             * Perform datatype conversion.
+             */
+            if(H5T_convert(tpath, src_id, dst_id, smine_nelmts, (size_t)0, (size_t)0, tconv_buf, bkg_buf, io_info->dxpl_id) < 0)
+                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
+
+	    /* Do the data transform after the type conversion (since we're using dataset->shared->type). */
+	    if(!H5Z_xform_noop(dxpl_cache->data_xform_prop))
+	        if( H5Z_xform_eval(dxpl_cache->data_xform_prop, tconv_buf, smine_nelmts, dataset->shared->type) < 0)
+		    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Error performing data transform")
+        }
+
+        /*
+         * Scatter the data out to the file.
+         */
+#ifdef H5S_DEBUG
+        H5_timer_begin(&timer);
+#endif
+	status = H5D_select_fscat(io_info, file_space, &file_iter, smine_nelmts,
+                    (haddr_t)0, NULL, tconv_buf);
+#ifdef H5S_DEBUG
+        H5_timer_end(&(io_info->stats->stats[0].scat_timer), &timer);
+        io_info->stats->stats[0].scat_nbytes += smine_nelmts * dst_type_size;
+        io_info->stats->stats[0].scat_ncalls++;
+#endif
+        if (status<0)
+            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "scatter failed")
+    } /* end for */
+
+done:
+    /* Release selection iterators */
+    if(file_iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+    } /* end if */
+    if(mem_iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+    } /* end if */
+    if(bkg_iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&bkg_iter) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+    } /* end if */
+
+    if (tconv_buf && NULL==dxpl_cache->tconv_buf)
+        (void)H5FL_BLK_FREE(type_conv,tconv_buf);
+    if (bkg_buf && NULL==dxpl_cache->bkgr_buf)
+        (void)H5FL_BLK_FREE(type_conv,bkg_buf);
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_contig_write() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_chunk_read
+ *
+ * Purpose:	Read from a chunked dataset.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Raymond Lu
+ *		Thursday, April 10, 2003
+ *
+ * Modification: 
+ *              Raymond Lu
+ *              20 July 2007
+ *              Moved H5D_istore_lock and H5D_istore_unlock to this level
+ *              from H5D_istore_readvv to avoid frequent lock and unlock
+ *              and to improve performance.
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_chunk_read(H5D_io_info_t *io_info, hsize_t nelmts,
+    const H5T_t *mem_type, const H5S_t *mem_space,
+    const H5S_t *file_space, H5T_path_t *tpath,
+    hid_t src_id, hid_t dst_id, void *buf/*out*/)
+{
+    H5D_t *dataset=io_info->dset;       /* Local pointer to dataset info */
+    const H5D_dxpl_cache_t *dxpl_cache=io_info->dxpl_cache;     /* Local pointer to dataset transfer info */
+    H5D_chunk_map_t      fm;            /* File<->memory mapping */
+    H5SL_node_t *chunk_node;            /* Current node in chunk skip list */
+    herr_t      status;                 /*function return status*/
+#ifdef H5S_DEBUG
+    H5_timer_t	timer;
+#endif
+    size_t	src_type_size;		/*size of source type	*/
+    size_t	dst_type_size;	        /*size of destination type*/
+    size_t	max_type_size;	        /* Size of largest source/destination type */
+    size_t	target_size;		/*desired buffer size	*/
+    size_t	request_nelmts;		/*requested strip mine	*/
+    hsize_t     smine_start;            /*strip mine start loc  */
+    size_t      n, smine_nelmts;        /*elements per strip    */
+    size_t      accessed_bytes = 0;     /*total accessed size in a chunk */
+    H5S_sel_iter_t mem_iter;            /*memory selection iteration info*/
+    hbool_t	mem_iter_init = FALSE;	/*memory selection iteration info has been initialized */
+    H5S_sel_iter_t bkg_iter;            /*background iteration info*/
+    hbool_t	bkg_iter_init = FALSE;	/*background iteration info has been initialized */
+    H5S_sel_iter_t file_iter;           /*file selection iteration info*/
+    hbool_t	file_iter_init = FALSE;	/*file selection iteration info has been initialized */
+    H5T_bkg_t	need_bkg;		/*type of background buf*/
+    uint8_t	*tconv_buf = NULL;	/*datatype conv buffer	*/
+    uint8_t	*bkg_buf = NULL;	/*background buffer	*/
+    H5D_storage_t store;                /*union of EFL and chunk pointer in file space */
+    void        *chunk = NULL;
+    haddr_t	chunk_addr;             /* Chunk address on disk */
+    H5D_istore_ud1_t udata;		/*B-tree pass-through	*/
+    unsigned    idx_hint=0;             /* Cache index hint      */
+    herr_t	ret_value = SUCCEED;	/*return value		*/
+
+    FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_read)
+
+    assert (buf);
+
+    /* Map elements between file and memory for each chunk*/
+    if(H5D_create_chunk_map(&fm, io_info, nelmts, file_space, mem_space, mem_type) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't build chunk mapping")
+
+    /* Set dataset storage for I/O info */
+    io_info->store=&store;
+
+    /* Compute element sizes */
+    src_type_size = H5T_get_size(dataset->shared->type);
+    dst_type_size = H5T_get_size(mem_type);
+    max_type_size = MAX(src_type_size, dst_type_size);
+
+    /*
+     * If there is no type conversion then read directly into the
+     * application's buffer.  This saves at least one mem-to-mem copy.
+     */
+    if ( H5Z_xform_noop(dxpl_cache->data_xform_prop) && H5T_path_noop(tpath)) {
+#ifdef H5S_DEBUG
+	H5_timer_begin(&timer);
+#endif
+  	/* Sanity check dataset, then read it */
+        HDassert(((dataset->shared->layout.type == H5D_CONTIGUOUS && H5F_addr_defined(dataset->shared->layout.u.contig.addr))
+                || (dataset->shared->layout.type == H5D_CHUNKED && H5F_addr_defined(dataset->shared->layout.u.chunk.addr)))
+                || dataset->shared->dcpl_cache.efl.nused > 0 || 0 == nelmts
+                || dataset->shared->layout.type == H5D_COMPACT);
 
 #ifdef H5_HAVE_PARALLEL
-    /* Determine if the file was opened with an MPI VFD */
-    io_info->using_mpi_vfd = IS_H5FD_MPI(dset->oloc.file);
-#endif /* H5_HAVE_PARALLEL */
+        /* Check whether the collective mode can be turned off globally*/
+#ifndef H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS
+        if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) {
+            if(H5D_mpio_chunk_adjust_iomode(io_info ,&fm))
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't adjust collective I/O")
+        }
+#endif /* H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS */
+	/* Temporarily shut down collective IO for chunking */
+	if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) {
+            if(H5D_chunk_collective_io(io_info, &fm, buf, FALSE) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "chunked read failed in collective mode")
+	}
+	else {/* sequential or independent read */
+#endif
+            /* Get first node in chunk skip list */
+            chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm);
+
+            while(chunk_node) {
+                H5D_chunk_info_t *chunk_info;   /* chunk information */
+
+                /* Get the actual chunk information from the skip list node */
+                chunk_info = H5D_CHUNK_GET_NODE_INFO(fm, chunk_node);
+
+                /* Pass in chunk's coordinates in a union. */
+                store.chunk.offset = chunk_info->coords;
+                store.chunk.index = chunk_info->index;
+
+                /* Load the chunk into cache and lock it. */
+		chunk_addr = H5D_istore_get_addr(io_info, &udata);
+                if(H5D_istore_if_load(io_info, chunk_addr)) {
+		    if(NULL == (chunk = H5D_istore_lock(io_info, &udata, FALSE, &idx_hint)))
+			HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
+		} else
+		    chunk = NULL;
+
+                /* Perform the actual read operation */
+                if((io_info->ops.read)(io_info, chunk_info->chunk_points,
+                        src_type_size, chunk_info->fspace,
+                        chunk_info->mspace, chunk_addr, chunk, buf) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, " chunked read failed")
+  
+                /* Release the cache lock on the chunk. */
+                if(chunk) {
+                    accessed_bytes = chunk_info->chunk_points * src_type_size;
+		    if(H5D_istore_unlock(io_info, FALSE, idx_hint, chunk, accessed_bytes) < 0)
+			HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
+		} /* end if */
+
+                /* Advance to next chunk in list */
+                chunk_node = H5D_CHUNK_GET_NEXT_NODE(fm, chunk_node);
+            } /* end while */
+#ifdef H5_HAVE_PARALLEL
+	}
+#endif
 
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5D_ioinfo_init() */
+
+#ifdef H5S_DEBUG
+        H5_timer_end(&(io_info->stats->stats[1].read_timer), &timer);
+        io_info->stats->stats[1].read_nbytes += nelmts * src_type_size;
+        io_info->stats->stats[1].read_ncalls++;
+#endif
+
+	/* direct xfer accomplished successfully */
+        HGOTO_DONE(SUCCEED)
+    } /* end if */
+
+    /*
+     * This is the general case (type conversion, usually).
+     */
+    if(nelmts==0)
+        HGOTO_DONE(SUCCEED)
+
+    /* Compute buffer  sizes and other parameters */
+    target_size = dxpl_cache->max_temp_buf;
+    /* XXX: This could cause a problem if the user sets their buffer size
+     * to the same size as the default, and then the dataset elements are
+     * too large for the buffer... - QAK
+     */
+    if(target_size == H5D_TEMP_BUF_SIZE) {
+        /* If the buffer is too small to hold even one element, make it bigger */
+        if(target_size<max_type_size)
+            target_size = max_type_size;
+        /* If the buffer is too large to hold all the elements, make it smaller */
+        else if(target_size>(nelmts*max_type_size))
+            target_size=(size_t)(nelmts*max_type_size);
+    } /* end if */
+    request_nelmts = target_size / max_type_size;
+
+    /* Sanity check elements in temporary buffer */
+    if (request_nelmts==0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "temporary buffer max size is too small")
+
+    /*
+     * Get a temporary buffer for type conversion unless the app has already
+     * supplied one through the xfer properties. Instead of allocating a
+     * buffer which is the exact size, we allocate the target size.  The
+     * malloc() is usually less resource-intensive if we allocate/free the
+     * same size over and over.
+     */
+    if (H5T_path_bkg(tpath)) {
+        H5T_bkg_t path_bkg;     /* Type conversion's background info */
+
+        /* Retrieve the bkgr buffer property */
+        need_bkg=dxpl_cache->bkgr_buf_type;
+        path_bkg = H5T_path_bkg(tpath);
+        need_bkg = MAX(path_bkg, need_bkg);
+    } else {
+        need_bkg = H5T_BKG_NO; /*never needed even if app says yes*/
+    } /* end else */
+    if(NULL == (tconv_buf = (uint8_t *)dxpl_cache->tconv_buf)) {
+        /* Allocate temporary buffer */
+        if(NULL == (tconv_buf = H5FL_BLK_MALLOC(type_conv, target_size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
+    } /* end if */
+    if(need_bkg && NULL == (bkg_buf = (uint8_t *)dxpl_cache->bkgr_buf)) {
+        /* Allocate background buffer */
+        /* (Need calloc()-like call since memory needs to be initialized) */
+        if(NULL == (bkg_buf = H5FL_BLK_CALLOC(type_conv, (request_nelmts * dst_type_size))))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for background conversion")
+    } /* end if */
+
+    /* Loop over all the chunks, performing I/O on each */
+
+    /* Get first node in chunk skip list */
+    chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm);
+
+    /* Iterate through chunks to be operated on */
+    while(chunk_node) {
+        H5D_chunk_info_t *chunk_info;   /* chunk information */
+
+        /* Get the actual chunk information from the skip list nodes */
+        chunk_info = H5D_CHUNK_GET_NODE_INFO(fm, chunk_node);
+
+        /* initialize selection iterator */
+        if (H5S_select_iter_init(&file_iter, chunk_info->fspace, src_type_size) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize file selection information")
+        file_iter_init = TRUE;	/*file selection iteration info has been initialized */
+        if (H5S_select_iter_init(&mem_iter, chunk_info->mspace, dst_type_size) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize memory selection information")
+        mem_iter_init = TRUE;	/*file selection iteration info has been initialized */
+        if (H5S_select_iter_init(&bkg_iter, chunk_info->mspace, dst_type_size) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize background selection information")
+        bkg_iter_init = TRUE;	/*file selection iteration info has been initialized */
+
+        /* Pass in chunk's coordinates in a union*/
+        store.chunk.offset = chunk_info->coords;
+        store.chunk.index = chunk_info->index;
+
+        /* Load the chunk into cache and lock it. */
+        chunk_addr = H5D_istore_get_addr(io_info, &udata);
+
+        if(H5D_istore_if_load(io_info, chunk_addr)) {
+            if(NULL == (chunk = H5D_istore_lock(io_info, &udata, FALSE, &idx_hint)))
+                HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
+        } else
+            chunk = NULL;
+
+        for(smine_start=0; smine_start<chunk_info->chunk_points; smine_start+=smine_nelmts) {
+            /* Go figure out how many elements to read from the file */
+            assert(H5S_SELECT_ITER_NELMTS(&file_iter)==(chunk_info->chunk_points-smine_start));
+            smine_nelmts = (size_t)MIN(request_nelmts, (chunk_info->chunk_points-smine_start));
+
+            /*
+             * Gather the data from disk into the datatype conversion
+             * buffer. Also gather data from application to background buffer
+             * if necessary.
+             */
+#ifdef H5S_DEBUG
+            H5_timer_begin(&timer);
+#endif
+            /* Sanity check that space is allocated, then read data from it */
+            HDassert(((dataset->shared->layout.type == H5D_CONTIGUOUS && H5F_addr_defined(dataset->shared->layout.u.contig.addr))
+                    || (dataset->shared->layout.type == H5D_CHUNKED && H5F_addr_defined(dataset->shared->layout.u.chunk.addr)))
+                || dataset->shared->dcpl_cache.efl.nused > 0 || dataset->shared->layout.type == H5D_COMPACT);
+
+            if(chunk) {
+                n = H5D_select_mgath(chunk, chunk_info->fspace, &file_iter, 
+                                 smine_nelmts, dxpl_cache, tconv_buf/*out*/);
+            } else {
+                n = H5D_select_fgath(io_info, chunk_info->fspace, &file_iter, smine_nelmts, 
+                                 chunk_addr, NULL, tconv_buf/*out*/);
+            }
+
+#ifdef H5S_DEBUG
+            H5_timer_end(&(io_info->stats->stats[1].gath_timer), &timer);
+            io_info->stats->stats[1].gath_nbytes += n * src_type_size;
+            io_info->stats->stats[1].gath_ncalls++;
+#endif
+            if(n != smine_nelmts)
+                HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed")
+
+            /* If the source and destination are compound types and subset of each other
+             * and no conversion is needed, copy the data directly into user's buffer and 
+             * bypass the rest of steps.  This optimization is for Chicago company */
+            if(H5T_SUBSET_SRC==H5T_path_compound_subset(tpath)) {
+                if(H5D_compound_opt_read(smine_nelmts, chunk_info->mspace, &mem_iter, dxpl_cache,
+                    src_id, dst_id, H5T_SUBSET_SRC, tconv_buf, buf /*out*/)<0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
+
+                continue;
+            } else if(H5T_SUBSET_DST==H5T_path_compound_subset(tpath)) {
+                if(H5D_compound_opt_read(smine_nelmts, chunk_info->mspace, &mem_iter, dxpl_cache,
+                    src_id, dst_id, H5T_SUBSET_DST, tconv_buf, buf /*out*/)<0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
+
+                continue;
+            }
+
+            if(H5T_BKG_YES == need_bkg) {
+#ifdef H5S_DEBUG
+                H5_timer_begin(&timer);
+#endif
+                n = H5D_select_mgath(buf, chunk_info->mspace, &bkg_iter, smine_nelmts, dxpl_cache, bkg_buf/*out*/);
+#ifdef H5S_DEBUG
+                H5_timer_end(&(io_info->stats->stats[1].bkg_timer), &timer);
+                io_info->stats->stats[1].bkg_nbytes += n * dst_type_size;
+                io_info->stats->stats[1].bkg_ncalls++;
+#endif
+                if(n != smine_nelmts)
+                    HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "mem gather failed")
+            } /* end if */
+
+            /*
+             * Perform datatype conversion.
+             */
+            if(H5T_convert(tpath, src_id, dst_id, smine_nelmts, (size_t)0, (size_t)0, tconv_buf, bkg_buf, io_info->dxpl_id) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
+
+           /* Do the data transform after the conversion (since we're using type mem_type) */
+            if(!H5Z_xform_noop(dxpl_cache->data_xform_prop))
+	        if(H5Z_xform_eval(dxpl_cache->data_xform_prop, tconv_buf, smine_nelmts, mem_type) < 0)
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Error performing data transform")
+
+            /*
+             * Scatter the data into memory.
+             */
+#ifdef H5S_DEBUG
+            H5_timer_begin(&timer);
+#endif
+            status = H5D_select_mscat(tconv_buf, chunk_info->mspace, &mem_iter, smine_nelmts, dxpl_cache, buf/*out*/);
+#ifdef H5S_DEBUG
+            H5_timer_end(&(io_info->stats->stats[1].scat_timer), &timer);
+            io_info->stats->stats[1].scat_nbytes += smine_nelmts * dst_type_size;
+            io_info->stats->stats[1].scat_ncalls++;
+#endif
+            if(status < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "scatter failed")
+        } /* end for */
+
+        /* Release the cache lock on the chunk. */
+        if(chunk) {
+            accessed_bytes = chunk_info->chunk_points * src_type_size;
+            if(H5D_istore_unlock(io_info, FALSE, idx_hint, chunk, accessed_bytes) < 0)
+                HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
+        } /* end if */
+
+        /* Release selection iterators */
+        if(file_iter_init) {
+            if(H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+            file_iter_init = FALSE;
+        } /* end if */
+        if(mem_iter_init) {
+            if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+            mem_iter_init = FALSE;
+        } /* end if */
+        if(bkg_iter_init) {
+            if(H5S_SELECT_ITER_RELEASE(&bkg_iter) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+            bkg_iter_init = FALSE;
+        } /* end if */
+
+        /* Get the next chunk node in the skip list */
+        chunk_node = H5D_CHUNK_GET_NEXT_NODE(fm, chunk_node);
+    } /* end while */
+
+done:
+    /* Release selection iterators, if necessary */
+    if(file_iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+    } /* end if */
+    if(mem_iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+    } /* end if */
+    if(bkg_iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&bkg_iter) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+    } /* end if */
+
+    if(tconv_buf && NULL == dxpl_cache->tconv_buf)
+        (void)H5FL_BLK_FREE(type_conv, tconv_buf);
+    if(bkg_buf && NULL == dxpl_cache->bkgr_buf)
+        (void)H5FL_BLK_FREE(type_conv, bkg_buf);
+
+    /* Release chunk mapping information */
+    if(H5D_destroy_chunk_map(&fm) < 0)
+        HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't release chunk mapping")
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5D_chunk_read() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5D_typeinfo_init
+ * Function:	H5D_chunk_write
  *
- * Purpose:	Routine for determining correct datatype information for
- *              each I/O action.
+ * Purpose:	Writes to a chunked dataset.
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		Tuesday, March  4, 2008
+ * Programmer:	Raymond Lu
+ *		Thursday, April 10, 2003
  *
+ * Modification: 
+ *              Raymond Lu
+ *              20 July 2007
+ *              Moved H5D_istore_lock and H5D_istore_unlock to this level
+ *              from H5D_istore_writevv to avoid frequent lock and unlock
+ *              and to improve performance.
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
-    hid_t dxpl_id, hid_t mem_type_id, hbool_t do_write,
-    H5D_type_info_t *type_info)
+H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
+    const H5T_t *mem_type, const H5S_t *mem_space,
+    const H5S_t *file_space, H5T_path_t *tpath,
+    hid_t src_id, hid_t dst_id, const void *buf)
 {
-    const H5T_t	*src_type;              /* Source datatype */
-    const H5T_t	*dst_type;              /* Destination datatype */
-    herr_t	ret_value = SUCCEED;	/* Return value	*/
+    H5D_t *dataset=io_info->dset;       /* Local pointer to dataset info */
+    const H5D_dxpl_cache_t *dxpl_cache=io_info->dxpl_cache;     /* Local pointer to dataset transfer info */
+    H5D_chunk_map_t      fm;            /* File<->memory mapping */
+    H5SL_node_t *chunk_node;            /* Current node in chunk skip list */
+    herr_t      status;                 /*function return status*/
+#ifdef H5S_DEBUG
+    H5_timer_t	timer;
+#endif
+    size_t	src_type_size;		/*size of source type	*/
+    size_t	dst_type_size;	        /*size of destination type*/
+    size_t	max_type_size;	        /* Size of largest source/destination type */
+    size_t	target_size;		/*desired buffer size	*/
+    size_t	request_nelmts;		/*requested strip mine	*/
+    size_t      accessed_bytes;         /*total accessed size in a chunk */
+    hsize_t     smine_start;            /*strip mine start loc  */
+    size_t      n, smine_nelmts;        /*elements per strip    */
+    H5S_sel_iter_t mem_iter;            /*memory selection iteration info*/
+    hbool_t	mem_iter_init=0;	/*memory selection iteration info has been initialized */
+    H5S_sel_iter_t bkg_iter;            /*background iteration info*/
+    hbool_t	bkg_iter_init=0;	/*background iteration info has been initialized */
+    H5S_sel_iter_t file_iter;           /*file selection iteration info*/
+    hbool_t	file_iter_init=0;	/*file selection iteration info has been initialized */
+    H5T_bkg_t	need_bkg;		/*type of background buf*/
+    uint8_t	*tconv_buf = NULL;	/*datatype conv buffer	*/
+    uint8_t	*bkg_buf = NULL;	/*background buffer	*/
+    H5D_storage_t store;                /*union of EFL and chunk pointer in file space */
+    void     *chunk = NULL;
+    haddr_t	chunk_addr;             /* Chunk address on disk */
+    H5D_istore_ud1_t udata;		/*B-tree pass-through	*/
+    unsigned    idx_hint=0;             /* Cache index hint      */
+    hbool_t     relax=TRUE;             /* Whether whole chunk is selected */
+    herr_t	ret_value = SUCCEED;	/*return value		*/
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_typeinfo_init)
+    FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_write)
 
-    /* check args */
-    HDassert(type_info);
-    HDassert(dset);
+    assert (buf);
 
-    /* Initialize type info safely */
-    HDmemset(type_info, 0, sizeof(H5D_type_info_t));
+    /* Map elements between file and memory for each chunk*/
+    if(H5D_create_chunk_map(&fm, io_info, nelmts, file_space, mem_space, mem_type) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't build chunk mapping")
 
-    /* Get the memory & dataset datatypes */
-    if(NULL == (type_info->mem_type = (const H5T_t *)H5I_object_verify(mem_type_id, H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
-    type_info->dset_type = dset->shared->type;
+    /* Set dataset storage for I/O info */
+    io_info->store=&store;
+
+#ifdef H5_HAVE_PARALLEL
+    /* Additional sanity checks when operating in parallel */
+    if(io_info->using_mpi_vfd) {
+        if (chunk_addr==HADDR_UNDEF)
+            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to locate raw data chunk")
+        if (dataset->shared->dcpl_cache.pline.nused>0)
+            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "cannot write to chunked storage with filters in parallel")
+    } /* end if */
+#endif /* H5_HAVE_PARALLEL */
+
+    /* Compute element sizes and other parameters */
+    src_type_size = H5T_get_size(mem_type);
+    dst_type_size = H5T_get_size(dataset->shared->type);
+    max_type_size = MAX(src_type_size, dst_type_size);
+
+    /*
+     * If there is no type conversion then write directly from the
+     * application's buffer.  This saves at least one mem-to-mem copy.
+     */
+    if ( H5Z_xform_noop(dxpl_cache->data_xform_prop) && H5T_path_noop(tpath)) {
+#ifdef H5S_DEBUG
+	H5_timer_begin(&timer);
+#endif
+
+#ifdef H5_HAVE_PARALLEL
+        /* Check whether the collective mode can be turned off globally*/
+#ifndef H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS
+        if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) {
+            if(H5D_mpio_chunk_adjust_iomode(io_info,&fm))
+                HGOTO_ERROR(H5E_DATASET,H5E_CANTGET,FAIL,"can't adjust collective I/O")
+        }
+#endif /* H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS */
+	/* Temporarily shut down collective IO for chunking */
+        if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) {
+            if(H5D_chunk_collective_io(io_info,&fm,buf,TRUE) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "chunked write failed in collective mode");
+	}
+	else {/* sequential or independent write */
+#endif /* H5_HAVE_PARALLEL */
+            /* Get first node in chunk skip list */
+            chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm);
+
+            while(chunk_node) {
+                H5D_chunk_info_t *chunk_info;       /* Chunk information */
+
+                /* Get the actual chunk information from the skip list node */
+                chunk_info = H5D_CHUNK_GET_NODE_INFO(fm, chunk_node);
+
+                /* Pass in chunk's coordinates in a union. */
+                store.chunk.offset = chunk_info->coords;
+                store.chunk.index = chunk_info->index;
+
+                /* Load the chunk into cache.  But if the whole chunk is written,
+                 * simply allocate space instead of load the chunk. */
+                chunk_addr = H5D_istore_get_addr(io_info, &udata);
+
+                if(H5D_istore_if_load(io_info, chunk_addr)) {
+                    accessed_bytes = chunk_info->chunk_points * dst_type_size;
+                    if(accessed_bytes != dataset->shared->layout.u.chunk.size)
+                        relax = FALSE;
+
+		    if(NULL == (chunk = H5D_istore_lock(io_info, &udata, relax, &idx_hint)))
+			HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
+		} else
+		    chunk = NULL;
+
+                /* Perform the actual read operation */
+                if((io_info->ops.write)(io_info, chunk_info->chunk_points,
+                        dst_type_size, chunk_info->fspace,
+                        chunk_info->mspace, chunk_addr, chunk, buf) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, " chunked write failed")
+
+                /* Release the cache lock on the chunk. */
+                if(chunk) {
+		    if(H5D_istore_unlock(io_info, TRUE, idx_hint, chunk, accessed_bytes) < 0)
+			HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
+		} /* end if */
+                relax = TRUE;
+
+                /* Advance to next chunk in list */
+                chunk_node = H5D_CHUNK_GET_NEXT_NODE(fm, chunk_node);
+            } /* end while */
+#ifdef H5_HAVE_PARALLEL
+	}
+#endif
+
+#ifdef H5S_DEBUG
+	H5_timer_end(&(io_info->stats->stats[0].write_timer), &timer);
+	io_info->stats->stats[0].write_nbytes += nelmts * src_type_size;
+	io_info->stats->stats[0].write_ncalls++;
+#endif
+
+	/* direct xfer accomplished successfully */
+	HGOTO_DONE(SUCCEED)
+    } /* end if */
+
+    /*
+     * This is the general case (type conversion, usually).
+     */
+    if(nelmts==0)
+        HGOTO_DONE(SUCCEED)
+
+    /* Compute buffer sizes and other parameters */
+    target_size = dxpl_cache->max_temp_buf;
+    /* XXX: This could cause a problem if the user sets their buffer size
+     * to the same size as the default, and then the dataset elements are
+     * too large for the buffer... - QAK
+     */
+    if(target_size == H5D_TEMP_BUF_SIZE) {
+        /* If the buffer is too small to hold even one element, make it bigger */
+        if(target_size<max_type_size)
+            target_size = max_type_size;
+        /* If the buffer is too large to hold all the elements, make it smaller */
+        else if(target_size>(nelmts*max_type_size))
+            target_size=(size_t)(nelmts*max_type_size);
+    } /* end if */
+    request_nelmts = target_size / max_type_size;
+
+    /* Sanity check elements in temporary buffer */
+    if (request_nelmts==0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "temporary buffer max size is too small")
+
+    /*
+     * Get a temporary buffer for type conversion unless the app has already
+     * supplied one through the xfer properties.  Instead of allocating a
+     * buffer which is the exact size, we allocate the target size. The
+     * malloc() is usually less resource-intensive if we allocate/free the
+     * same size over and over.
+     */
+    if(H5T_detect_class(dataset->shared->type, H5T_VLEN)) {
+	/* Old data is retrieved into background buffer for VL datatype.  The
+	 * data is used later for freeing heap objects. */
+        need_bkg = H5T_BKG_YES;
+    } else if (H5T_path_bkg(tpath)) {
+        H5T_bkg_t path_bkg;     /* Type conversion's background info */
+
+        /* Retrieve the bkgr buffer property */
+        need_bkg=dxpl_cache->bkgr_buf_type;
+        path_bkg = H5T_path_bkg(tpath);
+        need_bkg = MAX (path_bkg, need_bkg);
+    } else {
+        need_bkg = H5T_BKG_NO; /*never needed even if app says yes*/
+    } /* end else */
+    if(NULL == (tconv_buf = (uint8_t *)dxpl_cache->tconv_buf)) {
+        /* Allocate temporary buffer */
+        if(NULL == (tconv_buf = H5FL_BLK_MALLOC(type_conv, target_size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
+    } /* end if */
+    if(need_bkg && NULL == (bkg_buf = (uint8_t *)dxpl_cache->bkgr_buf)) {
+        /* Allocate background buffer */
+        /* (Don't need calloc()-like call since file data is already initialized) */
+        if(NULL == (bkg_buf = H5FL_BLK_MALLOC(type_conv, (request_nelmts * dst_type_size))))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for background conversion")
+    } /* end if */
 
-    if(do_write) {
-        src_type = type_info->mem_type;
-        dst_type = dset->shared->type;
-        type_info->src_type_id = mem_type_id;
-        type_info->dst_type_id = dset->shared->type_id;
+    /* Loop over all the chunks, performing I/O on each */
+
+    /* Get first node in chunk skip list */
+    chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm);
+
+    /* Iterate through chunks to be operated on */
+    while(chunk_node) {
+        H5D_chunk_info_t *chunk_info;   /* chunk information */
+
+        /* Get the actual chunk information from the skip list node */
+        chunk_info = H5D_CHUNK_GET_NODE_INFO(fm, chunk_node);
+
+        /* initialize selection iterator */
+        if (H5S_select_iter_init(&file_iter, chunk_info->fspace, dst_type_size) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize file selection information")
+        file_iter_init=1;	/*file selection iteration info has been initialized */
+        if (H5S_select_iter_init(&mem_iter, chunk_info->mspace, src_type_size) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize memory selection information")
+        mem_iter_init=1;	/*file selection iteration info has been initialized */
+        if (H5S_select_iter_init(&bkg_iter, chunk_info->fspace, dst_type_size) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize background selection information")
+        bkg_iter_init=1;	/*file selection iteration info has been initialized */
+
+        /*pass in chunk's coordinates in a union*/
+        store.chunk.offset = chunk_info->coords;
+        store.chunk.index = chunk_info->index;
+
+        /* Load the chunk into cache.  But if the whole chunk is written,
+         * simply allocate space instead of load the chunk. */
+        chunk_addr = H5D_istore_get_addr(io_info, &udata);
+
+        if(H5D_istore_if_load(io_info, chunk_addr)) {
+            accessed_bytes = chunk_info->chunk_points * dst_type_size;
+            if(accessed_bytes != dataset->shared->layout.u.chunk.size)
+                relax=FALSE;
+            if(relax) {
+                accessed_bytes = H5S_GET_SELECT_NPOINTS(chunk_info->mspace) * src_type_size;
+                if(accessed_bytes != dataset->shared->layout.u.chunk.size)
+                    relax = FALSE;
+            }
+
+	    if(NULL == (chunk = H5D_istore_lock(io_info, &udata, relax, &idx_hint)))
+		HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
+	} else
+	    chunk = NULL;
+
+        for(smine_start=0; smine_start<chunk_info->chunk_points; smine_start+=smine_nelmts) {
+            /* Go figure out how many elements to read from the file */
+            assert(H5S_SELECT_ITER_NELMTS(&file_iter)==(chunk_info->chunk_points-smine_start));
+            smine_nelmts = (size_t)MIN(request_nelmts, (chunk_info->chunk_points-smine_start));
+
+            /*
+             * Gather the data from disk into the datatype conversion
+             * buffer. Also gather data from application to background buffer
+             * if necessary.
+             */
+#ifdef H5S_DEBUG
+            H5_timer_begin(&timer);
+#endif
+            n = H5D_select_mgath(buf, chunk_info->mspace, &mem_iter,
+                                 smine_nelmts, dxpl_cache, tconv_buf/*out*/);
+
+#ifdef H5S_DEBUG
+            H5_timer_end(&(io_info->stats->stats[1].gath_timer), &timer);
+            io_info->stats->stats[1].gath_nbytes += n * src_type_size;
+            io_info->stats->stats[1].gath_ncalls++;
+#endif
+            if (n!=smine_nelmts)
+                HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed")
+
+            /* If the source and destination are compound types and the destination is
+             * is a subset of the source and no conversion is needed, copy the data 
+             * directly into user's buffer and bypass the rest of steps.  If the source
+             * is a subset of the destination, the optimization is done in conversion
+             * function H5T_conv_struct_opt to protect the background data.  This
+             * optimization is for Chicago company */
+            if(H5T_SUBSET_DST==H5T_path_compound_subset(tpath)) {
+                if(H5D_compound_opt_write(smine_nelmts, src_id, dst_id, tconv_buf)<0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
+            } else {
+                if (H5T_BKG_YES==need_bkg) {
+#ifdef H5S_DEBUG
+                    H5_timer_begin(&timer);
+#endif
+                    if(chunk) {
+                        n = H5D_select_mgath(chunk, chunk_info->fspace, &bkg_iter, 
+                                 smine_nelmts, dxpl_cache, bkg_buf/*out*/);
+                    } else {
+                        n = H5D_select_fgath(io_info, chunk_info->fspace, &bkg_iter, smine_nelmts, 
+                                 chunk_addr, NULL, bkg_buf/*out*/);
+                    }
+
+#ifdef H5S_DEBUG
+                    H5_timer_end(&(io_info->stats->stats[0].bkg_timer), &timer);
+                    io_info->stats->stats[0].bkg_nbytes += n * dst_type_size;
+                    io_info->stats->stats[0].bkg_ncalls++;
+#endif
+                    if (n!=smine_nelmts)
+                        HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file gather failed")
+                } /* end if */
+
+	        /*
+                 * Perform datatype conversion.
+                 */
+                if(H5T_convert(tpath, src_id, dst_id, smine_nelmts, (size_t)0, (size_t)0, tconv_buf, bkg_buf, io_info->dxpl_id) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
+
+ 	        /* Do the data transform after the type conversion (since we're using dataset->shared->type) */
+                if(!H5Z_xform_noop(dxpl_cache->data_xform_prop))
+	            if( H5Z_xform_eval(dxpl_cache->data_xform_prop, tconv_buf, smine_nelmts, dataset->shared->type) < 0)
+		        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Error performing data transform")
+            }
+
+            /*
+             * Scatter the data out to the file.
+             */
+#ifdef H5S_DEBUG
+            H5_timer_begin(&timer);
+#endif
+            status = H5D_select_fscat(io_info,
+                chunk_info->fspace, &file_iter, smine_nelmts,
+                chunk_addr, chunk, tconv_buf);
+
+#ifdef H5S_DEBUG
+            H5_timer_end(&(io_info->stats->stats[0].scat_timer), &timer);
+            io_info->stats->stats[0].scat_nbytes += n * dst_type_size;
+            io_info->stats->stats[0].scat_ncalls++;
+#endif
+            if (status<0)
+                HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "scatter failed")
+        } /* end for */
+
+        /* Release the cache lock on the chunk. */
+        if(chunk) {
+            accessed_bytes = chunk_info->chunk_points * dst_type_size;
+	    if(H5D_istore_unlock(io_info, TRUE, idx_hint, chunk, accessed_bytes) < 0)
+		HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
+	} /* end if */
+        relax = TRUE;
+
+        /* Release selection iterators */
+        if(file_iter_init) {
+            if(H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+            file_iter_init=0;
+        } /* end if */
+        if(mem_iter_init) {
+            if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+            mem_iter_init=0;
+        } /* end if */
+        if(bkg_iter_init) {
+            if(H5S_SELECT_ITER_RELEASE(&bkg_iter) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+            bkg_iter_init=0;
+        } /* end if */
+
+        /* Get the next chunk node in the skip list */
+        chunk_node = H5D_CHUNK_GET_NEXT_NODE(fm, chunk_node);
+    } /* end while */
+
+done:
+    /* Release selection iterators, if necessary */
+    if(file_iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+    } /* end if */
+    if(mem_iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+    } /* end if */
+    if(bkg_iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&bkg_iter) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
+    } /* end if */
+
+    if (tconv_buf && NULL==dxpl_cache->tconv_buf)
+        (void)H5FL_BLK_FREE(type_conv,tconv_buf);
+    if (bkg_buf && NULL==dxpl_cache->bkgr_buf)
+        (void)H5FL_BLK_FREE(type_conv,bkg_buf);
+
+    /* Release chunk mapping information */
+    if(H5D_destroy_chunk_map(&fm) < 0)
+        HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't release chunk mapping")
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5D_chunk_write() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_compound_opt_read
+ *
+ * Purpose:	A shortcut optimization for the Chicago company for 
+ *              a special optimization case when the source and 
+ *              destination members are a subset of each other, and 
+ *              the order is the same, and no conversion is needed.  
+ *              For example:
+ *                  struct source {            struct destination {
+ *                      TYPE1 A;      -->          TYPE1 A;
+ *                      TYPE2 B;      -->          TYPE2 B;
+ *                      TYPE3 C;      -->          TYPE3 C;
+ *                  };                             TYPE4 D;
+ *                                                 TYPE5 E;
+ *                                             };
+ *              or
+ *                  struct destination {       struct source {
+ *                      TYPE1 A;      <--          TYPE1 A;
+ *                      TYPE2 B;      <--          TYPE2 B;
+ *                      TYPE3 C;      <--          TYPE3 C;
+ *                  };                             TYPE4 D;
+ *                                                 TYPE5 E;
+ *                                             };
+ *              The optimization is simply moving data to the appropriate 
+ *              places in the buffer.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Raymond Lu
+ *		11 June 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_compound_opt_read(size_t nelmts, const H5S_t *space,
+    H5S_sel_iter_t *iter, const H5D_dxpl_cache_t *dxpl_cache,
+    hid_t src_id, hid_t dst_id, H5T_subset_t subset, 
+    void *data_buf, void *user_buf/*out*/)
+{
+    uint8_t    *dbuf = (uint8_t *)data_buf;    /*cast for pointer arithmetic	*/
+    uint8_t    *ubuf = (uint8_t *)user_buf;    /*cast for pointer arithmetic	*/
+    uint8_t    *xdbuf;
+    uint8_t    *xubuf;
+
+    hsize_t    _off[H5D_IO_VECTOR_SIZE];       /* Array to store sequence offsets */
+    hsize_t    *off=NULL;                      /* Pointer to sequence offsets */
+    size_t     _len[H5D_IO_VECTOR_SIZE];       /* Array to store sequence lengths */
+    size_t     *len=NULL;                      /* Pointer to sequence lengths */
+    size_t     nseq;                           /* Number of sequences generated */
+    size_t     curr_off;                       /* offset of bytes left to process in sequence */
+    size_t     curr_seq;                       /* Current sequence being processed */
+    size_t     curr_len;                       /* Length of bytes left to process in sequence */
+    size_t     curr_nelmts;		       /* number of elements to process in sequence   */
+    size_t     i;
+
+    H5T_t      *src, *dst;
+    size_t     src_stride, dst_stride, type_size = 0;
+    size_t     elmtno;			/*element counter		*/
+
+    herr_t     ret_value = SUCCEED;	       /*return value		*/
+
+    FUNC_ENTER_NOAPI_NOINIT(H5D_compound_opt_read)
+
+    /* Check args */
+    assert (data_buf);
+    assert (user_buf);
+    assert (space);
+    assert (iter);
+    assert (nelmts>0);
+
+    /* Allocate the vector I/O arrays */
+    if(dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
+        if((len = H5FL_SEQ_MALLOC(size_t,dxpl_cache->vec_size))==NULL)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array");
+        if((off = H5FL_SEQ_MALLOC(hsize_t,dxpl_cache->vec_size))==NULL)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array");
     } /* end if */
     else {
-        src_type = dset->shared->type;
-        dst_type = type_info->mem_type;
-        type_info->src_type_id = dset->shared->type_id;
-        type_info->dst_type_id = mem_type_id;
+        len=_len;
+        off=_off;
     } /* end else */
 
-    /*
-     * Locate the type conversion function and data space conversion
-     * functions, and set up the element numbering information. If a data
-     * type conversion is necessary then register datatype atoms. Data type
-     * conversion is necessary if the user has set the `need_bkg' to a high
-     * enough value in xfer_parms since turning off datatype conversion also
-     * turns off background preservation.
+    if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
+
+    src_stride = H5T_get_size(src);
+    dst_stride = H5T_get_size(dst);
+
+    if(H5T_SUBSET_SRC == subset)
+        type_size = src_stride;
+    else if(H5T_SUBSET_DST == subset)
+        type_size = dst_stride;
+
+    xdbuf = dbuf;
+
+    /* Loop until all elements are written */
+    while(nelmts>0) {
+        /* Get list of sequences for selection to write */
+        if(H5S_SELECT_GET_SEQ_LIST(space,0,iter,dxpl_cache->vec_size,nelmts,&nseq,&elmtno,off,len)<0)
+            HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed");
+
+        /* Loop, while sequences left to process */
+        for(curr_seq=0; curr_seq<nseq; curr_seq++) {
+            /* Get the number of bytes and offset in sequence */
+            curr_len=len[curr_seq];
+            curr_off=off[curr_seq];
+
+            /* Decide the number of elements and position in the buffer. */
+            curr_nelmts = curr_len/dst_stride;
+            xubuf = ubuf + curr_off;
+
+            /* Copy the data into the right place. */
+            for(i=0; i<curr_nelmts; i++) {
+                HDmemmove(xubuf, xdbuf, type_size); 
+
+                /* Update pointers */
+                xdbuf += src_stride;
+                xubuf += dst_stride;
+            }
+
+        } /* end for */
+
+        /* Decrement number of elements left to process */
+        nelmts -= elmtno;
+    } /* end while */
+
+done:
+    if(dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
+        if(len!=NULL)
+            H5FL_SEQ_FREE(size_t,len);
+        if(off!=NULL)
+            H5FL_SEQ_FREE(hsize_t,off);
+    } /* end if */
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_compound_opt_read() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_compound_opt_write
+ *
+ * Purpose:	A shortcut optimization for the Chicago company for 
+ *              a special optimization case when the source and 
+ *              destination members are a subset of each other, and 
+ *              the order is the same, and no conversion is needed.  
+ *              For example:
+ *                  struct source {            struct destination {
+ *                      TYPE1 A;      -->          TYPE1 A;
+ *                      TYPE2 B;      -->          TYPE2 B;
+ *                      TYPE3 C;      -->          TYPE3 C;
+ *                  };                             TYPE4 D;
+ *                                                 TYPE5 E;
+ *                                             };
+ *              or
+ *                  struct destination {       struct source {
+ *                      TYPE1 A;      <--          TYPE1 A;
+ *                      TYPE2 B;      <--          TYPE2 B;
+ *                      TYPE3 C;      <--          TYPE3 C;
+ *                  };                             TYPE4 D;
+ *                                                 TYPE5 E;
+ *                                             };
+ *              The optimization is simply moving data to the appropriate 
+ *              places in the buffer.
+ *
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Raymond Lu
+ *		11 June 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_compound_opt_write(size_t nelmts, hid_t src_id, hid_t dst_id, void *data_buf)
+{
+    uint8_t    *dbuf = (uint8_t *)data_buf;    /*cast for pointer arithmetic	*/
+    uint8_t    *xsbuf, *xdbuf;
+    size_t     i;
+    H5T_t      *src, *dst;
+    size_t     src_stride, dst_stride;
+    herr_t     ret_value = SUCCEED;	       /*return value		*/
+
+    FUNC_ENTER_NOAPI_NOINIT(H5D_compound_opt_write)
+
+    /* Check args */
+    assert (data_buf);
+    assert (nelmts>0);
+
+    if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
+
+    src_stride = H5T_get_size(src);
+    dst_stride = H5T_get_size(dst);
+
+    xsbuf = dbuf;
+    xdbuf = dbuf;
+
+    /* Loop until all elements are written */
+    for(i=0; i<nelmts; i++) {
+        HDmemmove(xdbuf, xsbuf, dst_stride); 
+
+        /* Update pointers */
+        xsbuf += src_stride;
+        xdbuf += dst_stride;
+    }
+
+done:
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_compound_opt_write() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_create_chunk_map
+ *
+ * Purpose:	Creates the mapping between elements selected in each chunk
+ *              and the elements in the memory selection.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Raymond Lu
+ *		Thursday, April 10, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_create_chunk_map(H5D_chunk_map_t *fm, const H5D_io_info_t *io_info,
+    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
+    const H5T_t *mem_type)
+{
+    H5D_t *dataset=io_info->dset;       /* Local pointer to dataset info */
+    H5S_t *tmp_mspace = NULL;     /* Temporary memory dataspace */
+    hssize_t old_offset[H5O_LAYOUT_NDIMS];  /* Old selection offset */
+    htri_t file_space_normalized = FALSE;   /* File dataspace was normalized */
+    hid_t f_tid = (-1);           /* Temporary copy of file datatype for iteration */
+    hbool_t iter_init = FALSE;  /* Selection iteration info has been initialized */
+    unsigned f_ndims;           /* The number of dimensions of the file's dataspace */
+    int sm_ndims;               /* The number of dimensions of the memory buffer's dataspace (signed) */
+    H5SL_node_t *curr_node;     /* Current node in skip list */
+    H5S_sel_type fsel_type;     /* Selection type on disk */
+    char bogus;                 /* "bogus" buffer to pass to selection iterator */
+    unsigned u;                 /* Local index variable */
+    hbool_t sel_hyper_flag;
+    herr_t ret_value = SUCCEED;	/* Return value		*/
+
+    FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_map)
+
+    /* Get layout for dataset */
+    fm->layout = &(dataset->shared->layout);
+    fm->nelmts = nelmts;
+
+    /* Check if the memory space is scalar & make equivalent memory space */
+    if((sm_ndims = H5S_GET_EXTENT_NDIMS(mem_space)) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get dimension number")
+    /* Set the number of dimensions for the memory dataspace */
+    H5_ASSIGN_OVERFLOW(fm->m_ndims, sm_ndims, int, unsigned);
+
+    /* Get dim number and dimensionality for each dataspace */
+    fm->f_ndims = f_ndims = dataset->shared->layout.u.chunk.ndims - 1;
+    if(H5S_get_simple_extent_dims(file_space, fm->f_dims, NULL) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get dimensionality")
+
+    /* Normalize hyperslab selections by adjusting them by the offset */
+    /* (It might be worthwhile to normalize both the file and memory dataspaces
+     * before any (contiguous, chunked, etc) file I/O operation, in order to
+     * speed up hyperslab calculations by removing the extra checks and/or
+     * additions involving the offset and the hyperslab selection -QAK)
      */
-    if(NULL == (type_info->tpath = H5T_path_find(src_type, dst_type, NULL, NULL, dxpl_id, FALSE)))
-	HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatype")
+    if((file_space_normalized = H5S_hyper_normalize_offset((H5S_t *)file_space, old_offset)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to normalize dataspace by offset")
+
+    /* Decide the number of chunks in each dimension*/
+    for(u=0; u<f_ndims; u++) {
+        /* Keep the size of the chunk dimensions as hsize_t for various routines */
+        fm->chunk_dim[u]=fm->layout->u.chunk.dim[u];
 
-    /* Precompute some useful information */
-    type_info->src_type_size = H5T_get_size(src_type);
-    type_info->dst_type_size = H5T_get_size(dst_type);
-    type_info->max_type_size = MAX(type_info->src_type_size, type_info->dst_type_size);
-    type_info->is_conv_noop = H5T_path_noop(type_info->tpath);
-    type_info->is_xform_noop = H5Z_xform_noop(dxpl_cache->data_xform_prop);
-    if(type_info->is_xform_noop && type_info->is_conv_noop) {
-        type_info->cmpd_subset = H5T_SUBSET_FALSE;
-        type_info->need_bkg = H5T_BKG_NO;
+        /* Round up to the next integer # of chunks, to accomodate partial chunks */
+        fm->chunks[u] = ((fm->f_dims[u]+dataset->shared->layout.u.chunk.dim[u])-1) / dataset->shared->layout.u.chunk.dim[u];
+    } /* end for */
+
+    /* Compute the "down" size of 'chunks' information */
+    if(H5V_array_down(f_ndims,fm->chunks,fm->down_chunks) < 0)
+        HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "can't compute 'down' sizes")
+
+#ifdef H5_HAVE_PARALLEL
+    /* Calculate total chunk in file map*/
+    fm->select_chunk = NULL;
+    fm->total_chunks = 1;
+    for(u = 0; u < fm->f_ndims; u++)
+       fm->total_chunks = fm->total_chunks * fm->chunks[u];
+    if(io_info->using_mpi_vfd) {
+        H5_CHECK_OVERFLOW(fm->total_chunks, hsize_t, size_t);
+        if(NULL == (fm->select_chunk = (hbool_t *)H5MM_calloc((size_t)fm->total_chunks * sizeof(hbool_t))))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
+    } /* end if */
+#endif /* H5_HAVE_PARALLEL */
+
+
+    /* Initialize "last chunk" information */
+    fm->last_index = (hsize_t)-1;
+    fm->last_chunk_info = NULL;
+
+    /* Point at the dataspaces */
+    fm->file_space = file_space;
+    fm->mem_space = mem_space;
+
+    /* Special case for only one element in selection */
+    /* (usually appending a record) */
+    if(nelmts == 1
+#ifdef H5_HAVE_PARALLEL
+            && !(io_info->using_mpi_vfd)
+#endif /* H5_HAVE_PARALLEL */
+        ) {
+        /* Initialize skip list for chunk selections */
+        fm->sel_chunks = NULL;
+        fm->use_single = TRUE;
+
+        /* Initialize single chunk dataspace */
+        if(NULL == dataset->shared->cache.chunk.single_space) {
+            /* Make a copy of the dataspace for the dataset */
+            if((dataset->shared->cache.chunk.single_space = H5S_copy(file_space, TRUE, FALSE)) == NULL)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy file space")
+
+            /* Resize chunk's dataspace dimensions to size of chunk */
+            if(H5S_set_extent_real(dataset->shared->cache.chunk.single_space, fm->chunk_dim) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "can't adjust chunk dimensions")
+
+            /* Set the single chunk dataspace to 'all' selection */
+            if(H5S_select_all(dataset->shared->cache.chunk.single_space, TRUE) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTSELECT, FAIL, "unable to set all selection")
+        } /* end if */
+        fm->single_space = dataset->shared->cache.chunk.single_space;
+        HDassert(fm->single_space);
+
+        /* Allocate the single chunk information */
+        if(NULL == dataset->shared->cache.chunk.single_chunk_info) {
+            if(NULL == (dataset->shared->cache.chunk.single_chunk_info = H5FL_MALLOC(H5D_chunk_info_t)))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
+        } /* end if */
+        fm->single_chunk_info = dataset->shared->cache.chunk.single_chunk_info;
+        HDassert(fm->single_chunk_info);
+
+        /* Reset chunk template information */
+        fm->mchunk_tmpl = NULL;
+
+        /* Set up chunk mapping for single element */
+        if(H5D_create_chunk_map_single(fm, io_info) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create chunk selections for single element")
     } /* end if */
     else {
-        size_t	target_size;		/* Desired buffer size	*/
+        /* Initialize skip list for chunk selections */
+        if(NULL == dataset->shared->cache.chunk.sel_chunks) {
+            if(NULL == (dataset->shared->cache.chunk.sel_chunks = H5SL_create(H5SL_TYPE_HSIZE, 0.5, (size_t)H5D_DEFAULT_SKIPLIST_HEIGHT)))
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTCREATE, FAIL, "can't create skip list for chunk selections")
+        } /* end if */
+        fm->sel_chunks = dataset->shared->cache.chunk.sel_chunks;
+        HDassert(fm->sel_chunks);
+
+        /* We are not using single element mode */
+        fm->use_single = FALSE;
 
-        /* Check if the datatypes are compound subsets of one another */
-        type_info->cmpd_subset = H5T_path_compound_subset(type_info->tpath);
+        /* Get type of selection on disk & in memory */
+        if((fsel_type = H5S_GET_SELECT_TYPE(file_space)) < H5S_SEL_NONE)
+            HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to get type of selection")
+        if((fm->msel_type = H5S_GET_SELECT_TYPE(mem_space)) < H5S_SEL_NONE)
+            HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to get type of selection")
 
-        /* Check if we need a background buffer */
-        if(do_write && H5T_detect_class(dset->shared->type, H5T_VLEN))
-            type_info->need_bkg = H5T_BKG_YES;
+        /* If the selection is NONE or POINTS, set the flag to FALSE */
+        if(fsel_type == H5S_SEL_POINTS || fsel_type == H5S_SEL_NONE)
+            sel_hyper_flag = FALSE;
+        else
+            sel_hyper_flag = TRUE;
+
+        /* Check if file selection is a not a hyperslab selection */
+        if(sel_hyper_flag) {
+            /* Build the file selection for each chunk */
+            if(H5D_create_chunk_file_map_hyper(fm, io_info) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create file chunk selections")
+
+            /* Clean file chunks' hyperslab span "scratch" information */
+            curr_node=H5SL_first(fm->sel_chunks);
+            while(curr_node) {
+                H5D_chunk_info_t *chunk_info;   /* Pointer chunk information */
+
+                /* Get pointer to chunk's information */
+                chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
+                assert(chunk_info);
+
+                /* Clean hyperslab span's "scratch" information */
+                if(H5S_hyper_reset_scratch(chunk_info->fspace) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to reset span scratch info")
+
+                /* Get the next chunk node in the skip list */
+                curr_node=H5SL_next(curr_node);
+            } /* end while */
+        } /* end if */
         else {
-            H5T_bkg_t path_bkg;     /* Type conversion's background info */
+            /* Create temporary datatypes for selection iteration */
+            if((f_tid = H5I_register(H5I_DATATYPE, H5T_copy(dataset->shared->type, H5T_COPY_ALL))) < 0)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register file datatype")
+
+            /* Spaces might not be the same shape, iterate over the file selection directly */
+            if(H5S_select_iterate(&bogus, f_tid, file_space,  H5D_chunk_file_cb, fm) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create file chunk selections")
+
+            /* Reset "last chunk" info */
+            fm->last_index=(hsize_t)-1;
+            fm->last_chunk_info=NULL;
+        } /* end else */
+
+        /* Build the memory selection for each chunk */
+        if(sel_hyper_flag && H5S_select_shape_same(file_space, mem_space) == TRUE) {
+            /* Reset chunk template information */
+            fm->mchunk_tmpl = NULL;
+
+            /* If the selections are the same shape, use the file chunk information
+             * to generate the memory chunk information quickly.
+             */
+            if(H5D_create_chunk_mem_map_hyper(fm) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create memory chunk selections")
+        } /* end if */
+        else {
+            size_t elmt_size;           /* Memory datatype size */
+
+            /* Make a copy of equivalent memory space */
+            if((tmp_mspace = H5S_copy(mem_space, TRUE, FALSE)) == NULL)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy memory space")
+
+            /* De-select the mem space copy */
+            if(H5S_select_none(tmp_mspace) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to de-select memory space")
+
+            /* Save chunk template information */
+            fm->mchunk_tmpl=tmp_mspace;
 
-            if((path_bkg = H5T_path_bkg(type_info->tpath))) {
-                /* Retrieve the bkgr buffer property */
-                type_info->need_bkg = dxpl_cache->bkgr_buf_type;
-                type_info->need_bkg = MAX(path_bkg, type_info->need_bkg);
+            /* Create temporary datatypes for selection iteration */
+            if(f_tid<0) {
+                if((f_tid = H5I_register(H5I_DATATYPE, H5T_copy(dataset->shared->type, H5T_COPY_ALL))) < 0)
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register file datatype")
+            } /* end if */
+
+            /* Create selection iterator for memory selection */
+            if((elmt_size=H5T_get_size(mem_type))==0)
+                HGOTO_ERROR(H5E_DATATYPE, H5E_BADSIZE, FAIL, "datatype size invalid")
+            if(H5S_select_iter_init(&(fm->mem_iter), mem_space, elmt_size) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator")
+            iter_init = TRUE;	/* Selection iteration info has been initialized */
+
+            /* Spaces aren't the same shape, iterate over the memory selection directly */
+            if(H5S_select_iterate(&bogus, f_tid, file_space,  H5D_chunk_mem_cb, fm) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create memory chunk selections")
+
+            /* Clean up hyperslab stuff, if necessary */
+            if(fm->msel_type != H5S_SEL_POINTS) {
+                /* Clean memory chunks' hyperslab span "scratch" information */
+                curr_node=H5SL_first(fm->sel_chunks);
+                while(curr_node) {
+                    H5D_chunk_info_t *chunk_info;   /* Pointer chunk information */
+
+                    /* Get pointer to chunk's information */
+                    chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
+                    assert(chunk_info);
+
+                    /* Clean hyperslab span's "scratch" information */
+                    if(H5S_hyper_reset_scratch(chunk_info->mspace) < 0)
+                        HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to reset span scratch info")
+
+                    /* Get the next chunk node in the skip list */
+                    curr_node=H5SL_next(curr_node);
+                } /* end while */
             } /* end if */
-            else
-                type_info->need_bkg = H5T_BKG_NO; /*never needed even if app says yes*/
         } /* end else */
+    } /* end else */
+
+done:
+    /* Release the [potentially partially built] chunk mapping information if an error occurs */
+    if(ret_value<0) {
+        if(tmp_mspace && !fm->mchunk_tmpl) {
+            if(H5S_close(tmp_mspace) < 0)
+                HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "can't release memory chunk dataspace template")
+        } /* end if */
+
+        if (H5D_destroy_chunk_map(fm) < 0)
+            HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release chunk mapping")
+    } /* end if */
+
+    /* Reset the global dataspace info */
+    fm->file_space = NULL;
+    fm->mem_space = NULL;
+
+    if(iter_init) {
+        if(H5S_SELECT_ITER_RELEASE(&(fm->mem_iter)) < 0)
+            HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator")
+    } /* end if */
+    if(f_tid!=(-1)) {
+        if(H5I_dec_ref(f_tid) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
+    } /* end if */
+    if(file_space_normalized) {
+        if(H5S_hyper_denormalize_offset((H5S_t *)file_space, old_offset) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to normalize dataspace by offset")
+    } /* end if */
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_create_chunk_map() */
+
+
+/*--------------------------------------------------------------------------
+ NAME
+    H5D_free_chunk_info
+ PURPOSE
+    Internal routine to destroy a chunk info node
+ USAGE
+    void H5D_free_chunk_info(chunk_info)
+        void *chunk_info;    IN: Pointer to chunk info to destroy
+ RETURNS
+    No return value
+ DESCRIPTION
+    Releases all the memory for a chunk info node.  Called by H5SL_free
+ GLOBAL VARIABLES
+ COMMENTS, BUGS, ASSUMPTIONS
+ EXAMPLES
+ REVISION LOG
+--------------------------------------------------------------------------*/
+static herr_t
+H5D_free_chunk_info(void *item, void UNUSED *key, void UNUSED *opdata)
+{
+    H5D_chunk_info_t *chunk_info = (H5D_chunk_info_t *)item;
+
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_free_chunk_info)
+
+    HDassert(chunk_info);
+
+    /* Close the chunk's file dataspace, if it's not shared */
+    if(!chunk_info->fspace_shared)
+        (void)H5S_close(chunk_info->fspace);
+    else
+        H5S_select_all(chunk_info->fspace, TRUE);
+
+    /* Close the chunk's memory dataspace, if it's not shared */
+    if(!chunk_info->mspace_shared)
+        (void)H5S_close(chunk_info->mspace);
+
+    /* Free the actual chunk info */
+    H5FL_FREE(H5D_chunk_info_t, chunk_info);
+
+    FUNC_LEAVE_NOAPI(0);
+}   /* H5D_free_chunk_info() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_destroy_chunk_map
+ *
+ * Purpose:	Destroy chunk mapping information.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		Saturday, May 17, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_destroy_chunk_map(const H5D_chunk_map_t *fm)
+{
+    herr_t	ret_value = SUCCEED;	/*return value		*/
+
+    FUNC_ENTER_NOAPI_NOINIT(H5D_destroy_chunk_map)
+
+    /* Single element I/O vs. multiple element I/O cleanup */
+    if(fm->use_single) {
+        /* Sanity checks */
+        HDassert(fm->sel_chunks == NULL);
+        HDassert(fm->single_chunk_info);
+        HDassert(fm->single_chunk_info->fspace_shared);
+        HDassert(fm->single_chunk_info->mspace_shared);
+
+        /* Reset the selection for the single element I/O */
+        H5S_select_all(fm->single_space, TRUE);
+    } /* end if */
+    else {
+        /* Release the nodes on the list of selected chunks */
+        if(fm->sel_chunks)
+            if(H5SL_free(fm->sel_chunks, H5D_free_chunk_info, NULL) < 0)
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTNEXT, FAIL, "can't iterate over chunks")
+    } /* end else */
+
+    /* Free the memory chunk dataspace template */
+    if(fm->mchunk_tmpl)
+        if(H5S_close(fm->mchunk_tmpl) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "can't release memory chunk dataspace template")
+#ifdef H5_HAVE_PARALLEL
+    if(fm->select_chunk)
+        H5MM_xfree(fm->select_chunk);
+#endif /* H5_HAVE_PARALLEL */
 
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_destroy_chunk_map() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_create_chunk_map_single
+ *
+ * Purpose:	Create chunk selections when appending a single record
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		Tuesday, November 20, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_create_chunk_map_single(H5D_chunk_map_t *fm, const H5D_io_info_t
+#ifndef H5_HAVE_PARALLEL
+    UNUSED
+#endif /* H5_HAVE_PARALLEL */
+    *io_info)
+{
+    H5D_chunk_info_t *chunk_info;           /* Chunk information to insert into skip list */
+    hsize_t     sel_start[H5O_LAYOUT_NDIMS]; /* Offset of low bound of file selection */
+    hsize_t     sel_end[H5O_LAYOUT_NDIMS];  /* Offset of high bound of file selection */
+    unsigned    u;                          /* Local index variable */
+    herr_t	ret_value = SUCCEED;        /* Return value */
 
-        /* Set up datatype conversion/background buffers */
+    FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_map_single)
 
-        /* Get buffer size from DXPL */
-        target_size = dxpl_cache->max_temp_buf;
+    /* Sanity check */
+    HDassert(fm->f_ndims > 0);
 
-        /* If the buffer is too small to hold even one element, try to make it bigger */
-        if(target_size < type_info->max_type_size) {
-            hbool_t default_buffer_info;    /* Whether the buffer information are the defaults */
+    /* Get coordinate for selection */
+    if(H5S_SELECT_BOUNDS(fm->file_space, sel_start, sel_end) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
 
-            /* Detect if we have all default settings for buffers */
-            default_buffer_info = (H5D_TEMP_BUF_SIZE == dxpl_cache->max_temp_buf)
-                    && (NULL == dxpl_cache->tconv_buf) && (NULL == dxpl_cache->bkgr_buf);
+    /* Initialize the 'single chunk' file & memory chunk information */
+    chunk_info = fm->single_chunk_info;
+    chunk_info->chunk_points = 1;
 
-            /* Check if we are using the default buffer info */
-            if(default_buffer_info)
-                /* OK to get bigger for library default settings */
-                target_size = type_info->max_type_size;
-            else
-                /* Don't get bigger than the application has requested */
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "temporary buffer max size is too small")
+    /* Set chunk location & hyperslab size */
+    for(u = 0; u < fm->f_ndims; u++) {
+        HDassert(sel_start[u] == sel_end[u]);
+        chunk_info->coords[u] = (sel_start[u] / fm->layout->u.chunk.dim[u]) * fm->layout->u.chunk.dim[u];
+    } /* end for */
+    chunk_info->coords[fm->f_ndims] = 0;
+
+    /* Calculate the index of this chunk */
+    if(H5V_chunk_index(fm->f_ndims, chunk_info->coords, fm->layout->u.chunk.dim, fm->down_chunks, &chunk_info->index) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
+
+    /* Copy selection for file's dataspace into chunk dataspace */
+    if(H5S_select_copy(fm->single_space, fm->file_space, FALSE) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy file selection")
+
+    /* Move selection back to have correct offset in chunk */
+    if(H5S_SELECT_ADJUST_U(fm->single_space, chunk_info->coords) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk selection")
+
+#ifdef H5_HAVE_PARALLEL
+    /* store chunk selection information */
+    if(io_info->using_mpi_vfd)
+        fm->select_chunk[chunk_info->index] = TRUE;
+#endif /* H5_HAVE_PARALLEL */
+
+    /* Set the file dataspace for the chunk to the shared 'single' dataspace */
+    chunk_info->fspace = fm->single_space;
+
+    /* Indicate that the chunk's file dataspace is shared */
+    chunk_info->fspace_shared = TRUE;
+
+    /* Just point at the memory dataspace & selection */
+    /* (Casting away const OK -QAK) */
+    chunk_info->mspace = (H5S_t *)fm->mem_space;
+
+    /* Indicate that the chunk's memory dataspace is shared */
+    chunk_info->mspace_shared = TRUE;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_create_chunk_map_single() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_create_chunk_file_map_hyper
+ *
+ * Purpose:	Create all chunk selections in file.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		Thursday, May 29, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
+#ifndef H5_HAVE_PARALLEL
+    UNUSED
+#endif /* H5_HAVE_PARALLEL */
+    *io_info)
+{
+    hsize_t     sel_start[H5O_LAYOUT_NDIMS];   /* Offset of low bound of file selection */
+    hsize_t     sel_end[H5O_LAYOUT_NDIMS];   /* Offset of high bound of file selection */
+    hsize_t     sel_points;                 /* Number of elements in file selection */
+    hsize_t     start_coords[H5O_LAYOUT_NDIMS];   /* Starting coordinates of selection */
+    hsize_t     coords[H5O_LAYOUT_NDIMS];   /* Current coordinates of chunk */
+    hsize_t     end[H5O_LAYOUT_NDIMS];      /* Current coordinates of chunk */
+    hsize_t     chunk_index;                /* Index of chunk */
+    int         curr_dim;                   /* Current dimension to increment */
+    unsigned    u;                          /* Local index variable */
+    herr_t	ret_value = SUCCEED;        /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_file_map_hyper)
+
+    /* Sanity check */
+    assert(fm->f_ndims>0);
+
+    /* Get number of elements selected in file */
+    sel_points = fm->nelmts;
+
+    /* Get bounding box for selection (to reduce the number of chunks to iterate over) */
+    if(H5S_SELECT_BOUNDS(fm->file_space, sel_start, sel_end) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
+
+    /* Set initial chunk location & hyperslab size */
+
+    for(u=0; u<fm->f_ndims; u++) {
+        start_coords[u]=(sel_start[u]/fm->layout->u.chunk.dim[u])*fm->layout->u.chunk.dim[u];
+        coords[u]=start_coords[u];
+        end[u]=(coords[u]+fm->chunk_dim[u])-1;
+    } /* end for */
+
+
+    /* Calculate the index of this chunk */
+    if(H5V_chunk_index(fm->f_ndims,coords,fm->layout->u.chunk.dim,fm->down_chunks,&chunk_index) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
+
+    /* Iterate through each chunk in the dataset */
+    while(sel_points) {
+        /* Check for intersection of temporary chunk and file selection */
+        /* (Casting away const OK - QAK) */
+        if(H5S_hyper_intersect_block((H5S_t *)fm->file_space,coords,end)==TRUE) {
+            H5S_t *tmp_fchunk;                  /* Temporary file dataspace */
+            H5D_chunk_info_t *new_chunk_info;   /* chunk information to insert into skip list */
+            hssize_t    schunk_points;          /* Number of elements in chunk selection */
+
+            /* Create "temporary" chunk for selection operations (copy file space) */
+            if((tmp_fchunk = H5S_copy(fm->file_space, TRUE, FALSE)) == NULL)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy memory space")
+
+            /* Make certain selections are stored in span tree form (not "optimized hyperslab" or "all") */
+            if(H5S_hyper_convert(tmp_fchunk) < 0) {
+                (void)H5S_close(tmp_fchunk);
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to convert selection to span trees")
+            } /* end if */
+
+            /* "AND" temporary chunk and current chunk */
+            if(H5S_select_hyperslab(tmp_fchunk,H5S_SELECT_AND,coords,NULL,fm->chunk_dim,NULL) < 0) {
+                (void)H5S_close(tmp_fchunk);
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't create chunk selection")
+            } /* end if */
+
+            /* Resize chunk's dataspace dimensions to size of chunk */
+            if(H5S_set_extent_real(tmp_fchunk,fm->chunk_dim) < 0) {
+                (void)H5S_close(tmp_fchunk);
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk dimensions")
+            } /* end if */
+
+            /* Move selection back to have correct offset in chunk */
+            if(H5S_SELECT_ADJUST_U(tmp_fchunk, coords) < 0) {
+                (void)H5S_close(tmp_fchunk);
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk selection")
+            } /* end if */
+
+            /* Add temporary chunk to the list of chunks */
+
+            /* Allocate the file & memory chunk information */
+            if (NULL==(new_chunk_info = H5FL_MALLOC (H5D_chunk_info_t))) {
+                (void)H5S_close(tmp_fchunk);
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
+            } /* end if */
+
+            /* Initialize the chunk information */
+
+            /* Set the chunk index */
+            new_chunk_info->index=chunk_index;
+
+#ifdef H5_HAVE_PARALLEL
+            /* store chunk selection information */
+            if(io_info->using_mpi_vfd)
+                fm->select_chunk[chunk_index] = TRUE;
+#endif /* H5_HAVE_PARALLEL */
+
+            /* Set the file chunk dataspace */
+            new_chunk_info->fspace = tmp_fchunk;
+            new_chunk_info->fspace_shared = FALSE;
+
+            /* Set the memory chunk dataspace */
+            new_chunk_info->mspace=NULL;
+            new_chunk_info->mspace_shared = FALSE;
+
+            /* Copy the chunk's coordinates */
+            for(u=0; u<fm->f_ndims; u++)
+                new_chunk_info->coords[u]=coords[u];
+            new_chunk_info->coords[fm->f_ndims]=0;
+
+            /* Insert the new chunk into the skip list */
+            if(H5SL_insert(fm->sel_chunks,new_chunk_info,&new_chunk_info->index) < 0) {
+                H5D_free_chunk_info(new_chunk_info,NULL,NULL);
+                HGOTO_ERROR(H5E_DATASPACE,H5E_CANTINSERT,FAIL,"can't insert chunk into skip list")
+            } /* end if */
+
+            /* Get number of elements selected in chunk */
+            if((schunk_points=H5S_GET_SELECT_NPOINTS(tmp_fchunk)) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection # of elements")
+            H5_ASSIGN_OVERFLOW(new_chunk_info->chunk_points,schunk_points,hssize_t,size_t);
+
+            /* Decrement # of points left in file selection */
+            sel_points-=(hsize_t)schunk_points;
+
+            /* Leave if we are done */
+            if(sel_points==0)
+                HGOTO_DONE(SUCCEED)
+            assert(sel_points>0);
         } /* end if */
 
-        /* Compute the number of elements that will fit into buffer */
-        type_info->request_nelmts = target_size / type_info->max_type_size;
+        /* Increment chunk index */
+        chunk_index++;
 
-        /* Sanity check elements in temporary buffer */
-        if(type_info->request_nelmts == 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "temporary buffer max size is too small")
+        /* Set current increment dimension */
+        curr_dim=(int)fm->f_ndims-1;
 
-        /*
-         * Get a temporary buffer for type conversion unless the app has already
-         * supplied one through the xfer properties. Instead of allocating a
-         * buffer which is the exact size, we allocate the target size.  The
-         * malloc() is usually less resource-intensive if we allocate/free the
-         * same size over and over.
-         */
-        if(NULL == (type_info->tconv_buf = (uint8_t *)dxpl_cache->tconv_buf)) {
-            /* Allocate temporary buffer */
-            if(NULL == (type_info->tconv_buf = H5FL_BLK_MALLOC(type_conv, target_size)))
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
-            type_info->tconv_buf_allocated = TRUE;
+        /* Increment chunk location in fastest changing dimension */
+        H5_CHECK_OVERFLOW(fm->chunk_dim[curr_dim],hsize_t,hssize_t);
+        coords[curr_dim]+=fm->chunk_dim[curr_dim];
+        end[curr_dim]+=fm->chunk_dim[curr_dim];
+
+        /* Bring chunk location back into bounds, if necessary */
+        if(coords[curr_dim]>sel_end[curr_dim]) {
+            do {
+                /* Reset current dimension's location to 0 */
+                coords[curr_dim]=start_coords[curr_dim]; /*lint !e771 The start_coords will always be initialized */
+                end[curr_dim]=(coords[curr_dim]+(hssize_t)fm->chunk_dim[curr_dim])-1;
+
+                /* Decrement current dimension */
+                curr_dim--;
+
+                /* Increment chunk location in current dimension */
+                coords[curr_dim]+=fm->chunk_dim[curr_dim];
+                end[curr_dim]=(coords[curr_dim]+fm->chunk_dim[curr_dim])-1;
+            } while(coords[curr_dim]>sel_end[curr_dim]);
+
+            /* Re-Calculate the index of this chunk */
+            if(H5V_chunk_index(fm->f_ndims,coords,fm->layout->u.chunk.dim,fm->down_chunks,&chunk_index) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
         } /* end if */
-        if(type_info->need_bkg && NULL == (type_info->bkg_buf = (uint8_t *)dxpl_cache->bkgr_buf)) {
-            size_t	bkg_size;		/* Desired background buffer size	*/
-
-            /* Compute the background buffer size */
-            /* (don't try to use buffers smaller than the default size) */
-            bkg_size = type_info->request_nelmts * type_info->dst_type_size;
-            if(bkg_size < dxpl_cache->max_temp_buf)
-                bkg_size = dxpl_cache->max_temp_buf;
-
-            /* Allocate background buffer */
-            /* (Need calloc()-like call since memory needs to be initialized) */
-            if(NULL == (type_info->bkg_buf = H5FL_BLK_CALLOC(type_conv, bkg_size)))
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for background conversion")
-            type_info->bkg_buf_allocated = TRUE;
+    } /* end while */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_create_chunk_file_map_hyper() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_create_chunk_mem_map_hyper
+ *
+ * Purpose:	Create all chunk selections in memory by copying the file
+ *              chunk selections and adjusting their offsets to be correct
+ *              for the memory.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		Thursday, May 29, 2003
+ *
+ * Assumptions: That the file and memory selections are the same shape.
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm)
+{
+    H5SL_node_t *curr_node;                 /* Current node in skip list */
+    hsize_t    file_sel_start[H5O_LAYOUT_NDIMS];    /* Offset of low bound of file selection */
+    hsize_t    file_sel_end[H5O_LAYOUT_NDIMS];  /* Offset of high bound of file selection */
+    hsize_t    mem_sel_start[H5O_LAYOUT_NDIMS]; /* Offset of low bound of file selection */
+    hsize_t    mem_sel_end[H5O_LAYOUT_NDIMS];   /* Offset of high bound of file selection */
+    hssize_t adjust[H5O_LAYOUT_NDIMS];      /* Adjustment to make to all file chunks */
+    hssize_t chunk_adjust[H5O_LAYOUT_NDIMS];  /* Adjustment to make to a particular chunk */
+    unsigned    u;                          /* Local index variable */
+    herr_t	ret_value = SUCCEED;        /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_mem_map_hyper)
+
+    /* Sanity check */
+    assert(fm->f_ndims>0);
+
+    /* Check for all I/O going to a single chunk */
+    if(H5SL_count(fm->sel_chunks)==1) {
+        H5D_chunk_info_t *chunk_info;   /* Pointer to chunk information */
+
+        /* Get the node */
+        curr_node=H5SL_first(fm->sel_chunks);
+
+        /* Get pointer to chunk's information */
+        chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
+        assert(chunk_info);
+
+        /* Just point at the memory dataspace & selection */
+        /* (Casting away const OK -QAK) */
+        chunk_info->mspace=(H5S_t *)fm->mem_space;
+
+        /* Indicate that the chunk's memory space is shared */
+        chunk_info->mspace_shared = TRUE;
+    } /* end if */
+    else {
+        /* Get bounding box for file selection */
+        if(H5S_SELECT_BOUNDS(fm->file_space, file_sel_start, file_sel_end) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
+
+        /* Get bounding box for memory selection */
+        if(H5S_SELECT_BOUNDS(fm->mem_space, mem_sel_start, mem_sel_end) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
+
+        /* Calculate the adjustment for memory selection from file selection */
+        assert(fm->m_ndims==fm->f_ndims);
+        for(u=0; u<fm->f_ndims; u++) {
+            H5_CHECK_OVERFLOW(file_sel_start[u],hsize_t,hssize_t);
+            H5_CHECK_OVERFLOW(mem_sel_start[u],hsize_t,hssize_t);
+            adjust[u]=(hssize_t)file_sel_start[u]-(hssize_t)mem_sel_start[u];
+        } /* end for */
+
+        /* Iterate over each chunk in the chunk list */
+        curr_node=H5SL_first(fm->sel_chunks);
+        while(curr_node) {
+            H5D_chunk_info_t *chunk_info;   /* Pointer to chunk information */
+
+            /* Get pointer to chunk's information */
+            chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
+            assert(chunk_info);
+
+            /* Copy the information */
+
+            /* Copy the memory dataspace */
+            if((chunk_info->mspace = H5S_copy(fm->mem_space, TRUE, FALSE)) == NULL)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy memory space")
+
+            /* Release the current selection */
+            if(H5S_SELECT_RELEASE(chunk_info->mspace) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection")
+
+            /* Copy the file chunk's selection */
+            if(H5S_select_copy(chunk_info->mspace,chunk_info->fspace,FALSE) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy selection")
+
+            /* Compensate for the chunk offset */
+            for(u=0; u<fm->f_ndims; u++) {
+                H5_CHECK_OVERFLOW(chunk_info->coords[u],hsize_t,hssize_t);
+                chunk_adjust[u]=adjust[u]-(hssize_t)chunk_info->coords[u]; /*lint !e771 The adjust array will always be initialized */
+            } /* end for */
+
+            /* Adjust the selection */
+            if(H5S_hyper_adjust_s(chunk_info->mspace,chunk_adjust) < 0) /*lint !e772 The chunk_adjust array will always be initialized */
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk selection")
+
+            /* Get the next chunk node in the skip list */
+            curr_node=H5SL_next(curr_node);
+        } /* end while */
+    } /* end else */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_create_chunk_mem_map_hyper() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_chunk_file_cb
+ *
+ * Purpose:	Callback routine for file selection iterator.  Used when
+ *              creating selections in file for each point selected.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		Wednesday, July 23, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const hsize_t *coords, void *_fm)
+{
+    H5D_chunk_map_t      *fm = (H5D_chunk_map_t *)_fm;  /* File<->memory chunk mapping info */
+    H5D_chunk_info_t *chunk_info;               /* Chunk information for current chunk */
+    hsize_t    coords_in_chunk[H5O_LAYOUT_NDIMS];        /* Coordinates of element in chunk */
+    hsize_t     chunk_index;                    /* Chunk index */
+    unsigned    u;                              /* Local index variable */
+    herr_t	ret_value = SUCCEED;            /* Return value		*/
+
+    FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_file_cb)
+
+    /* Calculate the index of this chunk */
+    if(H5V_chunk_index(ndims,coords,fm->layout->u.chunk.dim,fm->down_chunks,&chunk_index) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
+
+    /* Find correct chunk in file & memory skip list */
+    if(chunk_index==fm->last_index) {
+        /* If the chunk index is the same as the last chunk index we used,
+         * get the cached info to operate on.
+         */
+        chunk_info=fm->last_chunk_info;
+    } /* end if */
+    else {
+        /* If the chunk index is not the same as the last chunk index we used,
+         * find the chunk in the skip list.
+         */
+        /* Get the chunk node from the skip list */
+        if(NULL == (chunk_info = (H5D_chunk_info_t *)H5SL_search(fm->sel_chunks, &chunk_index))) {
+            H5S_t *fspace;                      /* Memory chunk's dataspace */
+
+            /* Allocate the file & memory chunk information */
+            if (NULL==(chunk_info = H5FL_MALLOC (H5D_chunk_info_t)))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
+
+            /* Initialize the chunk information */
+
+            /* Set the chunk index */
+            chunk_info->index=chunk_index;
+
+            /* Create a dataspace for the chunk */
+            if((fspace = H5S_create_simple(fm->f_ndims,fm->chunk_dim,NULL))==NULL) {
+                H5FL_FREE(H5D_chunk_info_t,chunk_info);
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "unable to create dataspace for chunk")
+            } /* end if */
+
+            /* De-select the chunk space */
+            if(H5S_select_none(fspace) < 0) {
+                (void)H5S_close(fspace);
+                H5FL_FREE(H5D_chunk_info_t,chunk_info);
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to de-select dataspace")
+            } /* end if */
+
+            /* Set the file chunk dataspace */
+            chunk_info->fspace = fspace;
+            chunk_info->fspace_shared = FALSE;
+
+            /* Set the memory chunk dataspace */
+            chunk_info->mspace=NULL;
+            chunk_info->mspace_shared = FALSE;
+
+            /* Set the number of selected elements in chunk to zero */
+            chunk_info->chunk_points=0;
+
+            /* Compute the chunk's coordinates */
+            for(u=0; u<fm->f_ndims; u++) {
+                H5_CHECK_OVERFLOW(fm->layout->u.chunk.dim[u],hsize_t,hssize_t);
+                chunk_info->coords[u]=(coords[u]/(hssize_t)fm->layout->u.chunk.dim[u])*(hssize_t)fm->layout->u.chunk.dim[u];
+            } /* end for */
+            chunk_info->coords[fm->f_ndims]=0;
+
+            /* Insert the new chunk into the skip list */
+            if(H5SL_insert(fm->sel_chunks,chunk_info,&chunk_info->index) < 0) {
+                H5D_free_chunk_info(chunk_info,NULL,NULL);
+                HGOTO_ERROR(H5E_DATASPACE,H5E_CANTINSERT,FAIL,"can't insert chunk into skip list")
+            } /* end if */
         } /* end if */
+
+        /* Update the "last chunk seen" information */
+        fm->last_index=chunk_index;
+        fm->last_chunk_info=chunk_info;
     } /* end else */
 
+    /* Get the coordinates of the element in the chunk */
+    for(u=0; u<fm->f_ndims; u++)
+        coords_in_chunk[u]=coords[u]%fm->layout->u.chunk.dim[u];
+
+    /* Add point to file selection for chunk */
+    if(H5S_select_elements(chunk_info->fspace, H5S_SELECT_APPEND, (size_t)1, coords_in_chunk) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element")
+
+    /* Increment the number of elemented selected in chunk */
+    chunk_info->chunk_points++;
+
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_typeinfo_init() */
+} /* end H5D_chunk_file_cb() */
 
-#ifdef H5_HAVE_PARALLEL
 
 /*-------------------------------------------------------------------------
- * Function:	H5D_ioinfo_adjust
+ * Function:	H5D_chunk_mem_cb
  *
- * Purpose:	Adjust operation's I/O info for any parallel I/O
+ * Purpose:	Callback routine for file selection iterator.  Used when
+ *              creating selections in memory for each chunk.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Raymond Lu
+ *		Thursday, April 10, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+/* ARGSUSED */
+static herr_t
+H5D_chunk_mem_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const hsize_t *coords, void *_fm)
+{
+    H5D_chunk_map_t      *fm = (H5D_chunk_map_t *)_fm;  /* File<->memory chunk mapping info */
+    H5D_chunk_info_t *chunk_info;               /* Chunk information for current chunk */
+    hsize_t    coords_in_mem[H5O_LAYOUT_NDIMS];        /* Coordinates of element in memory */
+    hsize_t     chunk_index;                    /* Chunk index */
+    herr_t	ret_value = SUCCEED;            /* Return value		*/
+
+    FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_mem_cb)
+
+    /* Calculate the index of this chunk */
+    if(H5V_chunk_index(ndims,coords,fm->layout->u.chunk.dim,fm->down_chunks,&chunk_index) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
+
+    /* Find correct chunk in file & memory skip list */
+    if(chunk_index==fm->last_index) {
+        /* If the chunk index is the same as the last chunk index we used,
+         * get the cached spaces to operate on.
+         */
+        chunk_info=fm->last_chunk_info;
+    } /* end if */
+    else {
+        /* If the chunk index is not the same as the last chunk index we used,
+         * find the chunk in the skip list.
+         */
+        /* Get the chunk node from the skip list */
+        if(NULL == (chunk_info = (H5D_chunk_info_t *)H5SL_search(fm->sel_chunks, &chunk_index)))
+            HGOTO_ERROR(H5E_DATASPACE, H5E_NOTFOUND, FAIL, "can't locate chunk in skip list")
+
+        /* Check if the chunk already has a memory space */
+        if(chunk_info->mspace==NULL) {
+            /* Copy the template memory chunk dataspace */
+            if((chunk_info->mspace = H5S_copy(fm->mchunk_tmpl, FALSE, FALSE)) == NULL)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy file space")
+        } /* end else */
+
+        /* Update the "last chunk seen" information */
+        fm->last_index=chunk_index;
+        fm->last_chunk_info=chunk_info;
+    } /* end else */
+
+    /* Get coordinates of selection iterator for memory */
+    if(H5S_SELECT_ITER_COORDS(&fm->mem_iter,coords_in_mem) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get iterator coordinates")
+
+    /* Add point to memory selection for chunk */
+    if(fm->msel_type==H5S_SEL_POINTS) {
+        if(H5S_select_elements(chunk_info->mspace, H5S_SELECT_APPEND, (size_t)1, coords_in_mem) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element")
+    } /* end if */
+    else {
+        if(H5S_hyper_add_span_element(chunk_info->mspace, fm->m_ndims, coords_in_mem) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element")
+    } /* end else */
+
+    /* Move memory selection iterator to next element in selection */
+    if(H5S_SELECT_ITER_NEXT(&fm->mem_iter, (size_t)1) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTNEXT, FAIL, "unable to move to next iterator location")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_chunk_mem_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_ioinfo_init
+ *
+ * Purpose:	Routine for determining correct I/O operations for
+ *              each I/O action.
  *
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Quincey Koziol
- *		Thursday, March 27, 2008
+ *		Thursday, September 30, 2004
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_ioinfo_adjust(H5D_io_info_t *io_info, const H5D_t *dset,
-    const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
-    const H5S_t *file_space, const H5S_t *mem_space,
-    const H5D_type_info_t *type_info, const H5D_chunk_map_t *fm)
+H5D_ioinfo_init(H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
+    const H5S_t
+#if !(defined H5_HAVE_PARALLEL || defined H5S_DEBUG)
+    UNUSED
+#endif /* H5_HAVE_PARALLEL */
+    *mem_space, const H5S_t
+#if !(defined H5_HAVE_PARALLEL || defined H5S_DEBUG)
+    UNUSED
+#endif /* H5_HAVE_PARALLEL */
+    *file_space, H5T_path_t
+#ifndef H5_HAVE_PARALLEL
+    UNUSED
+#endif /* H5_HAVE_PARALLEL */
+    *tpath,
+    H5D_io_info_t *io_info)
 {
     herr_t	ret_value = SUCCEED;	/* Return value	*/
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_adjust)
+#if defined H5_HAVE_PARALLEL || defined H5S_DEBUG
+    FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_init)
+#else /* defined H5_HAVE_PARALLEL || defined H5S_DEBUG */
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_ioinfo_init)
+#endif /* defined H5_HAVE_PARALLEL || defined H5S_DEBUG */
 
     /* check args */
     HDassert(dset);
     HDassert(dset->oloc.file);
     HDassert(mem_space);
     HDassert(file_space);
-    HDassert(type_info);
-    HDassert(type_info->tpath);
+    HDassert(tpath);
     HDassert(io_info);
 
-    /* Make any parallel I/O adjustments */
+    /* Set up "normal" I/O fields */
+    io_info->dset=dset;
+    io_info->dxpl_cache=dxpl_cache;
+    io_info->dxpl_id=dxpl_id;
+    io_info->store=NULL;        /* Set later in I/O routine? */
+
+    /* Set I/O operations to initial values */
+    io_info->ops=dset->shared->io_ops;
+
+#ifdef H5_HAVE_PARALLEL
+    /* Start in the "not modified" xfer_mode state */
+    io_info->xfer_mode_changed = FALSE;
+    io_info->using_mpi_vfd = IS_H5FD_MPI(dset->oloc.file);
+
     if(io_info->using_mpi_vfd) {
         htri_t opt;         /* Flag whether a selection is optimizable */
 
-        /* Record the original state of parallel I/O transfer options */
-        io_info->orig.xfer_mode = io_info->dxpl_cache->xfer_mode;
-        io_info->orig.coll_opt_mode = io_info->dxpl_cache->coll_opt_mode;
-        io_info->orig.io_ops.single_read = io_info->io_ops.single_read;
-        io_info->orig.io_ops.single_write = io_info->io_ops.single_write;
-
         /* Get MPI communicator */
-        if(MPI_COMM_NULL == (io_info->comm = H5F_mpi_get_comm(dset->oloc.file)))
+        if((io_info->comm = H5F_mpi_get_comm(dset->oloc.file)) == MPI_COMM_NULL)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't retrieve MPI communicator")
 
-        /* Check if we can set direct MPI-IO read/write functions */
-        if((opt = H5D_mpio_opt_possible(io_info, file_space, mem_space, type_info, fm)) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "invalid check for direct IO dataspace ")
+        /*
+         * Check if we can set direct MPI-IO read/write functions
+         */
+        opt=H5D_mpio_opt_possible(io_info, mem_space, file_space, tpath);
+        if(opt==FAIL)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "invalid check for direct IO dataspace ");
 
         /* Check if we can use the optimized parallel I/O routines */
-        if(opt == TRUE) {
-            /* Override the I/O op pointers to the MPI-specific routines */
-            io_info->io_ops.multi_read = dset->shared->layout_ops->par_read;
-            io_info->io_ops.multi_write = dset->shared->layout_ops->par_write;
-            io_info->io_ops.single_read = H5D_mpio_select_read;
-            io_info->io_ops.single_write = H5D_mpio_select_write;
+        if(opt==TRUE) {
+            /* Set the pointers to the MPI-specific routines */
+            io_info->ops.read = H5D_mpio_select_read;
+            io_info->ops.write = H5D_mpio_select_write;
         } /* end if */
         else {
+            /* Set the pointers to the non-MPI-specific routines */
+            io_info->ops.read = H5D_select_read;
+            io_info->ops.write = H5D_select_write;
+
             /* If we won't be doing collective I/O, but the user asked for
              * collective I/O, change the request to use independent I/O, but
              * mark it so that we remember to revert the change.
              */
-            if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) {
+            if(io_info->dxpl_cache->xfer_mode==H5FD_MPIO_COLLECTIVE) {
                 H5P_genplist_t *dx_plist;           /* Data transer property list */
 
                 /* Get the dataset transfer property list */
-                if(NULL == (dx_plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
+                if (NULL == (dx_plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
 
                 /* Change the xfer_mode to independent for handling the I/O */
                 io_info->dxpl_cache->xfer_mode = H5FD_MPIO_INDEPENDENT;
-                if(H5P_set(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->dxpl_cache->xfer_mode) < 0)
+                if(H5P_set (dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->dxpl_cache->xfer_mode) < 0)
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set transfer mode")
+
+                /* Indicate that the transfer mode should be restored before returning
+                 * to user.
+                 */
+                io_info->xfer_mode_changed = TRUE;
             } /* end if */
         } /* end else */
     } /* end if */
+    else {
+        /* Set the pointers to the non-MPI-specific routines */
+        io_info->ops.read = H5D_select_read;
+        io_info->ops.write = H5D_select_write;
+    } /* end else */
+#else /* H5_HAVE_PARALLEL */
+    io_info->ops.read = H5D_select_read;
+    io_info->ops.write = H5D_select_write;
+#endif /* H5_HAVE_PARALLEL */
+
+#ifdef H5S_DEBUG
+    /* Get the information for the I/O statistics */
+    if((io_info->stats=H5S_find(mem_space,file_space))==NULL)
+        HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "can't set up selection statistics");
+#endif /* H5S_DEBUG */
 
+#if defined H5_HAVE_PARALLEL || defined H5S_DEBUG
 done:
+#endif /* H5_HAVE_PARALLEL || H5S_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_ioinfo_adjust() */
+} /* end H5D_ioinfo_init() */
 
+#ifdef H5_HAVE_PARALLEL
 
 /*-------------------------------------------------------------------------
  * Function:	H5D_ioinfo_term
@@ -933,69 +3438,23 @@ H5D_ioinfo_term(H5D_io_info_t *io_info)
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_term)
 
-    /* Check if we used the MPI VFD for the I/O */
-    if(io_info->using_mpi_vfd) {
-        /* Check if we need to revert the change to the xfer mode */
-        if(io_info->orig.xfer_mode != io_info->dxpl_cache->xfer_mode) {
-            H5P_genplist_t *dx_plist;           /* Data transer property list */
+    /* Check if we need to revert the change to the xfer mode */
+    if (io_info->xfer_mode_changed) {
+        H5P_genplist_t *dx_plist;           /* Data transer property list */
 
-            /* Get the dataset transfer property list */
-            if(NULL == (dx_plist = (H5P_genplist_t *)H5I_object(io_info->dxpl_id)))
-                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
-
-            /* Restore the original parallel I/O mode */
-            if(H5P_set(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->orig.xfer_mode) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set transfer mode")
-        } /* end if */
+        /* Get the dataset transfer property list */
+        if (NULL == (dx_plist = (H5P_genplist_t *)H5I_object(io_info->dxpl_id)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
-        /* Check if we need to revert the change to the collective opt mode */
-        if(io_info->orig.coll_opt_mode != io_info->dxpl_cache->coll_opt_mode) {
-            H5P_genplist_t *dx_plist;           /* Data transer property list */
-
-            /* Get the dataset transfer property list */
-            if(NULL == (dx_plist = (H5P_genplist_t *)H5I_object(io_info->dxpl_id)))
-                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
-
-            /* Restore the original parallel I/O mode */
-            if(H5P_set(dx_plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &io_info->orig.coll_opt_mode) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set collective option mode")
-        } /* end if */
+        /* Restore the original parallel I/O mode */
+        io_info->dxpl_cache->xfer_mode = H5FD_MPIO_COLLECTIVE;
+        if(H5P_set (dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->dxpl_cache->xfer_mode) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set transfer mode")
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_ioinfo_term() */
 
-#endif /* H5_HAVE_PARALLEL */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_typeinfo_term
- *
- * Purpose:	Common logic for terminating a type info object
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *		Thursday, March  6, 2008
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_typeinfo_term(const H5D_type_info_t *type_info)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_typeinfo_term)
-
-    /* Check for releasing datatype conversion & background buffers */
-    if(type_info->tconv_buf_allocated) {
-        HDassert(type_info->tconv_buf);
-        (void)H5FL_BLK_FREE(type_conv, type_info->tconv_buf);
-    } /* end if */
-    if(type_info->bkg_buf_allocated) {
-        HDassert(type_info->bkg_buf);
-        (void)H5FL_BLK_FREE(type_conv, type_info->bkg_buf);
-    } /* end if */
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5D_typeinfo_term() */
+#endif
 
diff --git a/src/H5Distore.c b/src/H5Distore.c
index efab271..47e4cab 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -104,12 +104,30 @@
  */
 #define H5D_ISTORE_NDIMS(X)	(((X)->sizeof_rkey-8)/8)
 
+#define H5D_HASH(D,ADDR) H5F_addr_hash(ADDR,(D)->cache.chunk.nslots)
+
 #define H5D_ISTORE_DEFAULT_SKIPLIST_HEIGHT     8
 
 /******************/
 /* Local Typedefs */
 /******************/
 
+/* Raw data chunks are cached.  Each entry in the cache is: */
+typedef struct H5D_rdcc_ent_t {
+    hbool_t	locked;		/*entry is locked in cache		*/
+    hbool_t	dirty;		/*needs to be written to disk?		*/
+    hsize_t	offset[H5O_LAYOUT_NDIMS]; /*chunk name			*/
+    size_t	rd_count;	/*bytes remaining to be read		*/
+    size_t	wr_count;	/*bytes remaining to be written		*/
+    size_t	chunk_size;	/*size of a chunk			*/
+    size_t	alloc_size;	/*amount allocated for the chunk	*/
+    uint8_t	*chunk;		/*the unfiltered chunk data		*/
+    unsigned	idx;		/*index in hash table			*/
+    struct H5D_rdcc_ent_t *next;/*next item in doubly-linked list	*/
+    struct H5D_rdcc_ent_t *prev;/*previous item in doubly-linked list	*/
+} H5D_rdcc_ent_t;
+typedef H5D_rdcc_ent_t *H5D_rdcc_ent_ptr_t; /* For free lists */
+
 /*
  * Data exchange structure for indexed storage nodes.  This structure is
  * passed through the B-link tree layer to the methods for the objects
@@ -174,7 +192,7 @@ typedef struct H5D_istore_it_ud4_t {
 /* B-tree callback info for iteration to obtain chunk address and the index of the chunk for all chunks in the B-tree. */
 typedef struct H5D_istore_it_ud5_t {
     H5D_istore_bt_ud_common_t common;           /* Common info for B-tree user data (must be first) */
-    const hsize_t       *down_chunks;
+    hsize_t             *down_chunks;
     haddr_t             *chunk_addr;
 } H5D_istore_it_ud5_t;
 
@@ -1472,7 +1490,7 @@ H5D_istore_flush(H5D_t *dset, hid_t dxpl_id, unsigned flags)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Construct dataset I/O info */
-    H5D_BUILD_IO_INFO_WRT(&io_info, dset, dxpl_cache, dxpl_id, NULL, NULL);
+    H5D_BUILD_IO_INFO(&io_info, dset, dxpl_cache, dxpl_id, NULL);
 
     /* Loop over all entries in the chunk cache */
     for(ent = rdcc->head; ent; ent = next) {
@@ -1507,48 +1525,48 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D_istore_dest(H5D_t *dset, hid_t dxpl_id)
+H5D_istore_dest (H5D_t *dset, hid_t dxpl_id)
 {
     H5D_io_info_t io_info;              /* Temporary I/O info object */
     H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
-    H5D_rdcc_t	*rdcc = &(dset->shared->cache.chunk);
-    int		nerrors = 0;
-    H5D_rdcc_ent_t	*ent = NULL, *next = NULL;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    H5D_dxpl_cache_t *dxpl_cache=&_dxpl_cache;   /* Data transfer property cache */
+    H5D_rdcc_t		*rdcc = &(dset->shared->cache.chunk);
+    int		nerrors=0;
+    H5D_rdcc_ent_t	*ent=NULL, *next=NULL;
+    herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI(H5D_istore_dest, FAIL)
 
-    HDassert(dset);
+    assert(dset);
 
     /* Fill the DXPL cache values for later use */
-    if(H5D_get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
+    if (H5D_get_dxpl_cache(dxpl_id,&dxpl_cache)<0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Construct dataset I/O info */
-    H5D_BUILD_IO_INFO_WRT(&io_info, dset, dxpl_cache, dxpl_id, NULL, NULL);
+    H5D_BUILD_IO_INFO(&io_info,dset,dxpl_cache,dxpl_id,NULL);
 
     /* Flush all the cached chunks */
-    for(ent = rdcc->head; ent; ent = next) {
+    for (ent=rdcc->head; ent; ent=next) {
 #ifdef H5D_ISTORE_DEBUG
 	HDfputc('c', stderr);
 	HDfflush(stderr);
 #endif
 	next = ent->next;
-	if(H5D_istore_preempt(&io_info, ent, TRUE) < 0)
+	if (H5D_istore_preempt(&io_info, ent, TRUE )<0)
 	    nerrors++;
-    } /* end for */
-    if(nerrors)
+    }
+    if (nerrors)
 	HGOTO_ERROR(H5E_IO, H5E_CANTFLUSH, FAIL, "unable to flush one or more raw data chunks")
 
     if(rdcc->slot)
-        H5FL_SEQ_FREE(H5D_rdcc_ent_ptr_t, rdcc->slot);
-    HDmemset(rdcc, 0, sizeof(H5D_rdcc_t));
+        H5FL_SEQ_FREE (H5D_rdcc_ent_ptr_t,rdcc->slot);
+    HDmemset (rdcc, 0, sizeof(H5D_rdcc_t));
 
     /* Free the raw B-tree node buffer */
-    if(dset->shared->layout.u.chunk.btree_shared == NULL)
+    if(dset->shared->layout.u.chunk.btree_shared==NULL)
         HGOTO_ERROR(H5E_IO, H5E_CANTFREE, FAIL, "ref-counted page nil")
-    if(H5RC_DEC(dset->shared->layout.u.chunk.btree_shared) < 0)
+    if(H5RC_DEC(dset->shared->layout.u.chunk.btree_shared)<0)
 	HGOTO_ERROR(H5E_IO, H5E_CANTFREE, FAIL, "unable to decrement ref-counted page")
 
 done:
@@ -1817,7 +1835,7 @@ H5D_istore_lock(const H5D_io_info_t *io_info, H5D_istore_ud1_t *udata,
 
     /* Search for the chunk in the cache */
     if(rdcc->nslots > 0) {
-        idx = H5D_CHUNK_HASH(dset->shared, io_info->store->chunk.index);
+        idx = H5D_HASH(dset->shared,io_info->store->chunk.index);
         ent = rdcc->slot[idx];
 
         if(ent)
@@ -1932,8 +1950,10 @@ H5D_istore_lock(const H5D_io_info_t *io_info, H5D_istore_ud1_t *udata,
                     if(H5D_fill_refill_vl(&fb_info, fb_info.elmts_per_buf, io_info->dxpl_id) < 0)
                         HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, NULL, "can't refill fill value buffer")
             } /* end if */
+#ifdef H5_CLEAR_MEMORY
             else
                 HDmemset(chunk, 0, chunk_size);
+#endif /* H5_CLEAR_MEMORY */
 #ifdef H5D_ISTORE_DEBUG
             rdcc->ninits++;
 #endif /* H5D_ISTORE_DEBUG */
@@ -2134,6 +2154,339 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5D_istore_if_load
+ *
+ * Purpose:	A small internal function to if it's necessary to load the
+ *              chunk into cache.
+ *
+ * Return:	TRUE or FALSE
+ *
+ * Programmer:	Raymond Lu
+ *		17 July 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+hbool_t 
+H5D_istore_if_load(const H5D_io_info_t *io_info, haddr_t caddr)
+{
+    const H5D_t *dataset = io_info->dset;
+    hbool_t ret_value;
+ 
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_istore_if_load)
+
+    HDassert(io_info);
+    HDassert(dataset);
+
+    /*
+     * If the chunk is too large to load into the cache and it has no
+     * filters in the pipeline (i.e. not compressed) and if the address
+     * for the chunk has been defined, then don't load the chunk into the
+     * cache, just write the data to it directly.
+     *
+     * If MPI based VFD is used, must bypass the
+     * chunk-cache scheme because other MPI processes could be
+     * writing to other elements in the same chunk.  Do a direct
+     * write-through of only the elements requested.
+     */
+    if(dataset->shared->dcpl_cache.pline.nused==0 &&
+            ((dataset->shared->layout.u.chunk.size > dataset->shared->cache.chunk.nbytes && caddr != HADDR_UNDEF)
+#ifdef H5_HAVE_PARALLEL
+            || (io_info->using_mpi_vfd && (H5F_ACC_RDWR & H5F_get_intent(dataset->oloc.file)))
+#endif /* H5_HAVE_PARALLEL */
+            )) {
+        ret_value = FALSE;
+    } else
+        ret_value = TRUE;
+
+    FUNC_LEAVE_NOAPI(ret_value)
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_istore_readvv
+ *
+ * Purpose:	Reads a multi-dimensional buffer from (part of) an indexed raw
+ *		storage array.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		Wednesday, May  7, 2003
+ *
+ * Modification: 
+ *              Raymond Lu
+ *              20 July 2007
+ *              Moved H5D_istore_lock and H5D_istore_unlock to H5D_chunk_read
+ *              from this function to avoid frequent lock and unlock.
+ *
+ *-------------------------------------------------------------------------
+ */
+ssize_t
+H5D_istore_readvv(const H5D_io_info_t *io_info,
+    size_t chunk_max_nseq, size_t *chunk_curr_seq, size_t chunk_len_arr[], hsize_t chunk_offset_arr[],
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
+    haddr_t chunk_addr, void *chunk, void *buf)
+{
+    H5D_t *dset=io_info->dset;          /* Local pointer to the dataset info */
+    size_t		u;              /* Local index variables */
+    ssize_t             ret_value;      /* Return value */
+
+    FUNC_ENTER_NOAPI(H5D_istore_readvv, FAIL)
+
+    /* Check args */
+    HDassert(io_info);
+    HDassert(dset && H5D_CHUNKED==dset->shared->layout.type);
+    HDassert(dset->shared->layout.u.chunk.ndims>0 && dset->shared->layout.u.chunk.ndims<=H5O_LAYOUT_NDIMS);
+    HDassert(io_info->dxpl_cache);
+    HDassert(io_info->store);
+    HDassert(chunk_len_arr);
+    HDassert(chunk_offset_arr);
+    HDassert(mem_len_arr);
+    HDassert(mem_offset_arr);
+    HDassert(buf);
+
+    /* Get the address of this chunk on disk */
+#ifdef QAK
+HDfprintf(stderr,"%s: io_info->store->chunk.offset={",FUNC);
+for(u=0; u<dset->shared->layout.u.chunk.ndims; u++)
+    HDfprintf(stderr,"%Hd%s",io_info->store->chunk.offset[u],(u<(dset->shared->layout.u.chunk.ndims-1) ? ", " : "}\n"));
+
+HDfprintf(stderr,"%s: chunk_addr=%a, chunk_size=%Zu\n",FUNC,chunk_addr,dset->shared->layout.u.chunk.size);
+HDfprintf(stderr,"%s: chunk_len_arr[%Zu]=%Zu\n",FUNC,*chunk_curr_seq,chunk_len_arr[*chunk_curr_seq]);
+HDfprintf(stderr,"%s: chunk_offset_arr[%Zu]=%Hu\n",FUNC,*chunk_curr_seq,chunk_offset_arr[*chunk_curr_seq]);
+HDfprintf(stderr,"%s: mem_len_arr[%Zu]=%Zu\n",FUNC,*mem_curr_seq,mem_len_arr[*mem_curr_seq]);
+HDfprintf(stderr,"%s: mem_offset_arr[%Zu]=%Hu\n",FUNC,*mem_curr_seq,mem_offset_arr[*mem_curr_seq]);
+HDfprintf(stderr,"%s: buf=%p\n",FUNC,buf);
+#endif /* QAK */
+
+    /*
+     * If the chunk is too large to load into the cache and it has no
+     * filters in the pipeline (i.e. not compressed) and if the address
+     * for the chunk has been defined, then don't load the chunk into the
+     * cache, just read the data from it directly.
+     *
+     * If MPI based VFD is used, must bypass the
+     * chunk-cache scheme because other MPI processes could be
+     * writing to other elements in the same chunk.  Do a direct
+     * read-through of only the elements requested.
+     */
+    if(!H5D_istore_if_load(io_info, chunk_addr)) {
+        H5D_io_info_t chk_io_info;      /* Temporary I/O info object */
+        H5D_storage_t chk_store;        /* Chunk storage information */
+
+        /* Set up the storage information for the chunk */
+        chk_store.contig.dset_addr=chunk_addr;
+        chk_store.contig.dset_size=(hsize_t)dset->shared->layout.u.chunk.size;
+
+        /* Set up new dataset I/O info */
+        H5D_BUILD_IO_INFO(&chk_io_info,dset,io_info->dxpl_cache,io_info->dxpl_id,&chk_store);
+
+        /* Do I/O directly on chunk without reading it into the cache */
+        if ((ret_value=H5D_contig_readvv(&chk_io_info, chunk_max_nseq, chunk_curr_seq, chunk_len_arr, 
+                chunk_offset_arr, mem_max_nseq, mem_curr_seq, mem_len_arr, mem_offset_arr, (haddr_t)0, NULL, buf))<0)
+            HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data to file")
+    } /* end if */
+    else {
+        ssize_t         naccessed;      /* Number of bytes accessed in chunk */
+
+        /* If the chunk address is not defined, check if the fill value is
+         * undefined also.  If both situations hold, don't bother copying
+         * values to the destination buffer, since they will just be
+         * garbage.
+         *
+         * Ideally, this will eventually be checked at a higher level and
+         * the entire I/O operation on the chunk will be skipped.  -QAK
+         */
+        if(!H5F_addr_defined(chunk_addr)) {
+            H5D_rdcc_t		*rdcc = &(dset->shared->cache.chunk);/*raw data chunk cache*/
+            hbool_t		found = FALSE;		/*already in cache?	*/
+
+            /* Check if the chunk is in the cache (but hasn't been written to disk yet) */
+            if(rdcc->nslots>0) {
+                unsigned idx = H5D_HASH(dset->shared, io_info->store->chunk.index); /* Cache entry index */
+                H5D_rdcc_ent_t	*ent = rdcc->slot[idx]; /* Cache entry */
+
+                /* Potential match... */
+                if(ent) {
+                    for(u = 0, found = TRUE; u < dset->shared->layout.u.chunk.ndims; u++) {
+                        if(io_info->store->chunk.offset[u] != ent->offset[u]) {
+                            found = FALSE;
+                            break;
+                        } /* end if */
+                    } /* end for */
+                } /* end if */
+            } /* end if */
+
+            /* If the chunk is in the cache, then it must have valid data */
+            if(!found) {
+                const H5O_fill_t *fill = &(dset->shared->dcpl_cache.fill);    /* Fill value info */
+                H5D_fill_value_t fill_status;
+
+                /* Check if the fill value is defined */
+                if(H5P_is_fill_value_defined(fill, &fill_status) < 0)
+                    HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't tell if fill value defined")
+
+                /* If we are never to return fill values, or if we would return them
+                 * but they aren't set, process the entire set of I/O vectors and
+                 * get out now.
+                 */
+                if(fill->fill_time == H5D_FILL_TIME_NEVER ||
+                        (fill->fill_time == H5D_FILL_TIME_IFSET && fill_status!=H5D_FILL_VALUE_USER_DEFINED)) {
+                    size_t size;                /* Size of sequence in bytes */
+                    size_t v;                   /* Local index variable */
+                    ssize_t bytes_processed = 0;  /* Eventual return value */
+
+                    /* Work through all the sequences */
+                    for(u = *mem_curr_seq, v = *chunk_curr_seq; u < mem_max_nseq && v < chunk_max_nseq; ) {
+                        /* Choose smallest buffer to write */
+                        if(chunk_len_arr[v] < mem_len_arr[u])
+                            size = chunk_len_arr[v];
+                        else
+                            size = mem_len_arr[u];
+
+                        /* Update source information */
+                        chunk_len_arr[v] -= size;
+                        chunk_offset_arr[v] += size;
+                        if(chunk_len_arr[v] == 0)
+                            v++;
+
+                        /* Update destination information */
+                        mem_len_arr[u] -= size;
+                        mem_offset_arr[u] += size;
+                        if(mem_len_arr[u] == 0)
+                            u++;
+
+                        /* Increment number of bytes copied */
+                        bytes_processed += (ssize_t)size;
+                    } /* end for */
+
+                    /* Update current sequence vectors */
+                    *mem_curr_seq = u;
+                    *chunk_curr_seq = v;
+
+                    HGOTO_DONE(bytes_processed)
+                } /* end if */
+            } /* end if */
+        } /* end if */
+
+        /* Use the vectorized memory copy routine to do actual work */
+        if((naccessed = H5V_memcpyvv(buf, mem_max_nseq, mem_curr_seq, mem_len_arr, mem_offset_arr, chunk, chunk_max_nseq, chunk_curr_seq, chunk_len_arr, chunk_offset_arr)) < 0)
+            HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "vectorized memcpy failed")
+
+        H5_CHECK_OVERFLOW(naccessed, ssize_t, size_t);
+
+        /* Set return value */
+        ret_value = naccessed;
+    } /* end else */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5D_istore_readvv() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_istore_writevv
+ *
+ * Purpose:	Writes a multi-dimensional buffer to (part of) an indexed raw
+ *		storage array.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		Friday, May  2, 2003
+ *
+ * Modification: 
+ *              Raymond Lu
+ *              20 July 2007
+ *              Moved H5D_istore_lock and H5D_istore_unlock to H5D_chunk_write
+ *              from this function to avoid frequent lock and unlock.
+ *
+ *-------------------------------------------------------------------------
+ */
+ssize_t
+H5D_istore_writevv(const H5D_io_info_t *io_info,
+    size_t chunk_max_nseq, size_t *chunk_curr_seq, size_t chunk_len_arr[], hsize_t chunk_offset_arr[],
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
+    haddr_t chunk_addr, void *chunk, const void *buf)
+{
+    H5D_t *dset = io_info->dset;          /* Local pointer to the dataset info */
+    ssize_t             ret_value;      /* Return value */
+
+    FUNC_ENTER_NOAPI(H5D_istore_writevv, FAIL)
+
+    /* Check args */
+    HDassert(io_info);
+    HDassert(dset && H5D_CHUNKED==dset->shared->layout.type);
+    HDassert(dset->shared->layout.u.chunk.ndims>0 && dset->shared->layout.u.chunk.ndims<=H5O_LAYOUT_NDIMS);
+    HDassert(io_info->dxpl_cache);
+    HDassert(io_info->store);
+    HDassert(chunk_len_arr);
+    HDassert(chunk_offset_arr);
+    HDassert(mem_len_arr);
+    HDassert(mem_offset_arr);
+    HDassert(buf);
+
+#ifdef QAK
+{
+size_t		u;              /* Local index variables */
+
+HDfprintf(stderr,"%s: io_info->store->chunk.offset={",FUNC);
+for(u=0; u<dset->shared->layout.u.chunk.ndims; u++)
+    HDfprintf(stderr,"%Hd%s",io_info->store->chunk.offset[u],(u<(dset->shared->layout.u.chunk.ndims-1) ? ", " : "}\n"));
+
+HDfprintf(stderr,"%s: chunk_addr=%a, chunk_size=%Zu\n",FUNC,chunk_addr,dset->shared->layout.u.chunk.size);
+HDfprintf(stderr,"%s: chunk_len_arr[%Zu]=%Zu\n",FUNC,*chunk_curr_seq,chunk_len_arr[*chunk_curr_seq]);
+HDfprintf(stderr,"%s: chunk_offset_arr[%Zu]=%Hu\n",FUNC,*chunk_curr_seq,chunk_offset_arr[*chunk_curr_seq]);
+HDfprintf(stderr,"%s: mem_len_arr[%Zu]=%Zu\n",FUNC,*mem_curr_seq,mem_len_arr[*mem_curr_seq]);
+HDfprintf(stderr,"%s: mem_offset_arr[%Zu]=%Hu\n",FUNC,*mem_curr_seq,mem_offset_arr[*mem_curr_seq]);
+}
+#endif /* QAK */
+
+    /*
+     * If the chunk is too large to load into the cache and it has no
+     * filters in the pipeline (i.e. not compressed) and if the address
+     * for the chunk has been defined, then don't load the chunk into the
+     * cache, just write the data to it directly.
+     *
+     * If MPI based VFD is used, must bypass the
+     * chunk-cache scheme because other MPI processes could be
+     * writing to other elements in the same chunk.  Do a direct
+     * write-through of only the elements requested.
+     */
+    if(!H5D_istore_if_load(io_info, chunk_addr)) {
+        H5D_io_info_t chk_io_info;      /* Temporary I/O info object */
+        H5D_storage_t chk_store;        /* Chunk storage information */
+
+        /* Set up the storage information for the chunk */
+        chk_store.contig.dset_addr=chunk_addr;
+        chk_store.contig.dset_size=(hsize_t)dset->shared->layout.u.chunk.size;
+
+        /* Set up new dataset I/O info */
+        H5D_BUILD_IO_INFO(&chk_io_info,dset,io_info->dxpl_cache,io_info->dxpl_id,&chk_store);
+
+        /* Do I/O directly on chunk without reading it into the cache */
+        if((ret_value = H5D_contig_writevv(&chk_io_info, chunk_max_nseq, chunk_curr_seq, chunk_len_arr, chunk_offset_arr, mem_max_nseq, mem_curr_seq, mem_len_arr, mem_offset_arr, (haddr_t)0, NULL, buf)) < 0)
+            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to write raw data to file")
+    } /* end if */
+    else {
+        ssize_t         naccessed;      /* Number of bytes accessed in chunk */
+
+        /* Use the vectorized memory copy routine to do actual work */
+        if((naccessed=H5V_memcpyvv(chunk,chunk_max_nseq,chunk_curr_seq,chunk_len_arr,chunk_offset_arr,buf,mem_max_nseq,mem_curr_seq,mem_len_arr,mem_offset_arr))<0)
+            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vectorized memcpy failed")
+
+        H5_CHECK_OVERFLOW(naccessed,ssize_t,size_t);
+
+        /* Set return value */
+        ret_value=naccessed;
+    } /* end else */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5D_istore_writevv() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5D_istore_create
  *
  * Purpose:	Creates a new indexed-storage B-tree and initializes the
@@ -2214,16 +2567,16 @@ H5D_istore_allocated(H5D_t *dset, hid_t dxpl_id)
     HDassert(dset);
 
     /* Fill the DXPL cache values for later use */
-    if(H5D_get_dxpl_cache(dxpl_id,&dxpl_cache) < 0)
+    if (H5D_get_dxpl_cache(dxpl_id,&dxpl_cache)<0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, 0, "can't fill dxpl cache")
 
     /* Construct dataset I/O info */
-    H5D_BUILD_IO_INFO_WRT(&io_info, dset, dxpl_cache, dxpl_id, NULL, NULL);
+    H5D_BUILD_IO_INFO(&io_info,dset,dxpl_cache,dxpl_id,NULL);
 
     /* Search for cached chunks that haven't been written out */
     for(ent = rdcc->head; ent; ent = ent->next) {
         /* Flush the chunk out to disk, to make certain the size is correct later */
-        if (H5D_istore_flush_entry(&io_info, ent, FALSE) < 0)
+        if (H5D_istore_flush_entry(&io_info, ent, FALSE)<0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, 0, "cannot flush indexed storage buffer")
     } /* end for */
 
@@ -2256,7 +2609,7 @@ done:
  */
 herr_t
 H5D_istore_chunkmap(const H5D_io_info_t *io_info, haddr_t chunk_addr[],
-    const hsize_t down_chunks[])
+    hsize_t down_chunks[])
 {
     H5D_t *dset = io_info->dset;       /* Local pointer to dataset info */
     H5D_istore_it_ud5_t	udata;
@@ -2555,7 +2908,7 @@ H5D_istore_allocate(H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite)
 
     /* Set up dataset I/O info */
     store.chunk.offset = chunk_offset;
-    H5D_BUILD_IO_INFO_WRT(&io_info, dset, dxpl_cache, data_dxpl_id, &store, NULL);
+    H5D_BUILD_IO_INFO(&io_info, dset, dxpl_cache, data_dxpl_id, &store);
 
     /* Reset the chunk offset indices */
     HDmemset(chunk_offset, 0, (layout->u.chunk.ndims * sizeof(chunk_offset[0])));
@@ -3221,7 +3574,7 @@ H5D_istore_initialize_by_extent(H5D_io_info_t *io_info)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize chunk selection information")
 
             /* Scatter the data into memory */
-            if(H5D_scatter_mem(fb_info.fill_buf, space_chunk, &chunk_iter, (size_t)nelmts, io_info->dxpl_cache, chunk/*out*/) < 0) {
+            if(H5D_select_mscat(fb_info.fill_buf, space_chunk, &chunk_iter, (size_t)nelmts, io_info->dxpl_cache, chunk/*out*/) < 0) {
                 H5S_SELECT_ITER_RELEASE(&chunk_iter);
                 HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "scatter failed")
             } /* end if */
@@ -3375,7 +3728,7 @@ H5D_istore_update_cache(H5D_t *dset, hid_t dxpl_id)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Construct dataset I/O info */
-    H5D_BUILD_IO_INFO_WRT(&io_info, dset, dxpl_cache, dxpl_id, NULL, NULL);
+    H5D_BUILD_IO_INFO(&io_info, dset, dxpl_cache, dxpl_id, NULL);
 
     /* Recompute the index for each cached chunk that is in a dataset */
     for(ent = rdcc->head; ent; ent = next) {
@@ -3391,7 +3744,7 @@ H5D_istore_update_cache(H5D_t *dset, hid_t dxpl_id)
 
         /* Compute the index for the chunk entry */
         old_idx=ent->idx;   /* Save for later */
-        ent->idx=H5D_CHUNK_HASH(dset->shared, idx);
+        ent->idx=H5D_HASH(dset->shared,idx);
 
         if(old_idx != ent->idx) {
             /* Check if there is already a chunk at this chunk's new location */
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index 889fbce..22f32ab 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -34,12 +34,12 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
+#include "H5Iprivate.h"
 #include "H5Dpkg.h"		/* Datasets				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fprivate.h"		/* File access				*/
 #include "H5FDprivate.h"	/* File drivers				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5MMprivate.h"
 #include "H5Oprivate.h"		/* Object headers		  	*/
 #include "H5Pprivate.h"         /* Property lists                       */
 #include "H5Sprivate.h"		/* Dataspaces 				*/
@@ -86,7 +86,6 @@
 #define H5D_CHUNK_SELECT_IRREG        2
 #define H5D_CHUNK_SELECT_NONE         0
 
-
 /******************/
 /* Local Typedefs */
 /******************/
@@ -96,47 +95,66 @@ typedef struct H5D_chunk_addr_info_t {
   H5D_chunk_info_t chunk_info;
 } H5D_chunk_addr_info_t;
 
+/* Combine all information that needs to know for collective MPI-IO of this selection. */
+typedef struct H5D_common_coll_info_t {
+  hbool_t mbt_is_derived;
+  hbool_t mft_is_derived;
+  size_t  mpi_buf_count;
+  haddr_t chunk_addr;
+} H5D_common_coll_info_t;
+  
 
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5D_chunk_collective_io(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, H5D_chunk_map_t *fm);
-static herr_t H5D_multi_chunk_collective_io(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, H5D_chunk_map_t *fm,
-    H5P_genplist_t *dx_plist);
-static herr_t H5D_multi_chunk_collective_io_no_opt(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist);
-#ifdef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
-static herr_t H5D_link_chunk_collective_io(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, H5D_chunk_map_t *fm, int sum_chunk);
-#endif /* H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS */
-static herr_t H5D_inter_collective_io(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, const H5S_t *file_space,
-    const H5S_t *mem_space);
-static herr_t H5D_final_collective_io(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, size_t nelmts, MPI_Datatype *mpi_file_type,
-    MPI_Datatype *mpi_buf_type);
-static herr_t H5D_sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
-    H5D_chunk_addr_info_t chunk_addr_info_array[], int many_chunk_opt);
-static herr_t H5D_obtain_mpio_mode(H5D_io_info_t *io_info, H5D_chunk_map_t *fm,
-    H5P_genplist_t *dx_plist, uint8_t assign_io_mode[], haddr_t chunk_addr[]);
-static herr_t H5D_ioinfo_xfer_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist,
-    H5FD_mpio_xfer_t xfer_mode);
-static herr_t H5D_ioinfo_coll_opt_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist,
-    H5FD_mpio_collective_opt_t coll_opt_mode);
+
+static herr_t 
+H5D_multi_chunk_collective_io(H5D_io_info_t *io_info,H5D_chunk_map_t *fm,const void *buf, 
+			      hbool_t do_write);
+static herr_t
+H5D_multi_chunk_collective_io_no_opt(H5D_io_info_t *io_info,H5D_chunk_map_t *fm,const void *buf,
+                              hbool_t do_write);
+
+static herr_t
+H5D_link_chunk_collective_io(H5D_io_info_t *io_info,H5D_chunk_map_t *fm,const void *buf, 
+			     hbool_t do_write,int sum_chunk);
+
+static herr_t 
+H5D_inter_collective_io(H5D_io_info_t *io_info,const H5S_t *file_space,
+			const H5S_t *mem_space,haddr_t addr, 
+		        const void *buf, hbool_t do_write );
+
+static herr_t 
+H5D_final_collective_io(H5D_io_info_t *io_info,MPI_Datatype*mpi_file_type,
+			 MPI_Datatype *mpi_buf_type,
+			 H5D_common_coll_info_t* coll_info, 
+			 const void *buf, hbool_t do_write);
+static herr_t 
+H5D_sort_chunk(H5D_io_info_t * io_info,
+	       H5D_chunk_map_t *fm,
+	       H5D_chunk_addr_info_t chunk_addr_info_array[],
+	       int many_chunk_opt);
+
+static herr_t 
+H5D_obtain_mpio_mode(H5D_io_info_t* io_info, 
+		     H5D_chunk_map_t *fm,
+		     uint8_t assign_io_mode[],
+		     haddr_t chunk_addr[]);
+
+static herr_t H5D_ioinfo_make_ind(H5D_io_info_t *io_info);
+static herr_t H5D_ioinfo_make_coll_opt(H5D_io_info_t *io_info);
+static herr_t H5D_ioinfo_make_coll(H5D_io_info_t *io_info);
 static herr_t H5D_mpio_get_min_chunk(const H5D_io_info_t *io_info,
     const H5D_chunk_map_t *fm, int *min_chunkf);
 static int H5D_cmp_chunk_addr(const void *addr1, const void *addr2);
 static herr_t H5D_mpio_get_sum_chunk(const H5D_io_info_t *io_info,
-    const H5D_chunk_map_t *fm, int *sum_chunkf);
+		       const H5D_chunk_map_t *fm, int *sum_chunkf);
 
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -157,77 +175,64 @@ static herr_t H5D_mpio_get_sum_chunk(const H5D_io_info_t *io_info,
  *-------------------------------------------------------------------------
  */
 htri_t
-H5D_mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space,
-    const H5S_t *mem_space, const H5D_type_info_t *type_info,
-    const H5D_chunk_map_t *fm)
+H5D_mpio_opt_possible( const H5D_io_info_t *io_info,
+    const H5S_t *mem_space, const H5S_t *file_space, const H5T_path_t *tpath)
 {
-    int local_opinion = TRUE;   /* This process's idea of whether to perform collective I/O or not */
-    int consensus;              /* Consensus opinion of all processes */
-    int mpi_code;               /* MPI error code */
-    htri_t ret_value = TRUE;
+    int         local_opinion = TRUE;   /* This process's idea of whether to perform collective I/O or not */
+    int         consensus;              /* Consensus opinion of all processes */
+    int         mpi_code;               /* MPI error code */
+    htri_t ret_value=TRUE;
 
-    FUNC_ENTER_NOAPI(H5D_mpio_opt_possible, FAIL)
+    FUNC_ENTER_NOAPI(H5D_mpio_opt_possible, FAIL);
 
     /* Check args */
-    HDassert(io_info);
-    HDassert(mem_space);
-    HDassert(file_space);
-    HDassert(type_info);
+    assert(io_info);
+    assert(mem_space);
+    assert(file_space);
 
     /* For independent I/O, get out quickly and don't try to form consensus */
-    if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_INDEPENDENT)
+    if (io_info->dxpl_cache->xfer_mode==H5FD_MPIO_INDEPENDENT)
         HGOTO_DONE(FALSE);
 
-    /* Don't allow collective operations if datatype conversions need to happen */
-    if(!type_info->is_conv_noop) {
-        local_opinion = FALSE;
-        goto broadcast;
-    } /* end if */
-
-    /* Don't allow collective operations if data transform operations should occur */
-    if(!type_info->is_xform_noop) {
-        local_opinion = FALSE;
-        goto broadcast;
-    } /* end if */
-
     /* Optimized MPI types flag must be set and it must be collective IO */
     /* (Don't allow parallel I/O for the MPI-posix driver, since it doesn't do real collective I/O) */
-    if(!(H5S_mpi_opt_types_g && io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE
-            && !IS_H5FD_MPIPOSIX(io_info->dset->oloc.file))) {
+    if (!(H5S_mpi_opt_types_g && io_info->dxpl_cache->xfer_mode==H5FD_MPIO_COLLECTIVE && !IS_H5FD_MPIPOSIX(io_info->dset->oloc.file))) {
         local_opinion = FALSE;
         goto broadcast;
     } /* end if */
 
     /* Check whether these are both simple or scalar dataspaces */
-    if(!((H5S_SIMPLE == H5S_GET_EXTENT_TYPE(mem_space) || H5S_SCALAR == H5S_GET_EXTENT_TYPE(mem_space))
-            && (H5S_SIMPLE == H5S_GET_EXTENT_TYPE(file_space) || H5S_SCALAR == H5S_GET_EXTENT_TYPE(file_space)))) {
+    if (!((H5S_SIMPLE==H5S_GET_EXTENT_TYPE(mem_space) || H5S_SCALAR==H5S_GET_EXTENT_TYPE(mem_space))
+            && (H5S_SIMPLE==H5S_GET_EXTENT_TYPE(file_space) || H5S_SCALAR==H5S_GET_EXTENT_TYPE(file_space)))) {
         local_opinion = FALSE;
         goto broadcast;
     } /* end if */
 
     /* Can't currently handle point selections */
-    if(H5S_SEL_POINTS == H5S_GET_SELECT_TYPE(mem_space)
-            || H5S_SEL_POINTS == H5S_GET_SELECT_TYPE(file_space)) {
+    if (H5S_SEL_POINTS==H5S_GET_SELECT_TYPE(mem_space) || H5S_SEL_POINTS==H5S_GET_SELECT_TYPE(file_space)) {
         local_opinion = FALSE;
         goto broadcast;
     } /* end if */
 
     /* Dataset storage must be contiguous or chunked */
-    if(!(io_info->dset->shared->layout.type == H5D_CONTIGUOUS ||
+    if (!(io_info->dset->shared->layout.type == H5D_CONTIGUOUS ||
             io_info->dset->shared->layout.type == H5D_CHUNKED)) {
         local_opinion = FALSE;
         goto broadcast;
     } /* end if */
 
-    /* The handling of memory space is different for chunking and contiguous
-     *  storage.  For contiguous storage, mem_space and file_space won't change
-     *  when it it is doing disk IO.  For chunking storage, mem_space will
-     *  change for different chunks. So for chunking storage, whether we can
-     *  use collective IO will defer until each chunk IO is reached.  For
-     *  contiguous storage, if we find MPI-IO cannot support complicated MPI
-     *  derived data type and the shape of data space is not regular, we will
-     *  set use_par_opt_io = FALSE.
-     */
+    /*    The handling of memory space is different for chunking
+	  and contiguous storage,
+	  For contigous storage, mem_space and file_space won't
+	  change when it it is doing disk IO.
+	  For chunking storage, mem_space will change for different
+	  chunks. So for chunking storage, whether we can use
+	  collective IO will defer until each chunk IO is reached.
+	  For contiguous storage, if we find MPI-IO cannot
+	  support complicated MPI derived data type and the shape
+          of data space is not regular, we will
+	  set use_par_opt_io = FALSE.
+	*/
 #ifndef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
     if(io_info->dset->shared->layout.type == H5D_CONTIGUOUS)
         if((H5S_SELECT_IS_REGULAR(file_space) != TRUE) ||
@@ -238,46 +243,84 @@ H5D_mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space,
 #endif
 
     /* Don't allow collective operations if filters need to be applied */
-    if(io_info->dset->shared->layout.type == H5D_CHUNKED) {
-        if(io_info->dset->shared->dcpl_cache.pline.nused > 0) {
+    if(io_info->dset->shared->layout.type == H5D_CHUNKED)
+        if(io_info->dset->shared->dcpl_cache.pline.nused>0) {
             local_opinion = FALSE;
             goto broadcast;
         } /* end if */
 
-/* If H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS and H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
- *      are defined, the HDF5 library will do collective IO if the application
- *      asks for it.
- *
- * If H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS is not defined and one or more
- *      processes are not participating in the IO, then collective IO is not
- *      assured. The library will check each process for the number of chunks
- *      it involves. If any process involves zero chunks, the library will use
- *      independent IO mode instead.
- */
-#ifndef H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS
-        /* Check the number of chunks to perform I/O on */
-        if(0 == H5SL_count(fm->sel_chunks)) {
-            local_opinion = FALSE;
-            goto broadcast;
-         } /* end if */
-#endif /* H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS */
+    /* Don't allow collective operations if datatype conversions need to happen */
+    if(!H5T_path_noop(tpath)) {
+        local_opinion = FALSE;
+        goto broadcast;
+    } /* end if */
+
+    /* Don't allow collective operations if data transform operations should occur */
+    if(!H5Z_xform_noop(io_info->dxpl_cache->data_xform_prop)) {
+        local_opinion = FALSE;
+        goto broadcast;
     } /* end if */
 
 broadcast:
     /* Form consensus opinion among all processes about whether to perform
-     * collective I/O
-     */
-    if(MPI_SUCCESS != (mpi_code = MPI_Allreduce(&local_opinion, &consensus, 1, MPI_INT, MPI_LAND, io_info->comm)))
+     * collective I/O */
+    if (MPI_SUCCESS != (mpi_code = MPI_Allreduce(&local_opinion, &consensus, 1, MPI_INT, MPI_LAND, io_info->comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Allreduce failed", mpi_code)
 
     ret_value = consensus > 0 ? TRUE : FALSE;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value);
 } /* H5D_mpio_opt_possible() */
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5D_mpio_chunk_adjust_iomode
+ *
+ * Decription:  If H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS and 
+                H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS are defined,
+                the HDF5 library will do collective IO if the application asks for it.
+
+                If H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS is not defined
+                and one or more processes are not participating in the IO,
+                then collective IO is not assured. The library will check 
+                each process for the 
+                number of chunks it involves. If any process involves zero chunks,
+                the library will use independent IO mode instead.
+                This function is only used for linked chunk IO.
+ * Purpose:	Checks if it is possible to do collective IO 
+ *
+ * Return:	Success:        Non-negative: TRUE or FALSE
+ *		Failure:	Negative
+ *
+ * Programmer:	Muqun Yang
+ *              Monday, Feb. 13th, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS
+herr_t
+H5D_mpio_chunk_adjust_iomode(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm)
+{
+   int   min_chunk;
+   herr_t ret_value = SUCCEED;
+
+   FUNC_ENTER_NOAPI_NOINIT(H5D_mpio_chunk_adjust_iomode)
+
+    if(H5D_mpio_get_min_chunk(io_info,fm,&min_chunk) < 0)
+         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the min chunk number of all processes"); 
+    if(min_chunk == 0) {                
+        /* Switch to independent I/O */
+        if(H5D_ioinfo_make_ind(io_info) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to independent I/O")
+     } /* end if */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+}
+#endif
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5D_mpio_select_read
  *
  * Purpose:	MPI-IO function to read directly from app buffer to file.
@@ -289,20 +332,23 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D_mpio_select_read(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *type_info,
-    hsize_t mpi_buf_count, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space)
+H5D_mpio_select_read(H5D_io_info_t *io_info,
+                     size_t mpi_buf_count, 
+                     const size_t UNUSED elmt_size,
+		     const H5S_t UNUSED *file_space, 
+		     const H5S_t UNUSED *mem_space,
+		     haddr_t addr,		     
+                     void UNUSED *pointer,
+		     void *buf/*out*/)
 {
-    const H5D_contig_storage_t *store_contig = &(io_info->store->contig);    /* Contiguous storage info for this I/O operation */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5D_mpio_select_read, FAIL)
-
-    H5_CHECK_OVERFLOW(mpi_buf_count, hsize_t, size_t);
-    if(H5F_block_read(io_info->dset->oloc.file, H5FD_MEM_DRAW, store_contig->dset_addr, (size_t)mpi_buf_count, io_info->dxpl_id, io_info->u.rbuf) < 0)
-	HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "can't finish collective parallel read")
+    FUNC_ENTER_NOAPI(H5D_mpio_select_read,FAIL);
 
+    if(H5F_block_read (io_info->dset->oloc.file, H5FD_MEM_DRAW, addr, mpi_buf_count, io_info->dxpl_id, buf) < 0)
+	HGOTO_ERROR(H5E_IO,H5E_READERROR,FAIL,"can't finish collective parallel read");
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5D_mpio_select_read() */
 
 
@@ -318,28 +364,32 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D_mpio_select_write(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *type_info,
-    hsize_t mpi_buf_count, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space)
+H5D_mpio_select_write(H5D_io_info_t *io_info,
+		      size_t mpi_buf_count, 
+		      const size_t UNUSED elmt_size,
+		      const H5S_t UNUSED *file_space, 
+		      const H5S_t UNUSED *mem_space,
+		      haddr_t addr,
+                      void UNUSED *pointer,
+		      const void *buf)
 {
-    const H5D_contig_storage_t *store_contig = &(io_info->store->contig);    /* Contiguous storage info for this I/O operation */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5D_mpio_select_write, FAIL)
+    FUNC_ENTER_NOAPI(H5D_mpio_select_write,FAIL);
 
     /*OKAY: CAST DISCARDS CONST QUALIFIER*/
-    H5_CHECK_OVERFLOW(mpi_buf_count, hsize_t, size_t);
-    if(H5F_block_write(io_info->dset->oloc.file, H5FD_MEM_DRAW, store_contig->dset_addr, (size_t)mpi_buf_count, io_info->dxpl_id, io_info->u.wbuf) < 0)
-       HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "can't finish collective parallel write")
+    if(H5F_block_write (io_info->dset->oloc.file, H5FD_MEM_DRAW, addr, mpi_buf_count, io_info->dxpl_id, buf)<0)
+       HGOTO_ERROR(H5E_IO,H5E_WRITEERROR,FAIL,"can't finish collective parallel write");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5D_mpio_select_write() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5D_ioinfo_xfer_mode
+ * Function:	H5D_ioinfo_make_ind
  *
- * Purpose:	Switch to between collective & independent MPI I/O
+ * Purpose:	Switch to MPI independent I/O
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -349,42 +399,42 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_ioinfo_xfer_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist,
-    H5FD_mpio_xfer_t xfer_mode)
+H5D_ioinfo_make_ind(H5D_io_info_t *io_info)
 {
+    H5P_genplist_t *dx_plist;           /* Data transer property list */
     herr_t	ret_value = SUCCEED;	/*return value		*/
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_xfer_mode)
+    FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_make_ind)
+
+    /* Get the dataset transfer property list */
+    if (NULL == (dx_plist = H5I_object(io_info->dxpl_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
-    /* Change the xfer_mode */
-    io_info->dxpl_cache->xfer_mode = xfer_mode;
-    if(H5P_set(dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->dxpl_cache->xfer_mode) < 0)
+    /* Change the xfer_mode to independent, handle the request,
+     * then set xfer_mode before return.
+     */
+    io_info->dxpl_cache->xfer_mode = H5FD_MPIO_INDEPENDENT;
+    if(H5P_set (dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->dxpl_cache->xfer_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set transfer mode")
 
-    /* Change the "single I/O" function pointers */
-    if(xfer_mode == H5FD_MPIO_INDEPENDENT) {
-        /* Set the pointers to the original, non-MPI-specific routines */
-        io_info->io_ops.single_read = io_info->orig.io_ops.single_read;
-        io_info->io_ops.single_write = io_info->orig.io_ops.single_write;
-    } /* end if */
-    else {
-        HDassert(xfer_mode == H5FD_MPIO_COLLECTIVE);
+    /* Set the pointers to the non-MPI-specific routines */
+    io_info->ops.read = H5D_select_read;
+    io_info->ops.write = H5D_select_write;
 
-        /* Set the pointers to the MPI-specific routines */
-        io_info->io_ops.single_read = H5D_mpio_select_read;
-        io_info->io_ops.single_write = H5D_mpio_select_write;
-    } /* end else */
+    /* Indicate that the transfer mode should be restored before returning
+     * to user.
+     */
+    io_info->xfer_mode_changed=TRUE;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_ioinfo_xfer_mode() */
+} /* end H5D_ioinfo_make_ind() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5D_ioinfo_coll_opt_mode
+ * Function:	H5D_ioinfo_make_coll_opt
  *
- * Purpose:	Switch between using collective & independent MPI I/O w/file
- *              set view
+ * Purpose:	Switch to MPI independent I/O with file set view
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -394,21 +444,87 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_ioinfo_coll_opt_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist,
-    H5FD_mpio_collective_opt_t coll_opt_mode)
+H5D_ioinfo_make_coll_opt(H5D_io_info_t *io_info)
 {
+    H5P_genplist_t *dx_plist;           /* Data transer property list */
     herr_t	ret_value = SUCCEED;	/*return value		*/
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_coll_opt_mode)
+    FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_make_coll_opt)
 
-    /* Change the optimal xfer_mode */
-    io_info->dxpl_cache->coll_opt_mode = coll_opt_mode;
-    if(H5P_set(dx_plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &io_info->dxpl_cache->coll_opt_mode) < 0)
+    /* Get the dataset transfer property list */
+    if (NULL == (dx_plist = H5I_object(io_info->dxpl_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
+
+    /* Change the optimial xfer_mode to independent, handle the request,
+     * then set xfer_mode before return.
+     */
+    io_info->dxpl_cache->xfer_opt_mode = H5FD_MPIO_INDIVIDUAL_IO;
+    if(H5P_set (dx_plist, H5D_XFER_IO_XFER_OPT_MODE_NAME, &io_info->dxpl_cache->xfer_opt_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set transfer mode")
 
+    /* Set the pointers to the non-MPI-specific routines */
+    io_info->ops.read  = H5D_mpio_select_read;
+    io_info->ops.write = H5D_mpio_select_write;
+
+    /* Indicate that the transfer mode should be restored before returning
+     * to user.
+     */
+    io_info->xfer_opt_mode_changed = TRUE;
+
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_ioinfo_coll_opt_mode() */
+} /* end H5D_ioinfo_make_coll_opt() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_ioinfo_make_coll
+ *
+ * Purpose:	Switch to MPI collective I/O
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		Friday, August 12, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_ioinfo_make_coll(H5D_io_info_t *io_info)
+{
+    H5P_genplist_t *dx_plist;           /* Data transer property list */
+    herr_t	ret_value = SUCCEED;	/*return value		*/
+
+    FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_make_coll)
+
+    /* Get the dataset transfer property list */
+    if (NULL == (dx_plist = H5I_object(io_info->dxpl_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
+
+    /* Change the xfer_mode to independent, handle the request,
+     * then set xfer_mode before return.
+     */
+    io_info->dxpl_cache->xfer_mode = H5FD_MPIO_COLLECTIVE;
+    if(H5P_set (dx_plist, H5D_XFER_IO_XFER_MODE_NAME, &io_info->dxpl_cache->xfer_mode) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set transfer mode")
+
+    io_info->dxpl_cache->xfer_opt_mode = H5FD_MPIO_COLLECTIVE_IO;
+    if(H5P_set (dx_plist, H5D_XFER_IO_XFER_OPT_MODE_NAME, &io_info->dxpl_cache->xfer_opt_mode) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set transfer mode")
+
+
+    /* Set the pointers to the MPI-specific routines */
+    io_info->ops.read = H5D_mpio_select_read;
+    io_info->ops.write = H5D_mpio_select_write;
+
+    /* Indicate that the transfer mode should _NOT_ be restored before returning
+     * to user.
+     */
+    io_info->xfer_mode_changed=FALSE;
+    io_info->xfer_opt_mode_changed=FALSE;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_ioinfo_make_coll() */
 
 
 /*-------------------------------------------------------------------------
@@ -419,30 +535,29 @@ done:
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Muqun Yang
- *              Monday, Feb. 13th, 2006
+ * Programmer:
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_mpio_get_min_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
-    int *min_chunkf)
+H5D_mpio_get_min_chunk(const H5D_io_info_t *io_info,
+    const H5D_chunk_map_t *fm, int *min_chunkf)
 {
     int num_chunkf;             /* Number of chunks to iterate over */
     int mpi_code;               /* MPI return code */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_mpio_get_min_chunk)
+    FUNC_ENTER_NOAPI_NOINIT(H5D_mpio_get_min_chunk);
 
     /* Get the number of chunks to perform I/O on */
     num_chunkf = H5SL_count(fm->sel_chunks);
 
     /* Determine the minimum # of chunks for all processes */
-    if(MPI_SUCCESS != (mpi_code = MPI_Allreduce(&num_chunkf, min_chunkf, 1, MPI_INT, MPI_MIN, io_info->comm)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Allreduce(&num_chunkf, min_chunkf, 1, MPI_INT, MPI_MIN, io_info->comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Allreduce failed", mpi_code)
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5D_mpio_get_min_chunk() */
 
 
@@ -454,252 +569,221 @@ done:
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Muqun Yang
- *              Monday, Feb. 13th, 2006
+ * Programmer:
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_mpio_get_sum_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
-    int *sum_chunkf)
+H5D_mpio_get_sum_chunk(const H5D_io_info_t *io_info,
+                       const H5D_chunk_map_t *fm, int *sum_chunkf)
 {
     int num_chunkf;             /* Number of chunks to iterate over */
     size_t ori_num_chunkf;
     int mpi_code;               /* MPI return code */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_mpio_get_sum_chunk)
+    FUNC_ENTER_NOAPI_NOINIT(H5D_mpio_get_sum_chunk);
 
     /* Get the number of chunks to perform I/O on */
     num_chunkf = 0;
     ori_num_chunkf = H5SL_count(fm->sel_chunks);
-    H5_ASSIGN_OVERFLOW(num_chunkf, ori_num_chunkf, size_t, int);
+    H5_ASSIGN_OVERFLOW(num_chunkf,ori_num_chunkf,size_t,int);
 
     /* Determine the summation of number of chunks for all processes */
-    if(MPI_SUCCESS != (mpi_code = MPI_Allreduce(&num_chunkf, sum_chunkf, 1, MPI_INT, MPI_SUM, io_info->comm)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Allreduce(&num_chunkf, sum_chunkf, 1, MPI_INT, MPI_SUM, io_info->comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Allreduce failed", mpi_code)
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5D_mpio_get_sum_chunk() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5D_contig_collective_read
+ * Function:	H5D_contig_collective_io
  *
- * Purpose:	Reads directly from contiguous data in file into application
- *              memory using collective I/O.
+ * Purpose:	Wrapper Routine for H5D_inter_collective_io
+                The starting file address of contiguous layout
+                will be calculated and passed to H5D_inter_collective_io routine.
+ *               
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *              Tuesday, March  4, 2008
+ * Programmer:
+ *
+ * Modifications:
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D_contig_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t UNUSED nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t UNUSED *fm)
+H5D_contig_collective_io(H5D_io_info_t *io_info, 
+			 const H5S_t *file_space,
+			 const H5S_t *mem_space,
+			 const void *buf,
+			 hbool_t do_write) 
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI(H5D_contig_collective_read, FAIL)
-
-    /* Sanity check */
-    HDassert(IS_H5FD_MPIO(io_info->dset->oloc.file));
-    HDassert(TRUE == H5P_isa_class(io_info->dxpl_id, H5P_DATASET_XFER));
 
-    /* Call generic internal collective I/O routine */
-    if(H5D_inter_collective_io(io_info, type_info, file_space, mem_space) < 0)
-	HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "couldn't finish shared collective MPI-IO")
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_contig_collective_read() */
+    haddr_t	 addr = HADDR_UNDEF;                  /* Address of dataset (or selection) within file */
+    herr_t       ret_value = SUCCEED;  /* return value */
 
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_contig_collective_write
- *
- * Purpose:	Write directly to contiguous data in file from application
- *              memory using collective I/O.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, March  4, 2008
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5D_contig_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t UNUSED nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t UNUSED *fm)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
+    FUNC_ENTER_NOAPI_NOINIT(H5D_contig_collective_io)
+    assert (IS_H5FD_MPIO(io_info->dset->oloc.file));
 
-    FUNC_ENTER_NOAPI(H5D_contig_collective_write, FAIL)
+    /* Make certain we have the correct type of property list */
+    assert(TRUE==H5P_isa_class(io_info->dxpl_id,H5P_DATASET_XFER));
 
-    /* Sanity check */
-    HDassert(IS_H5FD_MPIO(io_info->dset->oloc.file));
-    HDassert(TRUE == H5P_isa_class(io_info->dxpl_id, H5P_DATASET_XFER));
+    /* Get the base address of the contiguous dataset */
+    if(io_info->dset->shared->layout.type == H5D_CONTIGUOUS)
+       addr = H5D_contig_get_addr(io_info->dset);
 
-    /* Call generic internal collective I/O routine */
-    if(H5D_inter_collective_io(io_info, type_info, file_space, mem_space) < 0)
-	HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "couldn't finish shared collective MPI-IO")
+    if(H5D_inter_collective_io(io_info,file_space,mem_space,addr,buf,do_write)<0)
+	HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL,"couldn't finish shared collective MPI-IO");
+      
+ done: 
 
-done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_contig_collective_write() */
+} /* end H5D_contig_collective_io */
 
 
 /*-------------------------------------------------------------------------
  * Function:	H5D_chunk_collective_io
  *
  * Purpose:	Routine for 
- *              1) choose an IO option: 
- *                    a) One collective IO defined by one MPI derived datatype to link through all chunks
- *              or    b) multiple chunk IOs,to do MPI-IO for each chunk, the IO mode may be adjusted 
- *                       due to the selection pattern for each chunk.
+                1) choose an IO option: 
+		      a) One collective IO defined by one MPI derived datatype to link through all chunks
+		or    b) multiple chunk IOs,to do MPI-IO for each chunk, the IO mode may be adjusted 
+                         due to the selection pattern for each chunk.
  *              For option a)
- *                      1. Sort the chunk address, obtain chunk info according to the sorted chunk address
- *                      2. Build up MPI derived datatype for each chunk
- *                      3. Build up the final MPI derived datatype
- *                      4. Set up collective IO property list
- *                      5. Do IO
+			1. Sort the chunk address, obtain chunk info according to the sorted chunk address
+                        2. Build up MPI derived datatype for each chunk
+                        3. Build up the final MPI derived datatype
+                        4. Set up collective IO property list
+                        5. Do IO
  *             For option b)
- *                      1. Use MPI_gather and MPI_Bcast to obtain information of *collective/independent/none*
- *                         IO mode for each chunk of the selection
- *                      2. Depending on whether the IO mode is collective or independent or none,
- *                         Create either MPI derived datatype for each chunk to do collective IO or 
- *                         just do independent IO or independent IO with file set view
- *                      3. Set up collective IO property list for collective mode
- *                      4. DO IO               
+                        1. Use MPI_gather and MPI_Bcast to obtain information of *collective/independent/none*
+                           IO mode for each chunk of the selection
+                        2. Depending on whether the IO mode is collective or independent or none,
+                           Create either MPI derived datatype for each chunk to do collective IO or 
+                           just do independent IO or independent IO with file set view
+                        3. Set up collective IO property list for collective mode
+                        4. DO IO               
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Muqun Yang
- *              Monday, Feb. 13th, 2006
+ * Programmer:
+ *
+ * Modifications:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
-H5D_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    H5D_chunk_map_t *fm)
+herr_t 
+H5D_chunk_collective_io(H5D_io_info_t *io_info,H5D_chunk_map_t *fm,const void *buf, hbool_t do_write) 
 {
-    H5P_genplist_t *dx_plist;           /* Pointer to DXPL */
+
+    int               io_option = H5D_MULTI_CHUNK_IO_MORE_OPT;
+    int               sum_chunk = 0,mpi_size;
+    unsigned          one_link_chunk_io_threshold;
+    H5P_genplist_t    *plist; 
     H5FD_mpio_chunk_opt_t chunk_opt_mode;
-    int         io_option = H5D_MULTI_CHUNK_IO_MORE_OPT;
-    int         sum_chunk = -1;
+
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
-    htri_t      temp_not_link_io = FALSE;
+    htri_t            check_prop,temp_not_link_io = FALSE;
+    int               new_value;
 #endif
-    herr_t      ret_value = SUCCEED;    
+    herr_t            ret_value = SUCCEED;    
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_collective_io)
 
-    /* Sanity checks */
-    HDassert(io_info);
-    HDassert(io_info->using_mpi_vfd);
-    HDassert(type_info);
-    HDassert(fm);
+    assert (IS_H5FD_MPIO(io_info->dset->oloc.file));
     
     /* Obtain the data transfer properties */
-    if(NULL == (dx_plist = H5I_object(io_info->dxpl_id)))
+    if(NULL == (plist = H5I_object(io_info->dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
-
+    
     /* Check the optional property list on what to do with collective chunk IO. */
-    chunk_opt_mode = (H5FD_mpio_chunk_opt_t)H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME);
+    chunk_opt_mode=(H5FD_mpio_chunk_opt_t)H5P_peek_unsigned(plist,H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME);
+    
     if(chunk_opt_mode == H5FD_MPIO_CHUNK_ONE_IO)
-        io_option = H5D_ONE_LINK_CHUNK_IO;      /*no opt*/
+        io_option = H5D_ONE_LINK_CHUNK_IO;/*no opt*/
     else if(chunk_opt_mode == H5FD_MPIO_CHUNK_MULTI_IO)
-        io_option = H5D_MULTI_CHUNK_IO;         /*no opt */
+        io_option = H5D_MULTI_CHUNK_IO;/*no opt */
     else {
-        unsigned one_link_chunk_io_threshold;   /* Threshhold to use single collective I/O for all chunks */
-        int mpi_size;                   /* Number of processes in MPI job */
-
-        if(H5D_mpio_get_sum_chunk(io_info, fm, &sum_chunk) < 0)
+       if(H5D_mpio_get_sum_chunk(io_info,fm,&sum_chunk)<0)   
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes"); 
-        if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
-            HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size")
+       if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file))<0)
+	 HGOTO_ERROR (H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size");
     
-        one_link_chunk_io_threshold = H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME);
+       if(NULL == (plist = H5I_object(io_info->dxpl_id)))
+         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
+
+       one_link_chunk_io_threshold =H5P_peek_unsigned(plist,H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME);
 
-        /* step 1: choose an IO option */
-        /* If the average number of chunk per process is greater than a threshold, we will do one link chunked IO. */
-        if((unsigned)sum_chunk / mpi_size >= one_link_chunk_io_threshold)
+      /* step 1: choose an IO option */
+      /* If the average number of chunk per process is greater than a threshold, we will do one link chunked IO. */
+       if((unsigned)sum_chunk/mpi_size >= one_link_chunk_io_threshold)
             io_option = H5D_ONE_LINK_CHUNK_IO_MORE_OPT;
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
-        else
-            temp_not_link_io = TRUE;
-#endif
-   } /* end else */
-
-#ifndef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
-    if(io_option == H5D_ONE_LINK_CHUNK_IO)
-        io_option = H5D_MULTI_CHUNK_IO; /* We can not do this with one chunk IO. */
-    if(io_option == H5D_ONE_LINK_CHUNK_IO_MORE_OPT)
-        io_option = H5D_MULTI_CHUNK_IO_MORE_OPT;
+       else
+           temp_not_link_io = TRUE;
 #endif
+   }
 
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
-{
-    htri_t            check_prop;
-    int               new_value;
-
     /*** Test collective chunk user-input optimization APIs. ***/
-    check_prop = H5Pexist(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_LINK_HARD_NAME);
+    check_prop = H5Pexist(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_LINK_HARD_NAME);
     if(check_prop > 0) {
         if(io_option == H5D_ONE_LINK_CHUNK_IO) {
-            new_value = 0;
-            if(H5Pset(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_LINK_HARD_NAME, &new_value) < 0)
-                HGOTO_ERROR(H5E_IO, H5E_CANTSET, FAIL, "unable to set property value")
-        } /* end if */
-    } /* end if */
-    check_prop = H5Pexist(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME);
+          new_value = 0;
+          if(H5Pset(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_LINK_HARD_NAME,&new_value)<0)
+            HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to get property value");
+        }
+    }
+    check_prop = H5Pexist(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME);
     if(check_prop > 0) {
-        if(io_option == H5D_MULTI_CHUNK_IO) {
-            new_value = 0;
-            if(H5Pset(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME, &new_value) < 0)
-                HGOTO_ERROR(H5E_IO, H5E_CANTSET, FAIL, "unable to set property value")
-        } /* end if */
-    } /* end if */
-    check_prop = H5Pexist(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME);
+      if(io_option == H5D_MULTI_CHUNK_IO) {
+         new_value = 0;
+         if(H5Pset(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME,&new_value)<0)
+            HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to get property value");
+      }
+    }
+    check_prop = H5Pexist(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME);
     if(check_prop > 0) {
-        if(io_option == H5D_ONE_LINK_CHUNK_IO_MORE_OPT) {
-            new_value = 0;
-            if(H5Pset(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME, &new_value) < 0)
-                HGOTO_ERROR(H5E_IO, H5E_CANTSET, FAIL, "unable to set property value")
-        } /* end if */
-    } /* end if */
-    check_prop = H5Pexist(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME);
+      if(io_option == H5D_ONE_LINK_CHUNK_IO_MORE_OPT) {
+          new_value = 0;
+         if(H5Pset(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME,&new_value)<0)
+            HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to get property value");
+      }
+    }
+    check_prop = H5Pexist(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME);
     if(check_prop > 0) {
-        if(temp_not_link_io) {
-            new_value = 0;
-            if(H5Pset(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME, &new_value) < 0)
-                HGOTO_ERROR(H5E_IO, H5E_CANTSET, FAIL, "unable to set property value")
-        } /* end if */
-    } /* end if */
-}
+       if(temp_not_link_io){
+          new_value = 0;
+          if(H5Pset(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME,&new_value)<0)
+              HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to get property value");
+          }
+    }
+#endif
+
+#ifndef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
+    if(io_option == H5D_ONE_LINK_CHUNK_IO )
+        io_option = H5D_MULTI_CHUNK_IO ;/* We can not do this with one chunk IO. */
+    if(io_option == H5D_ONE_LINK_CHUNK_IO_MORE_OPT)
+        io_option = H5D_MULTI_CHUNK_IO_MORE_OPT;
 #endif
 
     /* step 2:  Go ahead to do IO.*/
-#ifdef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
     if(io_option == H5D_ONE_LINK_CHUNK_IO || io_option == H5D_ONE_LINK_CHUNK_IO_MORE_OPT) {
-        if(H5D_link_chunk_collective_io(io_info, type_info, fm, sum_chunk) < 0)
-            HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish linked chunk MPI-IO")
-    } /* end if */
-    else
-#endif /* H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS */
-    if(io_option == H5D_MULTI_CHUNK_IO) {
-        if(H5D_multi_chunk_collective_io_no_opt(io_info, type_info, fm, dx_plist) < 0)
-            HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish multiple chunk MPI-IO")
-    } /* end if */
+      if(H5D_link_chunk_collective_io(io_info,fm,buf,do_write,sum_chunk)<0)
+	HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL,"couldn't finish linked chunk MPI-IO");
+    }
+    else if(io_option == H5D_MULTI_CHUNK_IO) {
+      if(H5D_multi_chunk_collective_io_no_opt(io_info,fm,buf,do_write)<0)
+        HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL,"couldn't finish multiple chunk MPI-IO");
+    }
     else { /*multiple chunk IOs with opt */
-        if(H5D_multi_chunk_collective_io(io_info, type_info, fm, dx_plist) < 0)
-            HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish optimized multiple chunk MPI-IO")
-    } /* end else */
+      if(H5D_multi_chunk_collective_io(io_info,fm,buf,do_write)<0)
+        HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL,"couldn't finish multiple chunk MPI-IO");
+    }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -707,583 +791,459 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5D_chunk_collective_read
- *
- * Purpose:	Reads directly from chunks in file into application memory
- *              using collective I/O.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, March  4, 2008
+ * Function:	H5D_link_chunk_collective_io
  *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5D_chunk_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
-    H5D_chunk_map_t *fm)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI(H5D_chunk_collective_read, FAIL)
+ * Purpose:	Routine for one collective IO with one MPI derived datatype to link with all chunks
 
-    /* Call generic selection operation */
-    if(H5D_chunk_collective_io(io_info, type_info, fm) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, FAIL, "read error")
+			1. Sort the chunk address and chunk info
+                        2. Build up MPI derived datatype for each chunk
+                        3. Build up the final MPI derived datatype
+			4. Use common collective IO routine to do MPI-IO 
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_chunk_collective_read() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_chunk_collective_write
- *
- * Purpose:	Write directly to chunks in file from application memory
- *              using collective I/O.
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *              Tuesday, March  4, 2008
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5D_chunk_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
-    H5D_chunk_map_t *fm)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI(H5D_chunk_collective_write, FAIL)
-
-    /* Call generic selection operation */
-    if(H5D_chunk_collective_io(io_info, type_info, fm) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_chunk_collective_write() */
-
-#ifdef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_link_chunk_collective_io
- *
- * Purpose:	Routine for one collective IO with one MPI derived datatype to link with all chunks
- *
- *                      1. Sort the chunk address and chunk info
- *                      2. Build up MPI derived datatype for each chunk
- *                      3. Build up the final MPI derived datatype
- *                      4. Use common collective IO routine to do MPI-IO 
- *
- * Return:	Non-negative on success/Negative on failure
+ * Programmer:
  *
- * Programmer:	Muqun Yang
- *              Monday, Feb. 13th, 2006
+ * Modifications:
  *
  *-------------------------------------------------------------------------
  */
+
 static herr_t
-H5D_link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    H5D_chunk_map_t *fm, int sum_chunk)
+H5D_link_chunk_collective_io(H5D_io_info_t *io_info,H5D_chunk_map_t *fm,const void *buf, hbool_t do_write,int sum_chunk)
 {
-    H5D_chunk_addr_info_t *chunk_addr_info_array = NULL;
-    hbool_t mbt_is_derived = FALSE;
-    hbool_t mft_is_derived = FALSE;
-    MPI_Datatype chunk_final_mtype;         /* Final memory MPI datatype for all chunks with seletion */
-    MPI_Datatype chunk_final_ftype;         /* Final file MPI datatype for all chunks with seletion */
-    H5D_storage_t ctg_store;                /* Storage info for "fake" contiguous dataset */
-    size_t              total_chunks;
-    haddr_t            *total_chunk_addr_array = NULL;
-    MPI_Datatype       *chunk_mtype = NULL;
-    MPI_Datatype       *chunk_ftype = NULL;
-    MPI_Aint           *chunk_disp_array = NULL;
-    MPI_Aint           *chunk_mem_disp_array = NULL;
-    int                *blocklen = NULL;
-    int                 mpi_code;           /* MPI return code */ 
-    herr_t              ret_value = SUCCEED;    
-    
-    FUNC_ENTER_NOAPI_NOINIT(H5D_link_chunk_collective_io)
-
-    /* Get the sum # of chunks, if not already available */
-    if(sum_chunk < 0) {
-        if(H5D_mpio_get_sum_chunk(io_info, fm, &sum_chunk) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes"); 
-    } /* end if */
-
-    /* Retrieve total # of chunks in dataset */
-    H5_ASSIGN_OVERFLOW(total_chunks, fm->total_chunks, hsize_t, size_t);
-
-    /* Handle special case when dataspace dimensions only allow one chunk in
-     *  the dataset.  [This sometimes is used by developers who want the
-     *  equivalent of compressed contiguous datasets - QAK]
-     */
-    if(total_chunks == 1) {
-        H5D_storage_t chk_store;        /* Temporary storage info for chunk address lookup */
-        hsize_t coords[H5O_LAYOUT_NDIMS];   /* Coordinates of chunk in file dataset's dataspace */
-        H5SL_node_t *chunk_node;        /* Pointer to chunk node for selection */
-        H5S_t *fspace;                  /* Dataspace describing chunk & selection in it */
-        H5S_t *mspace;                  /* Dataspace describing selection in memory corresponding to this chunk */
-
-        /* Initialize the chunk coordinates */
-        /* (must be all zero, since there's only one chunk) */
-        HDmemset(coords, 0, sizeof(coords));
-
-        /* Look up address of chunk */
-        io_info->store = &chk_store;
-        chk_store.chunk.offset = coords;
-        chk_store.chunk.index  = 0;
-        if(HADDR_UNDEF == (ctg_store.contig.dset_addr = H5D_istore_get_addr(io_info, NULL)))
-            HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk info from skipped list")
+      size_t	       src_type_size;		/*size of source type	*/
+      size_t	       dst_type_size;	        /*size of destination type*/
+      hsize_t          mpi_buf_extra_offset;
+      hsize_t          mpi_file_extra_offset;
+      size_t           mpi_buf_count;
+      size_t           mpi_file_count;
+      hbool_t	       mbt_is_derived=0,      /* Whether the buffer (memory) type is derived and needs to be free'd */
+		       mft_is_derived=0;      /* Whether the file type is derived and needs to be free'd */  
+     
+      int              mpi_size,mpi_code;              /* MPI return code */ 
+
+      int               i,num_chunk=0,total_chunks;
+      size_t            ori_num_chunk;
+      hsize_t           ori_total_chunks;
+      haddr_t           chunk_base_addr;
+      haddr_t*          total_chunk_addr_array=NULL;
+      MPI_Datatype     *chunk_mtype=NULL;
+      MPI_Datatype     *chunk_ftype=NULL;
+      MPI_Datatype      chunk_final_mtype;
+      MPI_Datatype      chunk_final_ftype;
+      MPI_Aint         *chunk_disp_array=NULL;
+      MPI_Aint         *chunk_mem_disp_array=NULL;
+      int              *blocklen=NULL;
+      int               blocklen_value;
+      int               actual_bsearch_coll_chunk_threshold;
+      int               bsearch_coll_chunk_threshold;
+      int               many_chunk_opt = 0;
+
+      H5D_common_coll_info_t coll_info;
+      H5D_chunk_addr_info_t*  chunk_addr_info_array=NULL;
+
+      herr_t            ret_value = SUCCEED;    
+      
+      FUNC_ENTER_NOAPI_NOINIT(H5D_link_chunk_collective_io)
+      ori_total_chunks = fm->total_chunks;
+      H5_ASSIGN_OVERFLOW(total_chunks,ori_total_chunks,hsize_t,int);
+
+    /* Handle with a special case when only one chunk is covered by all processes */
+    if(total_chunks == 1){
+        H5SL_node_t *chunk_node;
+        H5D_chunk_info_t *chunk_info;
+        H5D_storage_t  store;
  
-        /* Check for this process having selection in this chunk */
         chunk_node = H5SL_first(fm->sel_chunks);
 	if(chunk_node == NULL) {
-            /* Set the dataspace info for I/O to NULL, this process doesn't have any I/O to perform */
-            fspace = mspace = NULL;
-	} /* end if */
+            if(H5D_istore_chunkmap(io_info, &chunk_base_addr, fm->down_chunks) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address");
+            if(H5D_inter_collective_io(io_info,NULL,NULL,chunk_base_addr,buf,do_write)<0)
+                HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't finish shared collective MPI-IO");
+	}
 	else {
-            H5D_chunk_info_t *chunk_info;
-
-            /* Get the chunk info, for the selection in the chunk */
-            if(NULL == (chunk_info = H5SL_item(chunk_node)))
-                HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk info from skipped list")
-
-            /* Set the dataspace info for I/O */
-            fspace = chunk_info->fspace;
-            mspace = chunk_info->mspace;
-	} /* end else */
-
-        /* Set up the base storage address for this chunk */
-        io_info->store = &ctg_store;
+            if(NULL ==(chunk_info = H5SL_item(chunk_node)))
+                HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list");
+            io_info->store = &store;
+            store.chunk.offset = chunk_info->coords;
+            store.chunk.index  = chunk_info->index;
 
+            if(HADDR_UNDEF==(chunk_base_addr = H5D_istore_get_addr(io_info,NULL)))
+                HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list");
+	
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"before inter_collective_io for total chunk = 1 \n");
+  if(H5DEBUG(D))
+   HDfprintf(H5DEBUG(D),"before inter_collective_io for total chunk = 1 \n");
 #endif
+            if(H5D_inter_collective_io(io_info,chunk_info->fspace,chunk_info->mspace,chunk_base_addr,buf,do_write)<0)
+                HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't finish shared collective MPI-IO");
+	}
+	goto done;
+      }
 
-        /* Perform I/O */
-        if(H5D_inter_collective_io(io_info, type_info, fspace, mspace) < 0)
-            HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't finish shared collective MPI-IO")
-    } /* end if */
-    else {
-        size_t mpi_buf_count;   /* Number of MPI types */
-        size_t num_chunk;       /* Number of chunks for this process */
-        size_t u;               /* Local index variable */
-
-        /* Get the number of chunks with a selection */
-        num_chunk = H5SL_count(fm->sel_chunks);
-        H5_CHECK_OVERFLOW(num_chunk, size_t, int);
+      /* Allocate chunking information */
+      ori_num_chunk        = H5SL_count(fm->sel_chunks);
+      H5_ASSIGN_OVERFLOW(num_chunk,ori_num_chunk,size_t,int);
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"total_chunks = %Zu, num_chunk = %Zu\n", total_chunks, num_chunk);
+  if(H5DEBUG(D))
+    HDfprintf(H5DEBUG(D),"total_chunks = %d\n",(int)total_chunks);
 #endif
-             
-        /* Set up MPI datatype for chunks selected */
-        if(num_chunk) {
-            hsize_t mpi_mem_extra_offset;       /* Extra offset for memory MPI datatype */
-            hsize_t mpi_file_extra_offset;      /* Extra offset for file MPI datatype */
-            size_t mpi_mem_count;               /* Memory MPI datatype count */
-            size_t mpi_file_count;              /* File MPI datatype count */
-            hbool_t locl_mbt_is_derived = FALSE,     /* Whether the buffer (memory) type is derived and needs to be free'd */
-                    local_mft_is_derived = FALSE;     /* Whether the file type is derived and needs to be free'd */  
-            int blocklen_value;                 /* Placeholder for array fill */
-
-            /* Allocate chunking information */
-            chunk_addr_info_array= H5MM_malloc(num_chunk * sizeof(H5D_chunk_addr_info_t));
-            chunk_mtype          = H5MM_malloc(num_chunk * sizeof(MPI_Datatype));
-            chunk_ftype          = H5MM_malloc(num_chunk * sizeof(MPI_Datatype));
-            chunk_disp_array     = H5MM_malloc(num_chunk * sizeof(MPI_Aint));
-            chunk_mem_disp_array = H5MM_calloc(num_chunk * sizeof(MPI_Aint));
-            blocklen             = H5MM_malloc(num_chunk * sizeof(int));
+         
+      if(num_chunk == 0)
+          total_chunk_addr_array = H5MM_malloc(sizeof(haddr_t)*total_chunks);
+      else
+      {
+	chunk_addr_info_array= H5MM_malloc(num_chunk*sizeof(H5D_chunk_addr_info_t));
+	chunk_mtype          = H5MM_malloc(num_chunk*sizeof(MPI_Datatype));
+	chunk_ftype          = H5MM_malloc(num_chunk*sizeof(MPI_Datatype));
+	chunk_disp_array     = H5MM_malloc(num_chunk*sizeof(MPI_Aint));
+	chunk_mem_disp_array = H5MM_calloc(num_chunk*sizeof(MPI_Aint));
+	blocklen             = H5MM_malloc(num_chunk*sizeof(int));
+      }
+
+      /* Obtain information to do collective IO,
+         in order to do collective IO, no datatype conversion should happen. */
+      if((src_type_size = H5T_get_size(io_info->dset->shared->type))==0)
+	HGOTO_ERROR(H5E_DATATYPE, H5E_BADSIZE, FAIL, "datatype size invalid");
+      dst_type_size = src_type_size;
+
+      bsearch_coll_chunk_threshold  = H5D_ALL_CHUNK_ADDR_THRES_COL;
+
+      if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file))<0)
+	 HGOTO_ERROR (H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size");
+
+      /* Calculate the actual threshold to obtain all chunk addresses collectively 
+         The bigger this number is, the more possible the use of obtaining chunk address collectively. */
+      /* For non-optimization one-link IO, 
+         actual bsearch threshold is always 0,
+         we would always want to obtain the chunk addresses individually
+         for each process. */
+      actual_bsearch_coll_chunk_threshold = sum_chunk*100/(total_chunks*mpi_size);
+
+      if((actual_bsearch_coll_chunk_threshold > bsearch_coll_chunk_threshold)
+         &&(sum_chunk/mpi_size >= H5D_ALL_CHUNK_ADDR_THRES_COL_NUM))
+	 many_chunk_opt = H5D_OBTAIN_ALL_CHUNK_ADDR_COL;
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
+  if(H5DEBUG(D))
     HDfprintf(H5DEBUG(D),"before sorting the chunk address \n");
 #endif
-            /* Sort the chunk address */
-            if(H5D_sort_chunk(io_info, fm, chunk_addr_info_array, sum_chunk) < 0)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to sort chunk address")
-            ctg_store.contig.dset_addr = chunk_addr_info_array[0].chunk_addr;
+
+      /* Sort the chunk address 
+         when chunk optimization selection is either H5D_OBTAIN_*/
+
+      if(num_chunk == 0){ /* special case: this process doesn't select anything */
+         if(H5D_istore_chunkmap(io_info, total_chunk_addr_array, fm->down_chunks)<0)
+             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address");
+         chunk_base_addr = total_chunk_addr_array[0];
+      }
+ 
+      else {
+         if(H5D_sort_chunk(io_info,fm,chunk_addr_info_array,many_chunk_opt)<0)
+        	 HGOTO_ERROR (H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to sort chunk address");
+         chunk_base_addr = chunk_addr_info_array[0].chunk_addr;
+      }
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
+  if(H5DEBUG(D))
     HDfprintf(H5DEBUG(D),"after sorting the chunk address \n");
 #endif
-
-            /* Obtain MPI derived datatype from all individual chunks */ 
-            for(u = 0; u < num_chunk; u++) {
-                /* Disk MPI derived datatype */
-                if(H5S_mpio_space_type(chunk_addr_info_array[u].chunk_info.fspace,
-                        type_info->src_type_size, &chunk_ftype[u], &mpi_file_count,
-                        &mpi_file_extra_offset, &local_mft_is_derived) < 0)
-                    HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI file type")
-
-                /* Buffer MPI derived datatype */
-                if(H5S_mpio_space_type(chunk_addr_info_array[u].chunk_info.mspace,
-                        type_info->dst_type_size, &chunk_mtype[u], &mpi_mem_count,
-                        &mpi_mem_extra_offset, &locl_mbt_is_derived) < 0)
-                    HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI buf type")
-                   
-                /* Chunk address relative to the first chunk */
-                chunk_addr_info_array[u].chunk_addr -= ctg_store.contig.dset_addr;
-                H5_ASSIGN_OVERFLOW(chunk_disp_array[u], chunk_addr_info_array[u].chunk_addr, haddr_t, MPI_Aint);
-            } /* end for */
-
-            /* Initialize the buffer with the constant value 1 */
-            blocklen_value = 1;
-            H5V_array_fill(blocklen, &blocklen_value, sizeof(int), num_chunk);
-
-            /* Create final MPI derived datatype for the file */
-            if(MPI_SUCCESS != (mpi_code = MPI_Type_struct((int)num_chunk, blocklen, chunk_disp_array, chunk_ftype, &chunk_final_ftype)))
-                HMPI_GOTO_ERROR(FAIL, "MPI_Type_struct failed", mpi_code)
-            if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&chunk_final_ftype)))
-                HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code)
-
-            /* Create final MPI derived datatype for memory */
-            if(MPI_SUCCESS != (mpi_code = MPI_Type_struct(num_chunk, blocklen, chunk_mem_disp_array, chunk_mtype, &chunk_final_mtype)))
-                HMPI_GOTO_ERROR(FAIL, "MPI_Type_struct failed", mpi_code)
-            if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&chunk_final_mtype)))
-                HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code)
-
-            /* Free the file & memory MPI datatypes for each chunk */
-            for(u = 0; u < num_chunk; u++) {
-                if(MPI_SUCCESS != (mpi_code = MPI_Type_free(chunk_mtype + u)))
-                    HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
-
-                if(MPI_SUCCESS != (mpi_code = MPI_Type_free(chunk_ftype + u)))
-                    HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
-            } /* end for */
-
-            /* buffer, file derived datatypes should be true */
-            mbt_is_derived = TRUE;
-            mft_is_derived = TRUE;
-            mpi_buf_count  = (size_t)1;
-        } /* end if */
-        else {      /* no selection at all for this process */
-            /* Allocate chunking information */
-            total_chunk_addr_array = H5MM_malloc(sizeof(haddr_t) * total_chunks);
-
-            /* Retrieve chunk address map */
-            if(H5D_istore_chunkmap(io_info, total_chunk_addr_array, fm->down_chunks) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address")
-
-            /* Get chunk with lowest address */
-            ctg_store.contig.dset_addr = HADDR_MAX;
-            for(u = 0; u < total_chunks; u++)
-                if(total_chunk_addr_array[u] < ctg_store.contig.dset_addr)
-                    ctg_store.contig.dset_addr = total_chunk_addr_array[u];
-            HDassert(ctg_store.contig.dset_addr != HADDR_MAX);
-
-            /* Set the MPI datatype */
-            chunk_final_ftype = MPI_BYTE;
-            chunk_final_mtype = MPI_BYTE;
-          
-            /* buffer, file derived datatypes should be true */
-            mpi_buf_count  = (size_t)0;
-        } /* end else */
+      
+      /* Obtain MPI derived datatype from all individual chunks */ 
+      for ( i = 0; i < num_chunk; i++) {
+	  /* Disk MPI derived datatype */
+          if(H5S_mpio_space_type(chunk_addr_info_array[i].chunk_info.fspace,src_type_size,&chunk_ftype[i],
+				    &mpi_file_count,&mpi_file_extra_offset,&mft_is_derived)<0)
+	       	HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't create MPI file type");
+
+	  /* Buffer MPI derived datatype */
+          if(H5S_mpio_space_type(chunk_addr_info_array[i].chunk_info.mspace,dst_type_size,&chunk_mtype[i],
+                                       &mpi_buf_count,&mpi_buf_extra_offset,&mbt_is_derived)<0)
+	       	HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't create MPI buf type");
+           
+          /* Chunk address relative to the first chunk */
+	  chunk_addr_info_array[i].chunk_addr -= chunk_base_addr;
+          H5_ASSIGN_OVERFLOW(chunk_disp_array[i],chunk_addr_info_array[i].chunk_addr,haddr_t,MPI_Aint);
+      }
+
+      blocklen_value = 1;
+      if(num_chunk){
+	
+        /* initialize the buffer with the constant value 1; this algo. is very fast. */
+	H5V_array_fill(blocklen,&blocklen_value,sizeof(int),(size_t)num_chunk);
+
+      /* Create final MPI derived datatype */
+	if(MPI_SUCCESS != (mpi_code = MPI_Type_struct(num_chunk,blocklen,chunk_disp_array,chunk_ftype,&chunk_final_ftype)))
+	   HMPI_GOTO_ERROR(FAIL, "MPI_Type_struct failed", mpi_code);
+	if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&chunk_final_ftype)))
+	   HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code);
+
+	if(MPI_SUCCESS != (mpi_code = MPI_Type_struct(num_chunk,blocklen,chunk_mem_disp_array,chunk_mtype,&chunk_final_mtype)))
+	   HMPI_GOTO_ERROR(FAIL, "MPI_Type_struct failed", mpi_code);
+	if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&chunk_final_mtype)))
+	   HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code);
+
+	for ( i = 0; i< num_chunk;i++){
+	  if (MPI_SUCCESS != (mpi_code= MPI_Type_free( chunk_mtype+i )))
+            HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code);
+
+	  if (MPI_SUCCESS != (mpi_code= MPI_Type_free( chunk_ftype+i )))
+            HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code);
+	}
+
+	/* buffer, file derived datatypes should be true */
+	coll_info.mbt_is_derived = 1;
+	coll_info.mft_is_derived = 1;
+	coll_info.mpi_buf_count  = 1;
+	coll_info.chunk_addr     = chunk_base_addr;
+
+      }
+
+      else {/* no selection at all for this process */
+	chunk_final_ftype = MPI_BYTE;
+	chunk_final_mtype = MPI_BYTE;
+	
+	/* buffer, file derived datatypes should be true */
+	coll_info.mbt_is_derived = 0;
+	coll_info.mft_is_derived = 0;
+	coll_info.mpi_buf_count  = 0;
+	coll_info.chunk_addr     = chunk_base_addr;
+      }
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
+  if(H5DEBUG(D))
     HDfprintf(H5DEBUG(D),"before coming to final collective IO\n");
 #endif
 
-        /* Set up the base storage address for this chunk */
-        io_info->store = &ctg_store;
-
-        /* Perform final collective I/O operation */
-        if(H5D_final_collective_io(io_info, type_info, mpi_buf_count, &chunk_final_ftype, &chunk_final_mtype) < 0)
-            HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish MPI-IO")
-    } /* end else */
+      if(H5D_final_collective_io(io_info,&chunk_final_ftype,&chunk_final_mtype,&coll_info,buf,do_write)<0)
+	HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL,"couldn't finish MPI-IO");
 
 done:
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"before freeing memory inside H5D_link_collective_io ret_value = %d\n", ret_value);
+  if(H5DEBUG(D))
+    HDfprintf(H5DEBUG(D),"before freeing memory inside  H5D_link_collective_io ret_value = %d\n",ret_value);
 #endif
-    if(total_chunk_addr_array)
-        H5MM_xfree(total_chunk_addr_array);
-    if(chunk_addr_info_array)
-        H5MM_xfree(chunk_addr_info_array);
-    if(chunk_mtype)
-        H5MM_xfree(chunk_mtype);
-    if(chunk_ftype)
-        H5MM_xfree(chunk_ftype);
-    if(chunk_disp_array)
-        H5MM_xfree(chunk_disp_array);
-    if(chunk_mem_disp_array)
-        H5MM_xfree(chunk_mem_disp_array);
-    if(blocklen)
-        H5MM_xfree(blocklen);
-
-    /* Free the MPI buf and file types, if they were derived */
-    if(mbt_is_derived && MPI_SUCCESS != (mpi_code = MPI_Type_free(&chunk_final_mtype)))
-        HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
-    if(mft_is_derived && MPI_SUCCESS != (mpi_code = MPI_Type_free(&chunk_final_ftype)))
-        HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
-
-    FUNC_LEAVE_NOAPI(ret_value)
+     if (fm->total_chunks != 1) {
+       if(num_chunk == 0) HDfree(total_chunk_addr_array);
+       else {
+          HDfree(chunk_addr_info_array);
+	  HDfree(chunk_mtype);
+	  HDfree(chunk_ftype);
+	  HDfree(chunk_disp_array);
+	  HDfree(chunk_mem_disp_array);
+	  HDfree(blocklen);
+        }
+      }
+      FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_link_chunk_collective_io */
-#endif /* H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS */
 
 
 /*-------------------------------------------------------------------------
  * Function:	H5D_multi_chunk_collective_io
  *
  * Purpose:	To do IO per chunk according to IO mode(collective/independent/none)
- *
- *              1. Use MPI_gather and MPI_Bcast to obtain IO mode in each chunk(collective/independent/none)
- *              2. Depending on whether the IO mode is collective or independent or none,
- *                 Create either MPI derived datatype for each chunk or just do independent IO
- *              3. Use common collective IO routine to do MPI-IO               
+
+                1. Use MPI_gather and MPI_Bcast to obtain IO mode in each chunk(collective/independent/none)
+                2. Depending on whether the IO mode is collective or independent or none,
+                   Create either MPI derived datatype for each chunk or just do independent IO
+                3. Use common collective IO routine to do MPI-IO               
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Muqun Yang
- *              Monday, Feb. 13th, 2006
+ * Programmer:
+ *
+ * Modifications:
  *
  *-------------------------------------------------------------------------
  */
 static herr_t 
-H5D_multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist)
+H5D_multi_chunk_collective_io(H5D_io_info_t *io_info,H5D_chunk_map_t *fm,const void *buf, hbool_t do_write) 
 {
-    H5D_t              *dataset = io_info->dset;/* Local pointer to dataset info */
-    H5D_io_info_t       ctg_io_info;          /* Contiguous I/O info object */
-    H5D_storage_t       ctg_store;            /* Chunk storage information as contiguous dataset */
-    H5D_io_info_t       cpt_io_info;          /* Compact I/O info object */
-    H5D_storage_t       cpt_store;            /* Chunk storage information as compact dataset */
-    hbool_t             cpt_dirty;            /* Temporary placeholder for compact storage "dirty" flag */
-    uint8_t            *chunk_io_option = NULL;
-    haddr_t            *chunk_addr = NULL;
-    H5D_storage_t       store;                /* union of EFL and chunk pointer in file space */
-    H5FD_mpio_xfer_t    last_xfer_mode = H5FD_MPIO_COLLECTIVE; /* Last parallel transfer for this request (H5D_XFER_IO_XFER_MODE_NAME) */
-    H5FD_mpio_collective_opt_t last_coll_opt_mode = H5FD_MPIO_COLLECTIVE_IO; /* Last parallel transfer with independent IO or collective IO with this mode */
-    size_t              total_chunk;          /* Total # of chunks in dataset */
+      unsigned          i, total_chunk;
+      hsize_t           ori_total_chunk;
+      uint8_t          *chunk_io_option;
+
+      H5SL_node_t      *chunk_node;           /* Current node in chunk skip list */
+      H5D_chunk_info_t *chunk_info=NULL;
+      haddr_t          *chunk_addr;
+      H5D_storage_t     store;                /* union of EFL and chunk pointer in file space */
+      hbool_t           select_chunk;
+      hbool_t 	        last_io_mode_coll = TRUE;
+
+      void             *chunk = NULL;         /* Pointer to the data chunk in cache */
+      H5D_t            *dataset=io_info->dset;/* Local pointer to dataset info */
+      H5D_istore_ud1_t  udata;		      /*B-tree pass-through	*/
+      haddr_t           caddr;                /* Address of the cached chunk */
+      size_t            accessed_bytes;       /*total accessed size in a chunk */
+      unsigned          idx_hint=0;           /* Cache index hint      */
+      hbool_t           dirty = TRUE;         /* Flag for cache flushing */
+      hbool_t           relax=TRUE;           /* Whether whole chunk is selected */
+
+      herr_t            ret_value = SUCCEED;    
 #ifdef H5Dmpio_DEBUG
-    int mpi_rank;
+      int mpi_rank;
 #endif
-    size_t              u;                    /* Local index variable */
-    herr_t              ret_value = SUCCEED;    
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_multi_chunk_collective_io)
+
+      FUNC_ENTER_NOAPI_NOINIT(H5D_multi_chunk_collective_io)
 
 #ifdef H5Dmpio_DEBUG
-    mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file);
+      mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file);
 #endif
 
-    /* Retrieve total # of chunks in dataset */
-    H5_ASSIGN_OVERFLOW(total_chunk, fm->total_chunks, hsize_t, size_t);
-    HDassert(total_chunk != 0);
-
-    /* Allocate memories */
-    chunk_io_option = (uint8_t *)H5MM_calloc(total_chunk);
-    chunk_addr      = (haddr_t *)H5MM_calloc(total_chunk * sizeof(haddr_t));
+      /* Allocate memories */
+      ori_total_chunk     = fm->total_chunks;
+      H5_ASSIGN_OVERFLOW(total_chunk,ori_total_chunk,hsize_t,unsigned);
+      HDassert(total_chunk!=0);
+      chunk_io_option = (uint8_t *)H5MM_calloc(total_chunk*sizeof(MPI_BYTE));
+      chunk_addr      = (haddr_t *)H5MM_calloc(total_chunk*sizeof(haddr_t));
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D), "total_chunk %Zu\n", total_chunk);
+  if(H5DEBUG(D))
+    HDfprintf(H5DEBUG(D),"total_chunk %u\n",total_chunk);
 #endif
 
-    /* Obtain IO option for each chunk */
-    if(H5D_obtain_mpio_mode(io_info, fm, dx_plist, chunk_io_option, chunk_addr) < 0) 
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTRECV, FAIL, "unable to obtain MPIO mode")
-
-    /* Set up contiguous I/O info object */
-    HDmemcpy(&ctg_io_info, io_info, sizeof(ctg_io_info));
-    ctg_io_info.store = &ctg_store;
-    ctg_io_info.layout_ops = *H5D_LOPS_CONTIG;
-
-    /* Initialize temporary contiguous storage info */
-    ctg_store.contig.dset_size = (hsize_t)io_info->dset->shared->layout.u.chunk.size;
-
-    /* Set up compact I/O info object */
-    HDmemcpy(&cpt_io_info, io_info, sizeof(cpt_io_info));
-    cpt_io_info.store = &cpt_store;
-    cpt_io_info.layout_ops = *H5D_LOPS_COMPACT;
-
-    /* Initialize temporary compact storage info */
-    cpt_store.compact.dirty = &cpt_dirty;
-
-    /* Set dataset storage for I/O info */
-    io_info->store = &store;
-
-    /* Loop over _all_ the chunks */
-    for(u = 0; u < total_chunk; u++) {
-        H5D_chunk_info_t *chunk_info;    /* Chunk info for current chunk */
-        H5S_t *fspace;              /* Dataspace describing chunk & selection in it */
-        H5S_t *mspace;              /* Dataspace describing selection in memory corresponding to this chunk */
+      /* obtain IO option for each chunk */
+      if(H5D_obtain_mpio_mode(io_info,fm,chunk_io_option,chunk_addr)<0) 
+	HGOTO_ERROR (H5E_DATASET, H5E_CANTRECV, FAIL, "unable to obtain MPIO mode");
 
+      for(i = 0; i < total_chunk; i++) {
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"mpi_rank = %d, chunk index = %Zu\n", mpi_rank, u);
+  if(H5DEBUG(D))
+    HDfprintf(H5DEBUG(D),"mpi_rank = %d, chunk index = %u\n",mpi_rank,i);
 #endif
-        /* Get the chunk info for this chunk, if there are elements selected */
-        chunk_info = fm->select_chunk[u];
-
-        /* Set the storage information for chunks with selections */
-        if(chunk_info) {
-            HDassert(chunk_info->index == u);
-
-            /* Pass in chunk's coordinates in a union. */
-            store.chunk.offset  = chunk_info->coords;
-            store.chunk.index   = chunk_info->index;
-	} /* end if */
-
-        /* Collective IO for this chunk, 
-         * Note: even there is no selection for this process, the process still
-         *      needs to contribute MPI NONE TYPE.
-         */
-        if(chunk_io_option[u] == 1) {
+	select_chunk = fm->select_chunk[i];
+	if(select_chunk == 1){/* Have selection elements in this chunk. Find the chunk info. */
+	   if(NULL ==(chunk_node = H5SL_first(fm->sel_chunks)))
+	    HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk node from skipped list");
+
+	    while(chunk_node){
+	      if(NULL ==(chunk_info = H5SL_item(chunk_node)))
+		HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list");
+	      if(chunk_info->index == i) {
+		/* Set dataset storage for I/O info */
+		io_info->store=&store;
+		/* Pass in chunk's coordinates in a union. */
+		store.chunk.offset  = chunk_info->coords;
+		store.chunk.index   = chunk_info->index;
+		break;
+	      }
+
+	      chunk_node = H5SL_next(chunk_node);
+            }
+	}
+
+        if(chunk_io_option[i] == 1){ /*collective IO for this chunk, 
+				       note: even there is no selection for this process,
+                                             the process still needs to contribute MPI NONE TYPE.*/
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"inside collective chunk IO mpi_rank = %d, chunk index = %Zu\n", mpi_rank, u);
+  if(H5DEBUG(D))
+    HDfprintf(H5DEBUG(D),"inside collective chunk IO mpi_rank = %d, chunk index = %u\n",mpi_rank,i);
 #endif
 	
-            /* Set the file & memory dataspaces */
-            if(chunk_info) {
-                fspace = chunk_info->fspace;
-                mspace = chunk_info->mspace;
-	    } /* end if */
-	    else {
-                fspace = mspace = NULL;
-	    } /* end else */
-
-            /* Switch back to collective I/O */
-            if(last_xfer_mode != H5FD_MPIO_COLLECTIVE) {
-                if(H5D_ioinfo_xfer_mode(io_info, dx_plist, H5FD_MPIO_COLLECTIVE) < 0)
-                    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to collective I/O")
-                last_xfer_mode = H5FD_MPIO_COLLECTIVE;
-            } /* end if */
-            if(last_coll_opt_mode != H5FD_MPIO_COLLECTIVE_IO) {
-                if(H5D_ioinfo_coll_opt_mode(io_info, dx_plist, H5FD_MPIO_COLLECTIVE_IO) < 0)
-                    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to collective I/O")
-                last_coll_opt_mode = H5FD_MPIO_COLLECTIVE_IO;
-            } /* end if */
+	  if(!last_io_mode_coll)
+	  /* Switch back to collective I/O */
+              if(H5D_ioinfo_make_coll(io_info) < 0)
+                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to collective I/O")
           
-            /* Initialize temporary contiguous storage address */
-            ctg_store.contig.dset_addr = chunk_addr[u];
-
-            /* Perform the I/O */
-            if(H5D_inter_collective_io(&ctg_io_info, type_info, fspace, mspace) < 0)
-                HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish shared collective MPI-IO")
-	} /* end if */
-	else {  /* possible independent IO for this chunk */
+	    if(select_chunk){
+	      if(H5D_inter_collective_io(io_info,chunk_info->fspace,chunk_info->mspace,
+			             chunk_addr[i],buf,do_write )<0)
+	        HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL,"couldn't finish shared collective MPI-IO");
+	       
+	    }
+	    else{
+	     if(H5D_inter_collective_io(io_info,NULL,NULL,
+			             chunk_addr[i],buf,do_write )<0)
+	        HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL,"couldn't finish shared collective MPI-IO");
+	       
+	    } 
+              last_io_mode_coll = TRUE;
+
+	}
+	else {/*possible independent IO for this chunk*/
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"inside independent IO mpi_rank = %d, chunk index = %Zu\n", mpi_rank, u);
+  if(H5DEBUG(D))
+    HDfprintf(H5DEBUG(D),"inside independent IO mpi_rank = %d, chunk index = %u\n",mpi_rank,i);
 #endif
 	
-            HDassert(chunk_io_option[u] == 0);
+            HDassert(chunk_io_option[i] == 0);
 
 #if !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS)
-            /* Check if this process has somethign to do with this chunk */
-            if(chunk_info) {
-                H5D_io_info_t *chk_io_info;     /* Pointer to I/O info object for this chunk */
-                H5D_istore_ud1_t udata;         /* B-tree pass-through	*/
-                void *chunk;                    /* Pointer to the data chunk in cache */
-                size_t accessed_bytes;          /* Total accessed size in a chunk */
-                unsigned idx_hint = 0;          /* Cache index hint      */
-                haddr_t caddr;                  /* Address of the cached chunk */
-
+            if(!select_chunk)
+                continue; /* this process has nothing to do with this chunk, continue! */
+            if(last_io_mode_coll)
                 /* Switch to independent I/O */
-                if(last_xfer_mode != H5FD_MPIO_INDEPENDENT) {
-                    if(H5D_ioinfo_xfer_mode(io_info, dx_plist, H5FD_MPIO_INDEPENDENT) < 0)
-                        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to independent I/O")
-                    last_xfer_mode = H5FD_MPIO_INDEPENDENT;
-                } /* end if */
-
-                /* Load the chunk into cache.  But if the whole chunk is written,
-                 * simply allocate space instead of load the chunk.
-                 */
-                if(HADDR_UNDEF == (caddr = H5D_istore_get_addr(io_info, &udata)))
-                    HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk info from skipped list")
-
-                /* Load the chunk into cache and lock it. */
-                if(H5D_chunk_cacheable(io_info, caddr)) {
-                    hbool_t entire_chunk = TRUE;         /* Whether whole chunk is selected */
-
-                    /* Compute # of bytes accessed in chunk */
-                    accessed_bytes = chunk_info->chunk_points * type_info->src_type_size;
-
-                    /* Determine if we will access all the data in the chunk */
-                    if(((io_info->op_type == H5D_IO_OP_WRITE) && (accessed_bytes != ctg_store.contig.dset_size))
-                            || (io_info->op_type != H5D_IO_OP_WRITE))
-                        entire_chunk = FALSE;
-
-                    /* Lock the chunk into the cache */
-                    if(NULL == (chunk = H5D_istore_lock(io_info, &udata, entire_chunk, &idx_hint)))
-                        HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
-
-                    /* Set up the storage buffer information for this chunk */
-                    cpt_store.compact.buf = chunk;
-
-                    /* Point I/O info at contiguous I/O info for this chunk */
-                    chk_io_info = &cpt_io_info;
-                } /* end if */
-                else {
-                    /* Set up the storage address information for this chunk */
-                    ctg_store.contig.dset_addr = caddr;
-
-                    /* No chunk cached */
-                    chunk = NULL;
-
-                    /* Point I/O info at temporary I/O info for this chunk */
-                    chk_io_info = &ctg_io_info;
-                } /* end else */
+                if(H5D_ioinfo_make_ind(io_info) < 0)
+                   HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to independent I/O")
+
+            /* Load the chunk into cache.  But if the whole chunk is written,
+             * simply allocate space instead of load the chunk. */
+            if(HADDR_UNDEF==(caddr = H5D_istore_get_addr(io_info, &udata)))
+                HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list");
+
+            if(H5D_istore_if_load(io_info, caddr)) {
+                accessed_bytes = chunk_info->chunk_points * H5T_get_size(dataset->shared->type);
+                if((do_write && (accessed_bytes != dataset->shared->layout.u.chunk.size)) || !do_write)
+                    relax=FALSE;
+
+	        if(NULL == (chunk = H5D_istore_lock(io_info, &udata, relax, &idx_hint)))
+		    HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
+	    } else
+		chunk = NULL;
+ 
+            if(do_write) {
+                if((io_info->ops.write)(io_info,
+                         chunk_info->chunk_points,H5T_get_size(io_info->dset->shared->type),
+                         chunk_info->fspace,chunk_info->mspace,caddr,chunk, buf) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "optimized write failed")
+            }
+            else {
+                 if((io_info->ops.read)(io_info,
+                          chunk_info->chunk_points,H5T_get_size(io_info->dset->shared->type),
+                          chunk_info->fspace,chunk_info->mspace,caddr,chunk, buf) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "optimized read failed")
+            }
 
-                if(io_info->op_type == H5D_IO_OP_WRITE) {
-                    if((io_info->io_ops.single_write)(chk_io_info, type_info,
-                            (hsize_t)chunk_info->chunk_points, chunk_info->fspace, chunk_info->mspace) < 0)
-                        HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "optimized write failed")
-                } /* end if */
-                else {
-                    if((io_info->io_ops.single_read)(chk_io_info, type_info,
-                            (hsize_t)chunk_info->chunk_points, chunk_info->fspace, chunk_info->mspace) < 0)
-                        HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "optimized read failed")
-                } /* end else */
+            /* Release the cache lock on the chunk. */
+            if(chunk) {
+                if(!do_write)
+                    dirty = FALSE;
 
-                /* Release the cache lock on the chunk. */
-                if(chunk && H5D_istore_unlock(io_info, (io_info->op_type == H5D_IO_OP_WRITE), idx_hint, chunk, accessed_bytes) < 0)
-                    HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
-            } /* end if */
-#else /* !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS) */
-            /* Set the file & memory dataspaces */
-            if(chunk_info) {
-                fspace = chunk_info->fspace;
-                mspace = chunk_info->mspace;
-            } /* end if */
+	        if(H5D_istore_unlock(io_info, dirty, idx_hint, chunk, accessed_bytes) < 0)
+		    HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
+	    } /* end if */
+#else
+            if(!last_io_mode_coll)
+                /* using independent I/O with file setview.*/
+                if(H5D_ioinfo_make_coll_opt(io_info) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to collective I/O")
+            if(select_chunk){
+                if(H5D_inter_collective_io(io_info,chunk_info->fspace,chunk_info->mspace,
+                                     chunk_addr[i],buf,do_write )<0)
+                    HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL,"couldn't finish shared collective MPI-IO");
+            }
             else {
-                fspace = mspace = NULL;
-            } /* end else */
-
-            /* Using independent I/O with file setview.*/
-            if(last_coll_opt_mode != H5FD_MPIO_INDIVIDUAL_IO) {
-                if(H5D_ioinfo_coll_opt_mode(io_info, dx_plist, H5FD_MPIO_INDIVIDUAL_IO) < 0)
-                    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to individual I/O")
-                last_coll_opt_mode = H5FD_MPIO_INDIVIDUAL_IO;
-            } /* end if */
+                if(H5D_inter_collective_io(io_info,NULL,NULL,
+                                     chunk_addr[i],buf,do_write )<0)
+                    HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL,"couldn't finish shared collective MPI-IO");
+            }
 
-            /* Initialize temporary contiguous storage address */
-            ctg_store.contig.dset_addr = chunk_addr[u];
-
-            /* Perform the I/O */
-            if(H5D_inter_collective_io(&ctg_io_info, type_info, fspace, mspace) < 0)
-                HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish shared collective MPI-IO")
 #ifdef H5D_DEBUG
   if(H5DEBUG(D))
     HDfprintf(H5DEBUG(D),"after inter collective IO\n");
 #endif
-#endif /* !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS) */
-        } /* end else */
-    } /* end for */
-
+#endif
+            last_io_mode_coll = FALSE;
+        }
+      }
+      if(!last_io_mode_coll)
+	  /* Switch back to collective I/O */
+              if(H5D_ioinfo_make_coll(io_info) < 0)
+                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to collective I/O")
 done:
-    if(chunk_io_option)
-        H5MM_xfree(chunk_io_option);
-    if(chunk_addr)
-        H5MM_xfree(chunk_addr);
+    HDfree(chunk_io_option);
+    HDfree(chunk_addr);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_multi_chunk_collective_io */
@@ -1297,105 +1257,90 @@ done:
  *              non-contiguous(or with holes) storage efficiently.
  *              Under this case, the one independent IO call may consist of
  *              many small disk IOs. So we may use independent IO with derived datatype
- *              to replace the independent IO when we find this chunk is not good to
- *              do collective IO. However, according to our performance study,
- *              this approach may not overcome the overhead caused by MPI gather/scatter.
- *              So we decide to leave the original collective IO per chunk approach as 
- *              an option for users. NO MPI gather/scatter calls are used.
- *              HDF5 will try to collective IO if possible.
- *              If users choose to use 
- *              H5Pset_dxpl_mpio_chunk_opt(dxpl_id,H5FD_MPIO_OPT_MULTI_IO),
- *              this function will be called. 
- *              The HDF5 library won't do any IO management but leave it to MPI-IO to figure 
- *              out.  
+                to replace the independent IO when we find this chunk is not good to
+                do collective IO. However, according to our performance study,
+                this approach may not overcome the overhead caused by MPI gather/scatter.
+                So we decide to leave the original collective IO per chunk approach as 
+                an option for users. NO MPI gather/scatter calls are used.
+                HDF5 will try to collective IO if possible.
+                If users choose to use 
+                H5Pset_dxpl_mpio_chunk_opt(dxpl_id,H5FD_MPIO_OPT_MULTI_IO),
+                this function will be called. 
+                The HDF5 library won't do any IO management but leave it to MPI-IO to figure 
+                out.  
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Muqun Yang
- *              Monday, Feb. 13th, 2006
+ * Programmer:
+ *
+ * Modifications:
  *
  *-------------------------------------------------------------------------
  */
 static herr_t 
-H5D_multi_chunk_collective_io_no_opt(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist)
+H5D_multi_chunk_collective_io_no_opt(H5D_io_info_t *io_info,H5D_chunk_map_t *fm,const void *buf, hbool_t do_write) 
 {
-    H5D_t          *dataset = io_info->dset;/* Local pointer to dataset info */
-    H5SL_node_t    *chunk_node;           /* Current node in chunk skip list */
-    H5D_io_info_t   ctg_io_info;          /* Contiguous I/O info object */
-    H5D_storage_t   ctg_store;            /* Chunk storage information as contiguous dataset */
-    H5D_io_info_t   cpt_io_info;          /* Compact I/O info object */
-    H5D_storage_t   cpt_store;            /* Chunk storage information as compact dataset */
-    hbool_t         cpt_dirty;            /* Temporary placeholder for compact storage "dirty" flag */
-    int             min_chunk = -1;       /* Minimum # of chunks all processes will operate on */
-    int             count_chunk;          /* How many chunks have we operated on? */
-    H5D_storage_t   store;                /* union of EFL and chunk pointer in file space */
-    herr_t          ret_value = SUCCEED;    
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_multi_chunk_collective_io_no_opt)
+      int               count_chunk,min_num_chunk;
+      haddr_t           chunk_addr;
+      H5SL_node_t      *chunk_node;           /* Current node in chunk skip list */
+      H5D_storage_t     store;                /* union of EFL and chunk pointer in file space */
+      H5D_chunk_info_t *chunk_info;           /* chunk information */
+      hbool_t make_ind, make_coll;            /* Flags to indicate that the MPI mode should change */
+
+      void             *chunk = NULL;         /* Pointer to the data chunk in cache */
+      H5D_t            *dataset=io_info->dset;/* Local pointer to dataset info */
+      H5D_istore_ud1_t  udata;		      /*B-tree pass-through	*/
+      size_t            accessed_bytes;       /*total accessed size in a chunk */
+      unsigned          idx_hint=0;           /* Cache index hint      */
+      hbool_t           dirty = TRUE;         /* Flag for cache flushing */
+      hbool_t           relax=TRUE;           /* Whether whole chunk is selected */
+      herr_t            ret_value = SUCCEED;    
 
-#ifdef H5D_DEBUG
-if(H5DEBUG(D)) {
-    int mpi_rank;
+#ifdef H5Dmpio_DEBUG
+      int mpi_rank;
+#endif
 
+      FUNC_ENTER_NOAPI_NOINIT(H5D_multi_chunk_collective_io_no_opt)
+#ifdef H5D_DEBUG
+  if(H5DEBUG(D)){ 
     mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file);
-    HDfprintf(H5DEBUG(D), "coming to multi_chunk_collective_io_no_opt\n");
-}         
+    HDfprintf(H5DEBUG(D),"coming to multi_chunk_collective_io_no_opt\n");
+  }         
 #endif
 
-    /* Set up contiguous I/O info object */
-    HDmemcpy(&ctg_io_info, io_info, sizeof(ctg_io_info));
-    ctg_io_info.store = &ctg_store;
-    ctg_io_info.layout_ops = *H5D_LOPS_CONTIG;
-
-    /* Initialize temporary contiguous storage info */
-    ctg_store.contig.dset_size = (hsize_t)io_info->dset->shared->layout.u.chunk.size;
-
-    /* Set up compact I/O info object */
-    HDmemcpy(&cpt_io_info, io_info, sizeof(cpt_io_info));
-    cpt_io_info.store = &cpt_store;
-    cpt_io_info.layout_ops = *H5D_LOPS_COMPACT;
-
-    /* Initialize temporary compact storage info */
-    cpt_store.compact.dirty = &cpt_dirty;
-
-    /* Set dataset storage for I/O info */
-    io_info->store = &store;
-
-    /* Get the min. # of chunks */
-    if(H5D_mpio_get_min_chunk(io_info, fm, &min_chunk) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get minimum number of chunk")
-    HDassert(min_chunk >= 0);
-
-    /* Get first node in chunk skip list */
-    chunk_node = H5SL_first(fm->sel_chunks);
-    count_chunk = 0;
-
-     /* Iterate through chunks to be operated on */
-    while(chunk_node) {
-        H5D_chunk_info_t *chunk_info;   /* chunk information */
-        haddr_t chunk_addr;             /* Address of chunk in file */
-        H5D_istore_ud1_t udata;		/* B-tree pass-through	*/
-        hbool_t make_ind, make_coll;    /* Flags to indicate that the MPI mode should change */
-
-        /* Get the actual chunk information from the skip list node */
-        chunk_info = H5SL_item(chunk_node);
-
-        /* Pass in chunk's coordinates in a union. */
-        store.chunk.offset = chunk_info->coords;
-        store.chunk.index = chunk_info->index;
+      if(H5D_mpio_get_min_chunk(io_info,fm,&min_num_chunk)<0)
+         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get minimum number of chunk");
+      count_chunk = 0;
+  
+      /* Get first node in chunk skip list */
+      chunk_node=H5SL_first(fm->sel_chunks);
+ 
+       /* Iterate through chunks to be operated on */
+      while(chunk_node) {
+           H5D_chunk_info_t *chunk_info;   /* chunk information */
+           hbool_t make_ind, make_coll;        /* Flags to indicate that the MPI mode should change */
+
+           /* Get the actual chunk information from the skip list node */
+           chunk_info=H5SL_item(chunk_node);
+
+           /* Set dataset storage for I/O info */
+          io_info->store=&store;
+
+           /* Pass in chunk's coordinates in a union. */
+           store.chunk.offset = chunk_info->coords;
+           store.chunk.index = chunk_info->index;
+
+           /* Reset flags for changing parallel I/O mode */
+           make_ind = make_coll = FALSE;
+            
+           count_chunk++;
+          /* If the number of chunk is greater than minimum number of chunk,
+                  Do independent read */
+           if(count_chunk > min_num_chunk) {
+              /* Switch to independent I/O (permanently) */
+               make_ind = TRUE;
+            }
 
-        /* Reset flags for changing parallel I/O mode */
-        make_ind = make_coll = FALSE;
-          
-        count_chunk++;
-
-        /* If the number of chunk is greater than minimum number of chunk,
-         *      Do independent read.
-         */
-        if(count_chunk > min_chunk)
-            /* Switch to independent I/O (permanently) */
-            make_ind = TRUE;
 #ifndef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
 /* This case needs to be improved to check if the selected space
    is regular. If all selections are regular, collective IO can still be done.
@@ -1404,92 +1349,67 @@ if(H5DEBUG(D)) {
    we turn off this optimization but leave the following code
    for future optimization. Otherwise, the following else {} doesn't make sense.
    KY 2006/8/4/ */
-        else {
-            /* Switch to independent I/O (temporarily) */
-            make_ind = TRUE;
-            make_coll = TRUE;
-        } /* end else */
+            else {
+                 /* Switch to independent I/O (temporarily) */
+                   make_ind = TRUE;
+                    make_coll = TRUE;
+             } /* end else */
 #endif /* H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS */
 
-        /* Retrieve the chunk's address */
-        if(HADDR_UNDEF == (chunk_addr = H5D_istore_get_addr(io_info, &udata)))
-            HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list")
-
-        /* Independent I/O */
-        if(make_ind) {
-            void *chunk;                /* Pointer to the data chunk in cache */
-            H5D_io_info_t *chk_io_info;     /* Pointer to I/O info object for this chunk */
-            size_t accessed_bytes = 0;  /* Total accessed size in a chunk */
-            unsigned idx_hint = 0;      /* Cache index hint      */
-
             /* Switch to independent I/O */
-            if(H5D_ioinfo_xfer_mode(io_info, dx_plist, H5FD_MPIO_INDEPENDENT) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to independent I/O")
-
-            /* Load the chunk into cache and lock it. */
-            if(H5D_chunk_cacheable(io_info, chunk_addr)) {
-                hbool_t entire_chunk = TRUE;         /* Whether whole chunk is selected */
-
-                /* Compute # of bytes accessed in chunk */
-                accessed_bytes = chunk_info->chunk_points * type_info->src_type_size;
+            if(make_ind)
+                if(H5D_ioinfo_make_ind(io_info) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to independent I/O")
 
-                /* Determine if we will access all the data in the chunk */
-                if(((io_info->op_type == H5D_IO_OP_WRITE) && (accessed_bytes != ctg_store.contig.dset_size))
-                        || (io_info->op_type != H5D_IO_OP_WRITE))
-                    entire_chunk = FALSE;
+            if(HADDR_UNDEF==(chunk_addr = H5D_istore_get_addr(io_info, &udata)))
+                HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list");
 
-                /* Lock the chunk into the cache */
-                if(NULL == (chunk = H5D_istore_lock(io_info, &udata, entire_chunk, &idx_hint)))
-                    HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
-
-                /* Set up the storage buffer information for this chunk */
-                cpt_store.compact.buf = chunk;
-
-                /* Point I/O info at contiguous I/O info for this chunk */
-                chk_io_info = &cpt_io_info;
-            } /* end if */
-            else {
-                /* Set up the storage address information for this chunk */
-                ctg_store.contig.dset_addr = chunk_addr;
-
-                /* No chunk cached */
-                chunk = NULL;
+            if(make_ind) {/*independent I/O */
+                /* Load the chunk into cache.  But if the whole chunk is written,
+                 * simply allocate space instead of load the chunk. */
+                if(H5D_istore_if_load(io_info, chunk_addr)) {
+                    accessed_bytes = chunk_info->chunk_points * H5T_get_size(dataset->shared->type);
+                    if((do_write && (accessed_bytes != dataset->shared->layout.u.chunk.size)) || !do_write)
+                        relax=FALSE;
+
+		    if(NULL == (chunk = H5D_istore_lock(io_info, &udata, relax, &idx_hint)))
+		        HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read raw data chunk")
+		} else
+		    chunk = NULL;
+ 
+                if(do_write) {
+                    if((io_info->ops.write)(io_info,
+                         chunk_info->chunk_points,H5T_get_size(io_info->dset->shared->type),
+                         chunk_info->fspace,chunk_info->mspace, chunk_addr, chunk, buf) < 0)
+                        HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "optimized write failed")
+                } else {
+                    if((io_info->ops.read)(io_info,
+                          chunk_info->chunk_points,H5T_get_size(io_info->dset->shared->type),
+                          chunk_info->fspace,chunk_info->mspace, chunk_addr, chunk, buf) < 0)
+                        HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "optimized read failed")
+                }
 
-                /* Point I/O info at temporary I/O info for this chunk */
-                chk_io_info = &ctg_io_info;
-            } /* end else */
+                /* Release the cache lock on the chunk. */
+                if(chunk) {
+                    if(!do_write)
+                        dirty = FALSE;
 
-            if(io_info->op_type == H5D_IO_OP_WRITE) {
-                if((io_info->io_ops.single_write)(chk_io_info, type_info,
-                        (hsize_t)chunk_info->chunk_points, chunk_info->fspace, chunk_info->mspace) < 0)
-                    HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "optimized write failed")
+		    if(H5D_istore_unlock(io_info, dirty, idx_hint, chunk, accessed_bytes) < 0)
+			HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
+		} /* end if */
             } /* end if */
-            else {
-                if((io_info->io_ops.single_read)(chk_io_info, type_info,
-                        (hsize_t)chunk_info->chunk_points, chunk_info->fspace, chunk_info->mspace) < 0)
-                   HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "optimized read failed")
-            } /* end ese */
-
-            /* Release the cache lock on the chunk. */
-            if(chunk)
-                if(H5D_istore_unlock(io_info, (io_info->op_type == H5D_IO_OP_WRITE), idx_hint, chunk, accessed_bytes) < 0)
-                    HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
-        } /* end if */
-        else { /*collective I/O */
-            /* Set up the storage address information for this chunk */
-            ctg_store.contig.dset_addr = chunk_addr;
-
-            if(H5D_inter_collective_io(&ctg_io_info, type_info, chunk_info->fspace, chunk_info->mspace) < 0)
-                HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL,"couldn't finish shared collective MPI-IO")
-        } /* end else */
-
-        if(make_coll)
-            if(H5D_ioinfo_xfer_mode(io_info, dx_plist, H5FD_MPIO_COLLECTIVE) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to independent I/O")
-
-        /* Get the next chunk node in the skip list */
-        chunk_node = H5SL_next(chunk_node);
-    } /* end while */
+            else { /*collective I/O */
+              if(H5D_inter_collective_io(io_info,chunk_info->fspace,chunk_info->mspace,
+                     chunk_addr,buf,do_write ) < 0)
+                HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL,"couldn't finish shared collective MPI-IO");
+            }
+
+            if(make_coll)
+              if(H5D_ioinfo_make_coll(io_info) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to independent I/O")
+          /* Get the next chunk node in the skip list */
+            chunk_node=H5SL_next(chunk_node);
+       } /* end while */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1500,266 +1420,303 @@ done:
  * Function:	H5D_inter_collective_io
  *
  * Purpose:	Routine for the shared part of collective IO between multiple chunk
- *              collective IO and contiguous collective IO
+                collective IO and contiguous collective IO
+		
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Muqun Yang
- *              Monday, Feb. 13th, 2006
+ * Programmer:
+ *
+ * Modifications:
  *
  *-------------------------------------------------------------------------
  */
 static herr_t 
-H5D_inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    const H5S_t *file_space, const H5S_t *mem_space)
+H5D_inter_collective_io(H5D_io_info_t *io_info,const H5S_t *file_space,const H5S_t *mem_space,
+			 haddr_t addr, const void *buf, hbool_t do_write ) 
 {
-    size_t mpi_buf_count;               /* # of MPI types */
-    hbool_t mbt_is_derived = FALSE;
-    hbool_t mft_is_derived = FALSE;
-    MPI_Datatype        mpi_file_type, mpi_buf_type;
-    int                 mpi_code;           /* MPI return code */ 
-    herr_t       ret_value = SUCCEED;  /* return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_inter_collective_io)
-
-    if((file_space != NULL) && (mem_space != NULL)) {
-        hsize_t	mpi_buf_offset, mpi_file_offset;   /* Offset within dataset where selection (ie. MPI type) begins */
-        size_t  mpi_file_count;         /* Number of file "objects" to transfer */
 
-        /* Obtain disk and memory MPI derived datatype */
-        if(H5S_mpio_space_type(file_space, type_info->src_type_size,
-                &mpi_file_type, &mpi_file_count, &mpi_file_offset, &mft_is_derived) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI file type")
-        if(H5S_mpio_space_type(mem_space, type_info->src_type_size,
-                &mpi_buf_type, &mpi_buf_count, &mpi_buf_offset, &mbt_is_derived) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI buffer type")
-    } /* end if */
-    else {
-        /* For non-selection, participate with a none MPI derived datatype, the count is 0.  */
-        mpi_buf_type   = MPI_BYTE;   
-        mpi_file_type  = MPI_BYTE;
-        mpi_buf_count  = (size_t)0;
-        mbt_is_derived = FALSE;
-        mft_is_derived = FALSE;
-    } /* end else */
+      size_t	        mpi_buf_count, mpi_file_count;     /* Number of "objects" to transfer */
+      MPI_Datatype      mpi_file_type,mpi_buf_type;
+      hsize_t	        mpi_buf_offset, mpi_file_offset;   /* Offset within dataset where selection (ie. MPI type) begins */
+      hbool_t	        mbt_is_derived=0,      /* Whether the buffer (memory) type is derived and needs to be free'd */
+		        mft_is_derived=0;      /* Whether the file type is derived and needs to be free'd */  
+      H5D_common_coll_info_t coll_info;
+      herr_t       ret_value = SUCCEED;  /* return value */
+
+      FUNC_ENTER_NOAPI_NOINIT(H5D_inter_collective_io)
+      if((file_space!=NULL) &&  (mem_space != NULL)) {
+	/*Obtain disk and memory MPI derived datatype */
+	if(H5S_mpio_space_type(file_space,H5T_get_size(io_info->dset->shared->type),
+			       &mpi_file_type,&mpi_file_count,&mpi_file_offset,&mft_is_derived)<0)
+	       HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't create MPI file type");
+
+	if(H5S_mpio_space_type(mem_space,H5T_get_size(io_info->dset->shared->type),
+			       &mpi_buf_type,&mpi_buf_count,&mpi_buf_offset,&mbt_is_derived)<0)
+	       HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't create MPI buffer type");
+	    
+      }
+      else {
+	    /* For non-selection, participate with a none MPI derived datatype, the count is 0.  */
+	    mpi_buf_type   = MPI_BYTE;   
+	    mpi_file_type  = MPI_BYTE;
+	    mpi_file_count = 0;
+	    mpi_buf_count  = 0;
+      }
+
+      coll_info.mbt_is_derived = mbt_is_derived;
+      coll_info.mft_is_derived = mft_is_derived;
+      coll_info.mpi_buf_count  = mpi_buf_count;
+      coll_info.chunk_addr     = addr;
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D),"before final collective IO \n");
+  if(H5DEBUG(D))
+   HDfprintf(H5DEBUG(D),"before final collective IO \n");
 #endif
 
-    /* Perform final collective I/O operation */
-    if(H5D_final_collective_io(io_info, type_info, mpi_buf_count, &mpi_file_type, &mpi_buf_type) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish collective MPI-IO")
-
-done:
-    /* Free the MPI buf and file types, if they were derived */
-    if(mbt_is_derived && MPI_SUCCESS != (mpi_code = MPI_Type_free(&mpi_buf_type)))
-        HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
-    if(mft_is_derived && MPI_SUCCESS != (mpi_code = MPI_Type_free(&mpi_file_type)))
-        HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code)
-
+      if(H5D_final_collective_io(io_info,&mpi_file_type,&mpi_buf_type,&coll_info,buf,do_write)<0)
+	    HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL,"couldn't finish collective MPI-IO");
+ done:
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
+  if(H5DEBUG(D))
     HDfprintf(H5DEBUG(D),"before leaving inter_collective_io ret_value = %d\n",ret_value);
 #endif
 
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_inter_collective_io() */
+      FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_inter_collective_io */
 
 
 /*-------------------------------------------------------------------------
  * Function:	H5D_final_collective_io
  *
  * Purpose:	Routine for the common part of collective IO with different storages.
+		
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Muqun Yang
- *              Monday, Feb. 13th, 2006
+ * Programmer:
+ *
+ * Modifications:
  *
  *-------------------------------------------------------------------------
  */
 static herr_t 
-H5D_final_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    size_t mpi_buf_count, MPI_Datatype *mpi_file_type, MPI_Datatype *mpi_buf_type)
+H5D_final_collective_io(H5D_io_info_t *io_info,MPI_Datatype*mpi_file_type,MPI_Datatype *mpi_buf_type,
+			 H5D_common_coll_info_t* coll_info, const void *buf, hbool_t do_write) 
 {
-    int         mpi_code;               /* MPI return code */ 
-    hbool_t	plist_is_setup = FALSE; /* Whether the dxpl has been customized */
-    herr_t      ret_value = SUCCEED;
+
+
+    int               mpi_code;              /* MPI return code */ 
+    hbool_t	      plist_is_setup=0;      /* Whether the dxpl has been customized */
+    herr_t            ret_value = SUCCEED;
+
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_final_collective_io)
 
-    /* Pass buf type, file type to the file driver.  */
-    if(H5FD_mpi_setup_collective(io_info->dxpl_id, *mpi_buf_type, *mpi_file_type) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI-I/O properties")
-    plist_is_setup = TRUE;
+     /*
+	  * Pass buf type, file type to the file driver.
+     */
+
+     if(H5FD_mpi_setup_collective(io_info->dxpl_id, *mpi_buf_type, *mpi_file_type)<0)
+	HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI-I/O properties");
 
-    if(io_info->op_type == H5D_IO_OP_WRITE) {
-        if((io_info->io_ops.single_write)(io_info, type_info,
-                (hsize_t)mpi_buf_count, NULL, NULL) < 0)
+     plist_is_setup=1;
+#ifdef H5D_DEBUG
+  if(H5DEBUG(D)){
+    HDfprintf(H5DEBUG(D),"chunk addr %Hu\n",coll_info->chunk_addr);
+    HDfprintf(H5DEBUG(D),"mpi_buf_count %d\n",coll_info->mpi_buf_count);
+  }
+
+#endif
+
+    if(do_write) {
+        if((io_info->ops.write)(io_info,
+		coll_info->mpi_buf_count,0,NULL,NULL,coll_info->chunk_addr,
+                NULL, buf) < 0)
 	    HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "optimized write failed")
-    } /* end if */
+    }
     else {
-        if((io_info->io_ops.single_read)(io_info, type_info,
-                (hsize_t)mpi_buf_count, NULL, NULL) < 0)
+        if((io_info->ops.read)(io_info,
+	        coll_info->mpi_buf_count,0,NULL,NULL,coll_info->chunk_addr,
+                NULL, buf) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "optimized read failed")
-    } /* end else */
+    }
 
 done:
-    /* Reset the dxpl settings */
-    if(plist_is_setup)
-        if(H5FD_mpi_teardown_collective(io_info->dxpl_id) < 0)
-            HDONE_ERROR(H5E_DATASPACE, H5E_CANTFREE, FAIL, "unable to reset dxpl values")
-
+     /* Reset the dxpl settings */
+      if(plist_is_setup) {
+        if(H5FD_mpi_teardown_collective(io_info->dxpl_id)<0)
+    	    HDONE_ERROR(H5E_DATASPACE, H5E_CANTFREE, FAIL, "unable to reset dxpl values");
+      } /* end if */
+
+     /* free the MPI buf and file types */
+      if (coll_info->mbt_is_derived) {
+	if (MPI_SUCCESS != (mpi_code= MPI_Type_free( mpi_buf_type )))
+            HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code);
+      }
+      if (coll_info->mft_is_derived) {
+	if (MPI_SUCCESS != (mpi_code= MPI_Type_free( mpi_file_type )))
+            HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code);
+      }
 #ifdef H5D_DEBUG
-if(H5DEBUG(D)) 
+  if(H5DEBUG(D)) 
     HDfprintf(H5DEBUG(D),"ret_value before leaving final_collective_io=%d\n",ret_value);
 #endif
+
       FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_final_collective_io */
+}/* end H5D_final_collective_io */
 
 
 /*-------------------------------------------------------------------------
  * Function:	H5D_sort_chunk
  *
  * Purpose:	Routine to sort chunks in increasing order of chunk address
- *              Each chunk address is also obtained.
- *
- * Description:
- *              For most cases, the chunk address has already been sorted in increasing order.
- *              The special sorting flag is used to optimize this common case.
- *              quick sort is used for necessary sorting.
- *
- * Parameters:
- *              Input: H5D_io_info_t* io_info,
- *                      H5D_chunk_map_t *fm(global chunk map struct)
- *              Input/Output:  H5D_chunk_addr_info_t chunk_addr_info_array[]   : array to store chunk address and information 
- *                     many_chunk_opt                         : flag to optimize the way to obtain chunk addresses 
- *                                                              for many chunks
+                Each chunk address is also obtained.
+
+   Description:
+                For most cases, the chunk address has already been sorted in increasing order.
+		The special sorting flag is used to optimize this common case.
+                quick sort is used for necessary sorting.
+   
+   Parameters:
+                Input: H5D_io_info_t* io_info,
+		       H5D_chunk_map_t *fm(global chunk map struct)
+		Input/Output:  H5D_chunk_addr_info_t chunk_addr_info_array[]   : array to store chunk address and information 
+                       many_chunk_opt                         : flag to optimize the way to obtain chunk addresses 
+                                                                for many chunks
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Muqun Yang
- *              Monday, Feb. 13th, 2006
+ * Programmer:
+ *
+ * Modifications:
  *
  *-------------------------------------------------------------------------
  */
+
 static herr_t 
-H5D_sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
-    H5D_chunk_addr_info_t chunk_addr_info_array[], int sum_chunk)
+H5D_sort_chunk(H5D_io_info_t * io_info,
+	       H5D_chunk_map_t *fm,
+	       H5D_chunk_addr_info_t chunk_addr_info_array[],
+	       int many_chunk_opt)
 {
-    H5SL_node_t    *chunk_node;         /* Current node in chunk skip list */
+
+
+    H5SL_node_t      *chunk_node;         /* Current node in chunk skip list */
     H5D_chunk_info_t *chunk_info;         /* Current chunking info. of this node. */
-    haddr_t         chunk_addr;         /* Current chunking address of this node */
-    haddr_t        *total_chunk_addr_array = NULL; /* The array of chunk address for the total number of chunk */
-    H5D_storage_t   store;              /*union of EFL and chunk pointer in file space */
-    hbool_t         do_sort = FALSE;    /* Whether the addresses need to be sorted */
-    int             bsearch_coll_chunk_threshold;
-    int             many_chunk_opt = H5D_OBTAIN_ONE_CHUNK_ADDR_IND;
-    int             mpi_size;                   /* Number of MPI processes */
-    int             mpi_code;                   /* MPI return code */
-    int             i;                          /* Local index variable */
-    herr_t	    ret_value = SUCCEED;        /* Return value		*/
+    haddr_t           chunk_addr;         /* Current chunking address of this node */
+    haddr_t          *total_chunk_addr_array=NULL; /* The array of chunk address for the total number of chunk */
+    int               i,mpi_code;
+    int               total_chunks;
+    size_t            num_chunks;
+    int               mpi_type_cleanup    = 0;
+    int               tchunk_addr_cleanup = 0;
+    MPI_Datatype      chunk_addrtype;
+    H5D_storage_t     store;              /*union of EFL and chunk pointer in file space */
+    hbool_t           do_sort = FALSE;
+    herr_t	      ret_value = SUCCEED;	/*return value		*/
   
     FUNC_ENTER_NOAPI_NOINIT(H5D_sort_chunk)
 
-    /* Retrieve # of MPI processes */
-    if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size")
-
-    /* Calculate the actual threshold to obtain all chunk addresses collectively 
-     *  The bigger this number is, the more possible the use of obtaining chunk
-     * address collectively.
-     */
-    /* For non-optimization one-link IO, actual bsearch threshold is always
-     *   0, we would always want to obtain the chunk addresses individually
-     *   for each process.
-     */
-    bsearch_coll_chunk_threshold = (sum_chunk * 100) / ((int)fm->total_chunks * mpi_size);
-    if((bsearch_coll_chunk_threshold > H5D_ALL_CHUNK_ADDR_THRES_COL)
-            && ((sum_chunk / mpi_size) >= H5D_ALL_CHUNK_ADDR_THRES_COL_NUM))
-        many_chunk_opt = H5D_OBTAIN_ALL_CHUNK_ADDR_COL;
-
+    num_chunks =  H5SL_count(fm->sel_chunks);
 #ifdef H5D_DEBUG
-if(H5DEBUG(D)) 
-    HDfprintf(H5DEBUG(D), "many_chunk_opt= %d\n", many_chunk_opt);
+  if(H5DEBUG(D)) 
+    HDfprintf(H5DEBUG(D),"many_chunk_opt= %d\n",many_chunk_opt);
 #endif
 
     /* If we need to optimize the way to obtain the chunk address */
-    if(many_chunk_opt != H5D_OBTAIN_ONE_CHUNK_ADDR_IND) {
-        int mpi_rank;
+    if(many_chunk_opt != H5D_OBTAIN_ONE_CHUNK_ADDR_IND){
 
+      int mpi_rank, root;
+      total_chunks = (int)fm->total_chunks;
+      total_chunk_addr_array = H5MM_malloc(sizeof(haddr_t)*total_chunks);
+      tchunk_addr_cleanup = 1;
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D), "Coming inside H5D_OBTAIN_ALL_CHUNK_ADDR_COL\n");
+  if(H5DEBUG(D))
+    HDfprintf(H5DEBUG(D),"Coming inside H5D_OBTAIN_ALL_CHUNK_ADDR_COL\n");
 #endif
-        /* Allocate array for chunk addresses */
-        if(NULL == (total_chunk_addr_array = H5MM_malloc(sizeof(haddr_t) * (size_t)fm->total_chunks)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory chunk address array")
-
-        /* Retrieve all the chunk addresses with process 0 */
-        if((mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file)) < 0)
-            HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi rank")
-	if(mpi_rank == 0) {
-            if(H5D_istore_chunkmap(io_info, total_chunk_addr_array, fm->down_chunks) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address")
-	} /* end if */
-
+	root = 0;
+	if((mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file))<0)
+	 HGOTO_ERROR (H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi rank");
+
+	/*Create received  MPI derived datatype */
+	if(MPI_SUCCESS !=(mpi_code = MPI_Type_contiguous((int)(sizeof(haddr_t)*total_chunks), MPI_BYTE, &chunk_addrtype)))
+	  HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code);
+	if(MPI_SUCCESS !=(mpi_code = MPI_Type_commit(&chunk_addrtype)))
+	  HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code);
+
+	mpi_type_cleanup = 1;
+
+	if(mpi_rank == root) {
+	   if(H5D_istore_chunkmap(io_info, total_chunk_addr_array, fm->down_chunks)<0)
+	     HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address");
+	}
 	/* Broadcasting the MPI_IO option info. and chunk address info. */
-	if(MPI_SUCCESS != (mpi_code = MPI_Bcast(total_chunk_addr_array, (int)(sizeof(haddr_t) * fm->total_chunks), MPI_BYTE, (int)0, io_info->comm)))
-	   HMPI_GOTO_ERROR(FAIL, "MPI_BCast failed", mpi_code)
+	if(MPI_SUCCESS !=(mpi_code = MPI_Bcast(total_chunk_addr_array,1,chunk_addrtype,root,io_info->comm)))
+	   HMPI_GOTO_ERROR(FAIL, "MPI_BCast failed", mpi_code);
     } /* end if */
 
+    /* Get first node in chunk skip list */
+    if(NULL ==(chunk_node = H5SL_first(fm->sel_chunks)))
+	  HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk node from skipped list");
     /* Set dataset storage for I/O info */
     io_info->store = &store;
-
-    /* Start at first node in chunk skip list */
+    if(NULL ==(chunk_info = H5SL_item(chunk_node)))
+	  HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list");
+    store.chunk.offset = chunk_info->coords;
+    store.chunk.index  = chunk_info->index;
     i = 0;
-    if(NULL == (chunk_node = H5SL_first(fm->sel_chunks)))
-        HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk node from skipped list")
+    if(many_chunk_opt == H5D_OBTAIN_ONE_CHUNK_ADDR_IND){
+      if(HADDR_UNDEF==(chunk_addr = H5D_istore_get_addr(io_info,NULL)))
+	  HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list");
 
-    /* Iterate over all chunks for this process */
-    while(chunk_node) {
-        if(NULL == (chunk_info = H5SL_item(chunk_node)))
-            HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list")
-        
-        if(many_chunk_opt == H5D_OBTAIN_ONE_CHUNK_ADDR_IND) {
-            store.chunk.offset = chunk_info->coords;
-            store.chunk.index  = chunk_info->index;
-            if(HADDR_UNDEF == (chunk_addr = H5D_istore_get_addr(io_info, NULL)))
-                HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk info from skipped list")
-        } /* end if */
-        else 
-            chunk_addr = total_chunk_addr_array[chunk_info->index];
+#ifdef H5D_DEBUG
+  if(H5DEBUG(D))
+    HDfprintf(H5DEBUG(D),"coming to obtain each chunk address individually \n");
+#endif
+    }
+    else 
+       chunk_addr = total_chunk_addr_array[chunk_info->index];
 
-        /* Check if chunk addresses are not in increasing order in the file */
-        if(i > 0 && chunk_addr < chunk_addr_info_array[i - 1].chunk_addr)
-            do_sort = TRUE;
+    chunk_addr_info_array[i].chunk_addr  = chunk_addr;
+    chunk_addr_info_array[i].chunk_info  = *chunk_info;
 
-        /* Set the address & info for this chunk */
-        chunk_addr_info_array[i].chunk_addr = chunk_addr;
-        chunk_addr_info_array[i].chunk_info = *chunk_info;
+    chunk_node = H5SL_next(chunk_node);
 
-        /* Advance to next chunk in list */
-        i++;
-        chunk_node = H5SL_next(chunk_node);
-    } /* end while */
+    while(chunk_node) {
 
+            chunk_info         = H5SL_item(chunk_node);
+            store.chunk.offset = chunk_info->coords;
+            store.chunk.index  = chunk_info->index;
+	    
+	    if(many_chunk_opt == H5D_OBTAIN_ONE_CHUNK_ADDR_IND){
+	      if(HADDR_UNDEF==(chunk_addr = H5D_istore_get_addr(io_info,NULL)))
+		HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list");
+	    }
+	    else 
+	      chunk_addr = total_chunk_addr_array[chunk_info->index];
+
+	    if(chunk_addr < chunk_addr_info_array[i].chunk_addr) do_sort = TRUE;
+	    chunk_addr_info_array[i+1].chunk_addr = chunk_addr;
+            chunk_addr_info_array[i+1].chunk_info =*chunk_info;
+            i++;
+            chunk_node = H5SL_next(chunk_node);
+    }
 #ifdef H5D_DEBUG
-if(H5DEBUG(D))
-    HDfprintf(H5DEBUG(D), "before Qsort\n");
+  if(H5DEBUG(D))
+    HDfprintf(H5DEBUG(D),"before Qsort\n");
 #endif
-    if(do_sort) {
-        size_t num_chunks = H5SL_count(fm->sel_chunks);
-
-        HDqsort(chunk_addr_info_array, num_chunks, sizeof(chunk_addr_info_array[0]), H5D_cmp_chunk_addr);
-    } /* end if */
+    if(do_sort)
+	    HDqsort(chunk_addr_info_array,num_chunks,sizeof(chunk_addr_info_array),H5D_cmp_chunk_addr);
 
 done:
-    if(total_chunk_addr_array)
-        H5MM_xfree(total_chunk_addr_array);
 
+    if(tchunk_addr_cleanup)
+       HDfree(total_chunk_addr_array);
+    if(mpi_type_cleanup) {
+      if (MPI_SUCCESS != (mpi_code= MPI_Type_free( &chunk_addrtype )))
+            HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code);
+    }
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_sort_chunk() */
     
@@ -1768,244 +1725,310 @@ done:
  * Function:	H5D_obtain_mpio_mode
  *
  * Purpose:	Routine to obtain each io mode(collective,independent or none) for each chunk;
- *              Each chunk address is also obtained.
- *
- * Description:
- *
- *              1) Each process provides two piece of information for all chunks having selection
- *                 a) chunk index 
- *                 b) wheather this chunk is regular(for MPI derived datatype not working case)
- *
- *              2) Gather all the information to the root process
- *
- *              3) Root process will do the following:
- *                 a) Obtain chunk addresses for all chunks in this data space
- *                 b) With the consideration of the user option, calculate IO mode for each chunk
- *                 c) Build MPI derived datatype to combine "chunk address" and "assign_io" information
- *                      in order to do MPI Bcast only once
- *                 d) MPI Bcast the IO mode and chunk address information for each chunk.
- *              4) Each process then retrieves IO mode and chunk address information to assign_io_mode and chunk_addr.
- *
- * Parameters:
- *
- *              Input: H5D_io_info_t* io_info,
- *                      H5D_chunk_map_t *fm,(global chunk map struct)
- *              Output: uint8_t assign_io_mode[], : IO mode, collective, independent or none
- *                      haddr_t chunk_addr[],     : chunk address array for each chunk
+                Each chunk address is also obtained.
+
+   Description:
+
+                1) Each process provides two piece of information for all chunks having selection
+		   a) chunk index 
+                   b) wheather this chunk is regular(for MPI derived datatype not working case)
+
+                2) Gather all the information to the root process
+		
+		3) Root process will do the following:
+		   a) Obtain chunk addresses for all chunks in this data space
+		   b) With the consideration of the user option, calculate IO mode for each chunk
+		   c) Build MPI derived datatype to combine "chunk address" and "assign_io" information
+		      in order to do MPI Bcast only once
+                   d) MPI Bcast the IO mode and chunk address information for each chunk.
+		4) Each process then retrieves IO mode and chunk address information to assign_io_mode and chunk_addr.
+ 
+   Parameters:
+
+                Input: H5D_io_info_t* io_info,
+		       H5D_chunk_map_t *fm,(global chunk map struct)
+		Output: uint8_t assign_io_mode[], : IO mode, collective, independent or none
+		        haddr_t chunk_addr[],     : chunk address array for each chunk
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Muqun Yang
- *              Monday, Feb. 13th, 2006
+ * Programmer:
+ *
+ * Modifications:
  *
  *-------------------------------------------------------------------------
  */
+
 static herr_t 
-H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
-    H5P_genplist_t *dx_plist, uint8_t assign_io_mode[], haddr_t chunk_addr[])
+H5D_obtain_mpio_mode(H5D_io_info_t* io_info, 
+		     H5D_chunk_map_t *fm,
+		     uint8_t assign_io_mode[],
+		     haddr_t chunk_addr[])
 {
-    int               total_chunks;
-    unsigned          percent_nproc_per_chunk,threshold_nproc_per_chunk;
-    H5FD_mpio_chunk_opt_t chunk_opt_mode;
-    uint8_t*          io_mode_info=NULL;
-    uint8_t*          recv_io_mode_info=NULL;
-    uint8_t*          mergebuf=NULL;
-    uint8_t*          tempbuf;
-    H5SL_node_t*      chunk_node;  
-    H5D_chunk_info_t* chunk_info;
-    int               mpi_size,mpi_rank;
-    MPI_Comm          comm;
-    int               ic,root;
-    int               mpi_code;
-    int               mem_cleanup      = 0;
+
+  int               total_chunks;
+  hsize_t           ori_total_chunks;
+  unsigned          percent_nproc_per_chunk,threshold_nproc_per_chunk;
+  H5FD_mpio_chunk_opt_t chunk_opt_mode;
+  uint8_t*          io_mode_info=NULL;
+  uint8_t*          recv_io_mode_info=NULL;
+  uint8_t*          mergebuf=NULL;
+  uint8_t*          tempbuf;
+
+  H5SL_node_t*      chunk_node;  
+  H5D_chunk_info_t* chunk_info;
+
+  MPI_Datatype      bastype[2];
+  MPI_Datatype      chunk_addrtype;
+  int               bascount;
+  int               basblock[2];
+  MPI_Aint          basdisp[2];
+  MPI_Datatype      rtype;
+  MPI_Datatype      stype;
+  int               mpi_size,mpi_rank;
+  MPI_Comm          comm;
+  int               ic,root;
+  int               mpi_code;
+  H5P_genplist_t    *plist;
+  int               mem_cleanup      = 0,
+                    mpi_type_cleanup = 0;
+
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
-    int new_value;
-    htri_t check_prop;
+  int new_value;
+  htri_t check_prop;
 #endif
-    herr_t            ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_obtain_mpio_mode)
+  herr_t            ret_value = SUCCEED;
 
-    /* Assign the rank 0 to the root */
-    root              = 0; 
-    comm              = io_info->comm;
+  FUNC_ENTER_NOAPI_NOINIT(H5D_obtain_mpio_mode)
 
-    /* Obtain the number of process and the current rank of the process */
-    if((mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file)) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi rank")
-    if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size")
+  /* Assign the rank 0 to the root */
+  root              = 0; 
+  comm              = io_info->comm;
+
+  /* Obtain the number of process and the current rank of the process */
+  if((mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file))<0)
+	 HGOTO_ERROR (H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi rank");
+  if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file))<0)
+	 HGOTO_ERROR (H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size");
   
-    /* Setup parameters */
-    H5_ASSIGN_OVERFLOW(total_chunks, fm->total_chunks, hsize_t, int);
-    percent_nproc_per_chunk = H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME);
+   /* Allocate memory */
+  ori_total_chunks      = fm->total_chunks;
+  H5_ASSIGN_OVERFLOW(total_chunks,ori_total_chunks,hsize_t,int);
+
+ /* Obtain the data transfer properties */
+  if(NULL == (plist = H5I_object(io_info->dxpl_id)))
+       HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
+  
+  percent_nproc_per_chunk=H5P_peek_unsigned(plist,H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME);
 #if defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) && defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS)
-    chunk_opt_mode = (H5FD_mpio_chunk_opt_t)H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME);
-    if((chunk_opt_mode == H5FD_MPIO_CHUNK_MULTI_IO) || (percent_nproc_per_chunk == 0)) {
-        if(H5D_istore_chunkmap(io_info, chunk_addr, fm->down_chunks) < 0)
-           HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address");    
-        for(ic = 0; ic < total_chunks; ic++)
-           assign_io_mode[ic] = H5D_CHUNK_IO_MODE_COL;
-
-        HGOTO_DONE(SUCCEED)
-    } /* end if */
+   
+  chunk_opt_mode=(H5FD_mpio_chunk_opt_t)H5P_peek_unsigned(plist,H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME);
+
+  if((chunk_opt_mode == H5FD_MPIO_CHUNK_MULTI_IO) || (percent_nproc_per_chunk == 0)){
+    if(H5D_istore_chunkmap(io_info, chunk_addr, fm->down_chunks) < 0)
+       HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address");    
+    for(ic = 0; ic<total_chunks;ic++)
+       assign_io_mode[ic] = H5D_CHUNK_IO_MODE_COL;
+       goto done;
+  }
 #endif    
-    threshold_nproc_per_chunk = mpi_size * percent_nproc_per_chunk/100;
-
-    /* Allocate memory */
-    io_mode_info      = (uint8_t *)H5MM_calloc(total_chunks);
-    mergebuf          = H5MM_malloc((sizeof(haddr_t) + 1) * total_chunks);
-    tempbuf           = mergebuf + total_chunks;
-    if(mpi_rank == root) 
-        recv_io_mode_info = (uint8_t *)H5MM_malloc(total_chunks * mpi_size);
+  threshold_nproc_per_chunk = mpi_size * percent_nproc_per_chunk/100;
+
+  io_mode_info      = (uint8_t *)H5MM_calloc(total_chunks*sizeof(MPI_BYTE));
+  mergebuf          = H5MM_malloc((sizeof(haddr_t)+sizeof(MPI_BYTE))*total_chunks);
+  tempbuf           = mergebuf + sizeof(MPI_BYTE)*total_chunks;
+  if(mpi_rank == root) 
+     recv_io_mode_info = (uint8_t *)H5MM_malloc(total_chunks*sizeof(MPI_BYTE)*mpi_size);
   
-    mem_cleanup       = 1;
+  mem_cleanup       = 1;
 
-    /* Obtain the regularity and selection information for all chunks in this process. */
-    chunk_node        = H5SL_first(fm->sel_chunks);
-    while(chunk_node) {
-        chunk_info    = H5SL_item(chunk_node);
+  chunk_node        = H5SL_first(fm->sel_chunks);
+
+  /*Obtain the regularity and selection information for all chunks in this process. */
+  while(chunk_node){
+
+      chunk_info    = H5SL_item(chunk_node);
 
 #ifndef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
-        /* regularity information: 1, selection information: 2 */
-        if(H5S_SELECT_IS_REGULAR(chunk_info->fspace) == TRUE &&
-                H5S_SELECT_IS_REGULAR(chunk_info->mspace) == TRUE)
+      /* regularity information: 1, selection information: 2 */
+      if(H5S_SELECT_IS_REGULAR(chunk_info->fspace) == TRUE &&
+         H5S_SELECT_IS_REGULAR(chunk_info->mspace) == TRUE)
 #endif
-            io_mode_info[chunk_info->index] = H5D_CHUNK_SELECT_REG; /* this chunk is selected and is "regular" without defining H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS. */
+	io_mode_info[chunk_info->index] = H5D_CHUNK_SELECT_REG; /* this chunk is selected and is "regular" without defining H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS. */
 #ifndef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
-        else
-            io_mode_info[chunk_info->index] = H5D_CHUNK_SELECT_IRREG; /* this chunk is selected and is irregular*/
+      else
+	io_mode_info[chunk_info->index] = H5D_CHUNK_SELECT_IRREG; /* this chunk is selected and is irregular*/
 #endif
-        chunk_node = H5SL_next(chunk_node);
-    } /* end while */
+
+      chunk_node = H5SL_next(chunk_node);
+  }
   
-    /*Gather all the information */
-    if(MPI_SUCCESS != (mpi_code = MPI_Gather(io_mode_info, total_chunks, MPI_BYTE, recv_io_mode_info, total_chunks, MPI_BYTE, root, comm)))
-        HMPI_GOTO_ERROR(FAIL, "MPI_Gather failed", mpi_code)
-
-    /* Calculate the mode for IO(collective, independent or none) at root process */
-    if(mpi_rank == root) {
-        int               nproc;
-        int*              nproc_per_chunk;
+  /*Create sent MPI derived datatype */
+  if(MPI_SUCCESS !=(mpi_code = MPI_Type_contiguous(total_chunks,MPI_BYTE,&stype)))
+    HMPI_GOTO_ERROR(FAIL, "MPI_Comm_rank failed", mpi_code);
+  if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&stype)))
+    HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code);
+
+  /*Create received basic MPI derived datatype */
+  bascount      = 2;
+  basblock[0]   = total_chunks;
+  basblock[1]   = total_chunks;
+  basdisp[0]    = 0;
+  basdisp[1]    = (MPI_Aint)(sizeof(MPI_BYTE)*total_chunks);/* may need to check overflow */
+  bastype[0]    = MPI_BYTE;
+ 
+  if(MPI_SUCCESS !=(mpi_code = MPI_Type_contiguous(sizeof(haddr_t),MPI_BYTE,&chunk_addrtype)))
+    HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code);
+  if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&chunk_addrtype)))
+    HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code);
+  bastype[1]    = chunk_addrtype;
+
+  if(MPI_SUCCESS !=(mpi_code = MPI_Type_struct(bascount,basblock,basdisp,bastype,&rtype)))
+    HMPI_GOTO_ERROR(FAIL, "MPI_Type_struct failed", mpi_code);
+  if(MPI_SUCCESS !=(mpi_code = MPI_Type_commit(&rtype)))
+    HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code);
+
+  /* Set up a flag to clean up the MPI derived datatype later */
+  mpi_type_cleanup = 1;
+
+  /*Gather all the information */
+  if(MPI_SUCCESS !=(mpi_code = MPI_Gather(io_mode_info,1,stype,recv_io_mode_info,1,stype,root,comm)))
+    HMPI_GOTO_ERROR(FAIL, "MPI_Gather failed", mpi_code);
+
+  /* Calculate the mode for IO(collective, independent or none) at root process */
+  if(mpi_rank == root) {
+
+    int               nproc;
+    int*              nproc_per_chunk;
 #if !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS)
-        int*              ind_this_chunk;
+    int*              ind_this_chunk;
 #endif
 
-        /* pre-computing: calculate number of processes and 
-            regularity of the selection occupied in each chunk */
-        nproc_per_chunk = (int*)H5MM_calloc(total_chunks * sizeof(int));
+    /* pre-computing: calculate number of processes and 
+        regularity of the selection occupied in each chunk */
+    nproc_per_chunk = (int*)H5MM_calloc(total_chunks*sizeof(int));
 #if !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS)
-        ind_this_chunk   = (int*)H5MM_calloc(total_chunks * sizeof(int));
+    ind_this_chunk   = (int*)H5MM_calloc(total_chunks*sizeof(int));
 #endif
 
-        /* calculating the chunk address */
-        if(H5D_istore_chunkmap(io_info, chunk_addr, fm->down_chunks) < 0) {
-            HDfree(nproc_per_chunk);
+    /* calculating the chunk address */
+    if(H5D_istore_chunkmap(io_info, chunk_addr, fm->down_chunks)<0){
+      HDfree(nproc_per_chunk);
 #if !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS)
-            HDfree(ind_this_chunk);
+      HDfree(ind_this_chunk);
 #endif
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address")
-        } /* end if */
-
-        /* checking for number of process per chunk and regularity of the selection*/
-        for(nproc = 0; nproc < mpi_size; nproc++) {
-            uint8_t *tmp_recv_io_mode_info = recv_io_mode_info + (nproc * total_chunks);
-
-            /* Calculate the number of process per chunk and adding irregular selection option */
-            for(ic = 0; ic < total_chunks; ic++, tmp_recv_io_mode_info++) {
-                if(*tmp_recv_io_mode_info != 0) {
-                    nproc_per_chunk[ic]++;
+      HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address");
+    }
+
+    /* checking for number of process per chunk and regularity of the selection*/
+    for (nproc = 0;nproc <mpi_size;nproc++){
+	uint8_t *tmp_recv_io_mode_info = recv_io_mode_info + nproc*total_chunks;
+        /* calculate the number of process per chunk and adding irregular selection option */
+	for(ic = 0; ic < total_chunks; ic++, tmp_recv_io_mode_info++){
+		if(*tmp_recv_io_mode_info != 0) {
+           		nproc_per_chunk[ic]++;
 #ifndef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
-                    if(*tmp_recv_io_mode_info == H5D_CHUNK_SELECT_IRREG)
-                        ind_this_chunk[ic] = 1;
+			if(*tmp_recv_io_mode_info == H5D_CHUNK_SELECT_IRREG)
+				ind_this_chunk[ic] = 1;
 #endif
-                } /* end if */
+                }
 #ifndef H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS
                 else {
-                    /*checking whether we have a selection in this chunk */
-                    ind_this_chunk[ic] = 1;
-                } /* end else */
+                /*checking whether we have a selection in this chunk */
+		       ind_this_chunk[ic] = 1;
+        	}
 #endif
-            } /* end for */
-        } /* end for */
+         }
 
-        /* Calculating MPIO mode for each chunk (collective, independent, none) */
-        for(ic = 0; ic < total_chunks; ic++) {
-            if(nproc_per_chunk[ic] > MAX(1, threshold_nproc_per_chunk)) {
+    }
+
+    /* Calculating MPIO mode for each chunk (collective, independent, none) */
+    for(ic = 0; ic < total_chunks; ic++){
+	  if(nproc_per_chunk[ic]>MAX(1,threshold_nproc_per_chunk)){
 #if !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS)
-                if(!ind_this_chunk[ic])
-                    assign_io_mode[ic] = H5D_CHUNK_IO_MODE_COL;
+	    if(!ind_this_chunk[ic]) assign_io_mode[ic] = H5D_CHUNK_IO_MODE_COL;
 #else
-                assign_io_mode[ic] = H5D_CHUNK_IO_MODE_COL;
+	    assign_io_mode[ic] = H5D_CHUNK_IO_MODE_COL;
 #endif
-            } /* end if */
-        } /* end for */
+	  }
+    }
 
 
-        /* merge buffer io_mode info and chunk addr into one */
-        HDmemcpy(mergebuf, assign_io_mode, total_chunks);
-        HDmemcpy(tempbuf, chunk_addr, sizeof(haddr_t) * total_chunks);
+    /* merge buffer io_mode info and chunk addr into one */
+    HDmemcpy(mergebuf,assign_io_mode,sizeof(MPI_BYTE)*total_chunks);
+    HDmemcpy(tempbuf,chunk_addr,sizeof(haddr_t)*total_chunks);
 
-        HDfree(nproc_per_chunk);
+    HDfree(nproc_per_chunk);
 #if !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS)
-        HDfree(ind_this_chunk);
+    HDfree(ind_this_chunk);
 #endif
-    } /* end if */
+  }
 
-    /* Broadcasting the MPI_IO option info. and chunk address info. */
-    if(MPI_SUCCESS != (mpi_code = MPI_Bcast(mergebuf, ((sizeof(haddr_t) + 1) * total_chunks), MPI_BYTE, root, comm)))
-        HMPI_GOTO_ERROR(FAIL, "MPI_BCast failed", mpi_code)
+   /* Broadcasting the MPI_IO option info. and chunk address info. */
+   if(MPI_SUCCESS !=(mpi_code = MPI_Bcast(mergebuf,1,rtype,root,comm)))
+     HMPI_GOTO_ERROR(FAIL, "MPI_BCast failed", mpi_code);
 
-    HDmemcpy(assign_io_mode, mergebuf, total_chunks);
-    HDmemcpy(chunk_addr, tempbuf, sizeof(haddr_t) * total_chunks);
+   HDmemcpy(assign_io_mode,mergebuf,sizeof(MPI_BYTE)*total_chunks);
+   HDmemcpy(chunk_addr,tempbuf,sizeof(haddr_t)*total_chunks);
 
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
-    check_prop = H5Pexist(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME);
+    check_prop = H5Pexist(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME);
     if(check_prop > 0) {
 #if !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS)
-        new_value = 0;
-        if(H5Pset(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME, &new_value) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to set property value")
+      new_value = 0;
+      if(H5Pset(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME,&new_value)<0)
+              HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to set property value");
 #else 
-        for(ic = 0; ic < total_chunks; ic++) {
-            if(assign_io_mode[ic] == H5D_CHUNK_IO_MODE_COL) {
-                new_value = 0;
-                if(H5Pset(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME,&new_value) < 0)
-                    HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to set property value")
-                break;
-            } /* end if */
-        } /* end for */
+      for(ic = 0; ic < total_chunks; ic++){
+        if(assign_io_mode[ic] == H5D_CHUNK_IO_MODE_COL) {
+           new_value = 0;
+	   if(H5Pset(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME,&new_value)<0)
+              HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to set property value");
+           break;
+        }
+      }
 #endif
-    } /* end if */
-
-    check_prop = H5Pexist(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME);
-    if(check_prop > 0) {
-        int temp_count = 0;
-
-        for(ic = 0; ic < total_chunks; ic++) {
-            if(assign_io_mode[ic] == H5D_CHUNK_IO_MODE_COL) {
-                temp_count++;
-                break;
-            } /* end if */
-        } /* end for */
-        if(temp_count == 0) {
-            new_value = 0;
-            if(H5Pset(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME, &new_value) < 0)
-                HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to set property value")
-        } /* end if */
-    } /* end if */
+    }
+   check_prop = H5Pexist(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME);
+   if(check_prop > 0) {
+      int temp_count = 0;
+      for(ic = 0; ic < total_chunks; ic++){
+        if(assign_io_mode[ic] == H5D_CHUNK_IO_MODE_COL) {
+          temp_count++;
+          break;
+        }
+      }
+      if(temp_count==0){
+        new_value = 0;
+        if(H5Pset(io_info->dxpl_id,H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME,&new_value)<0)
+          HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to set property value");
+      }
+   }
 #endif
  
 done:
-    if(mem_cleanup) {
-        HDfree(io_mode_info);
-        HDfree(mergebuf);
-        if(mpi_rank == root) 
-            HDfree(recv_io_mode_info);
-    } /* end if */
+
+   if(mpi_type_cleanup) {
+     if (MPI_SUCCESS != (mpi_code= MPI_Type_free( &chunk_addrtype )))
+            HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code);
+
+     if (MPI_SUCCESS != (mpi_code= MPI_Type_free( &stype )))
+            HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code);
+
+     if (MPI_SUCCESS != (mpi_code= MPI_Type_free( &rtype )))
+            HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code);
+   }
+
+   if(mem_cleanup){
+     HDfree(io_mode_info);
+     HDfree(mergebuf);
+     if(mpi_rank == root) 
+       HDfree(recv_io_mode_info);
+   }
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_obtain_mpio_mode() */
+}/* end H5D_obtain_mpio_mode*/
 
 static int
 H5D_cmp_chunk_addr(const void *chunk_addr_info1, const void *chunk_addr_info2)
@@ -2018,6 +2041,7 @@ H5D_cmp_chunk_addr(const void *chunk_addr_info1, const void *chunk_addr_info2)
    addr2 = ((const H5D_chunk_addr_info_t *)chunk_addr_info2)->chunk_addr;
 
    FUNC_LEAVE_NOAPI(H5F_addr_cmp(addr1, addr2))
+
 }
 #endif  /* H5_HAVE_PARALLEL */
 
diff --git a/src/H5Doh.c b/src/H5Doh.c
index 37f011b..01447a3 100644
--- a/src/H5Doh.c
+++ b/src/H5Doh.c
@@ -316,7 +316,7 @@ H5O_dset_get_oloc(hid_t obj_id)
     FUNC_ENTER_NOAPI_NOINIT(H5O_dset_get_oloc)
 
     /* Get the dataset */
-    if(NULL == (dset = (H5D_t *)H5I_object(obj_id)))
+    if(NULL == (dset = H5I_object(obj_id)))
         HGOTO_ERROR(H5E_OHDR, H5E_BADATOM, NULL, "couldn't get object from ID")
 
     /* Get the dataset's object header location */
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index 97dcacf..aec5e19 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -49,156 +49,74 @@
 #define H5D_MINHDR_SIZE 256
 
 /* [Simple] Macro to construct a H5D_io_info_t from it's components */
-#define H5D_BUILD_IO_INFO_WRT(io_info, ds, dxpl_c, dxpl_i, str, buf)    \
-    (io_info)->dset = ds;                                               \
-    (io_info)->dxpl_cache = dxpl_c;                                     \
-    (io_info)->dxpl_id = dxpl_i;                                        \
-    (io_info)->store = str;                                             \
-    (io_info)->op_type = H5D_IO_OP_WRITE;                               \
-    (io_info)->u.wbuf = buf
-#define H5D_BUILD_IO_INFO_RD(io_info, ds, dxpl_c, dxpl_i, str, buf)     \
-    (io_info)->dset = ds;                                               \
-    (io_info)->dxpl_cache = dxpl_c;                                     \
-    (io_info)->dxpl_id = dxpl_i;                                        \
-    (io_info)->store = str;                                             \
-    (io_info)->op_type = H5D_IO_OP_READ;                                \
-    (io_info)->u.rbuf = buf
-
-#define H5D_CHUNK_HASH(D, ADDR) H5F_addr_hash(ADDR, (D)->cache.chunk.nslots)
+#define H5D_BUILD_IO_INFO(io_info,ds,dxpl_c,dxpl_i,str)                 \
+    (io_info)->dset=ds;                                                 \
+    (io_info)->dxpl_cache=dxpl_c;                                       \
+    (io_info)->dxpl_id=dxpl_i;                                          \
+    (io_info)->store=str
 
 
 /****************************/
 /* Package Private Typedefs */
 /****************************/
 
-/* Typedef for datatype information for raw data I/O operation */
-typedef struct H5D_type_info_t {
-    /* Initial values */
-    const H5T_t *mem_type;              /* Pointer to memory datatype */
-    const H5T_t *dset_type;             /* Pointer to dataset datatype */
-    H5T_path_t *tpath;                  /* Datatype conversion path */
-    hid_t src_type_id;                  /* Source datatype ID */
-    hid_t dst_type_id;                  /* Destination datatype ID */
-
-    /* Computed/derived values */
-    size_t src_type_size;		/* Size of source type	*/
-    size_t dst_type_size;	        /* Size of destination type*/
-    size_t max_type_size;	        /* Size of largest source/destination type */
-    hbool_t is_conv_noop;               /* Whether the type conversion is a NOOP */
-    hbool_t is_xform_noop;              /* Whether the data transform is a NOOP */
-    H5T_subset_t cmpd_subset;           /* Whether (and which) the source/destination datatypes are compound subsets of one another */
-    H5T_bkg_t need_bkg;		        /* Type of background buf needed */
-    size_t request_nelmts;		/* Requested strip mine	*/
-    uint8_t *tconv_buf;	                /* Datatype conv buffer	*/
-    hbool_t tconv_buf_allocated;        /* Whether the type conversion buffer was allocated */
-    uint8_t *bkg_buf;	                /* Background buffer	*/
-    hbool_t bkg_buf_allocated;          /* Whether the background buffer was allocated */
-} H5D_type_info_t;
-
-/* Forward declaration of structs used below */
+/*
+ * If there is no data type conversion then it might be possible to
+ * transfer data points between application memory and the file in one
+ * step without going through the data type conversion buffer.
+ */
+
+/* Read from file to application w/o intermediate scratch buffer */
 struct H5D_io_info_t;
-struct H5D_chunk_map_t;
+typedef herr_t (*H5D_io_read_func_t)(struct H5D_io_info_t *io_info,
+    size_t nelmts, size_t elmt_size,
+    const H5S_t *file_space, const H5S_t *mem_space, haddr_t addr,
+    void *chunk, void *buf/*out*/);
+
+
+/* Write directly from app buffer to file */
+typedef herr_t (*H5D_io_write_func_t)(struct H5D_io_info_t *io_info,
+    size_t nelmts, size_t elmt_size,
+    const H5S_t *file_space, const H5S_t *mem_space, haddr_t addr,
+    void *chunk, const void *buf);
 
 /* Function pointers for I/O on particular types of dataset layouts */
-typedef herr_t (*H5D_layout_init_func_t)(const struct H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    struct H5D_chunk_map_t *cm);
-typedef herr_t (*H5D_layout_read_func_t)(struct H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, struct H5D_chunk_map_t *fm);
-typedef herr_t (*H5D_layout_write_func_t)(struct H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, struct H5D_chunk_map_t *fm);
-typedef ssize_t (*H5D_layout_readvv_func_t)(const struct H5D_io_info_t *io_info,
+typedef ssize_t (*H5D_io_readvv_func_t)(const struct H5D_io_info_t *io_info,
     size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
-typedef ssize_t (*H5D_layout_writevv_func_t)(const struct H5D_io_info_t *io_info,
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
+    haddr_t chunk_addr, void *chunk, void *buf);
+typedef ssize_t (*H5D_io_writevv_func_t)(const struct H5D_io_info_t *io_info,
     size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
-typedef herr_t (*H5D_layout_term_func_t)(const struct H5D_chunk_map_t *cm);
-
-/* Typedef for grouping layout I/O routines */
-typedef struct H5D_layout_ops_t {
-    H5D_layout_init_func_t init;        /* I/O initialization routine */
-    H5D_layout_read_func_t ser_read;    /* High-level I/O routine for reading data in serial */
-    H5D_layout_write_func_t ser_write;  /* High-level I/O routine for writing data in serial */
-#ifdef H5_HAVE_PARALLEL
-    H5D_layout_read_func_t par_read;    /* High-level I/O routine for reading data in parallel */
-    H5D_layout_write_func_t par_write;  /* High-level I/O routine for writing data in parallel */
-#endif /* H5_HAVE_PARALLEL */
-    H5D_layout_readvv_func_t readvv;    /* Low-level I/O routine for reading data */
-    H5D_layout_writevv_func_t writevv;  /* Low-level I/O routine for writing data */
-    H5D_layout_term_func_t term;        /* I/O shutdown routine */
-} H5D_layout_ops_t;
-
-/* Function pointers for either multiple or single block I/O access */
-typedef herr_t (*H5D_io_single_read_func_t)(const struct H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
-typedef herr_t (*H5D_io_single_write_func_t)(const struct H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
+    haddr_t chunk_addr, void *chunk, const void *buf);
 
 /* Typedef for raw data I/O framework info */
 typedef struct H5D_io_ops_t {
-    H5D_layout_read_func_t multi_read;          /* High-level I/O routine for reading data */
-    H5D_layout_write_func_t multi_write;        /* High-level I/O routine for writing data */
-    H5D_io_single_read_func_t single_read;      /* I/O routine for reading single block */
-    H5D_io_single_write_func_t single_write;    /* I/O routine for writing single block */
+    H5D_io_read_func_t read;            /* Direct I/O routine for reading */
+    H5D_io_write_func_t write;          /* Direct I/O routine for writing */
+    H5D_io_readvv_func_t readvv;        /* I/O routine for reading data */
+    H5D_io_writevv_func_t writevv;      /* I/O routine for writing data */
 } H5D_io_ops_t;
 
-/* Typedefs for dataset storage information */
-typedef struct {
-    haddr_t dset_addr;      /* Address of dataset in file */
-    hsize_t dset_size;      /* Total size of dataset in file */
-} H5D_contig_storage_t;
-
-typedef struct {
-    hsize_t index;          /* "Index" of chunk in dataset (must be first for TBBT routines) */
-    hsize_t *offset;        /* Chunk's coordinates in elements */
-} H5D_chunk_storage_t;
-
-typedef struct {
-    void *buf;              /* Buffer for compact dataset */
-    hbool_t *dirty;         /* Pointer to dirty flag to mark */
-} H5D_compact_storage_t;
-
-typedef union H5D_storage_t {
-    H5D_contig_storage_t contig; /* Contiguous information for dataset */
-    H5D_chunk_storage_t chunk;  /* Chunk information for dataset */
-    H5D_compact_storage_t compact; /* Compact information for dataset */
-    H5O_efl_t   efl;            /* External file list information for dataset */
-} H5D_storage_t;
-
 /* Typedef for raw data I/O operation info */
 typedef struct H5D_io_info_t {
     H5D_t *dset;                /* Pointer to dataset being operated on */
 #ifndef H5_HAVE_PARALLEL
     const
 #endif /* H5_HAVE_PARALLEL */
-        H5D_dxpl_cache_t *dxpl_cache; /* Pointer to cached DXPL info */
+        H5D_dxpl_cache_t *dxpl_cache; /* Pointer to cache DXPL info */
     hid_t dxpl_id;              /* Original DXPL ID */
 #ifdef H5_HAVE_PARALLEL
     MPI_Comm comm;              /* MPI communicator for file */
+    hbool_t xfer_mode_changed;  /* Whether the transfer mode was changed */
+    hbool_t xfer_opt_mode_changed;
     hbool_t using_mpi_vfd;      /* Whether the file is using an MPI-based VFD */
-    struct {
-        H5FD_mpio_xfer_t xfer_mode; /* Parallel transfer for this request (H5D_XFER_IO_XFER_MODE_NAME) */
-        H5FD_mpio_collective_opt_t coll_opt_mode; /* Parallel transfer with independent IO or collective IO with this mode */
-        H5D_io_ops_t io_ops;    /* I/O operation function pointers */
-    } orig;                     
 #endif /* H5_HAVE_PARALLEL */
-    H5D_storage_t *store;       /* Dataset storage info */
-    H5D_layout_ops_t layout_ops;    /* Dataset layout I/O operation function pointers */
-    H5D_io_ops_t io_ops;        /* I/O operation function pointers */
-    enum {
-        H5D_IO_OP_READ,         /* Read operation */
-        H5D_IO_OP_WRITE         /* Write operation */
-    } op_type;
-    union {
-        void *rbuf;             /* Pointer to buffer for read */
-        const void *wbuf;       /* Pointer to buffer to write */
-    } u;
+    const H5D_storage_t *store; /* Dataset storage info */
+    H5D_io_ops_t ops;           /* I/O operation function pointers */
+#ifdef H5S_DEBUG
+    H5S_iostats_t *stats;       /* I/O statistics */
+#endif /* H5S_DEBUG */
 } H5D_io_info_t;
 
 /* Structure holding information about a chunk's selection for mapping */
@@ -265,8 +183,8 @@ typedef struct H5D_shared_t {
     hbool_t             layout_dirty;   /* Whether the layout info needs to be flushed to the file */
     hid_t               dcpl_id;        /* dataset creation property id */
     H5D_dcpl_cache_t    dcpl_cache;     /* Cached DCPL values */
+    H5D_io_ops_t        io_ops;         /* I/O operations */
     H5O_layout_t        layout;         /* data layout                  */
-    const H5D_layout_ops_t *layout_ops; /* Pointer to data layout I/O operations */
     hbool_t             checked_filters;/* TRUE if dataset passes can_apply check */
 
     /* Buffered/cached information for types of raw data storage*/
@@ -311,21 +229,18 @@ typedef struct H5D_chunk_map_t {
     H5S_sel_type msel_type;     /* Selection type in memory */
 
     H5SL_t *sel_chunks;         /* Skip list containing information for each chunk selected */
-
     H5S_t  *single_space;       /* Dataspace for single chunk */
     H5D_chunk_info_t *single_chunk_info;  /* Pointer to single chunk's info */
     hbool_t use_single;         /* Whether I/O is on a single element */
-
     hsize_t last_index;         /* Index of last chunk operated on */
     H5D_chunk_info_t *last_chunk_info;  /* Pointer to last chunk's info */
-
     hsize_t chunks[H5O_LAYOUT_NDIMS];   /* Number of chunks in each dimension */
     hsize_t chunk_dim[H5O_LAYOUT_NDIMS];    /* Size of chunk in each dimension */
     hsize_t down_chunks[H5O_LAYOUT_NDIMS];   /* "down" size of number of chunks in each dimension */
 
 #ifdef H5_HAVE_PARALLEL
-    hsize_t total_chunks;       /* Number of chunks covered by dataspace */
-    H5D_chunk_info_t **select_chunk;    /* Store the information about whether this chunk is selected or not */
+    hsize_t total_chunks;       /* Number of total chunks */
+    hbool_t *select_chunk;         /* store the information about whether this chunk is selected or not */
 #endif /* H5_HAVE_PARALLEL */
 } H5D_chunk_map_t;
 
@@ -417,34 +332,12 @@ typedef struct {
     hsize_t size;       /* Accumulated number of bytes for the selection */
 } H5D_vlen_bufsize_t;
 
-/* Raw data chunks are cached.  Each entry in the cache is: */
-typedef struct H5D_rdcc_ent_t {
-    hbool_t	locked;		/*entry is locked in cache		*/
-    hbool_t	dirty;		/*needs to be written to disk?		*/
-    hsize_t	offset[H5O_LAYOUT_NDIMS]; /*chunk name			*/
-    size_t	rd_count;	/*bytes remaining to be read		*/
-    size_t	wr_count;	/*bytes remaining to be written		*/
-    size_t	chunk_size;	/*size of a chunk			*/
-    size_t	alloc_size;	/*amount allocated for the chunk	*/
-    uint8_t	*chunk;		/*the unfiltered chunk data		*/
-    unsigned	idx;		/*index in hash table			*/
-    struct H5D_rdcc_ent_t *next;/*next item in doubly-linked list	*/
-    struct H5D_rdcc_ent_t *prev;/*previous item in doubly-linked list	*/
-} H5D_rdcc_ent_t;
-typedef H5D_rdcc_ent_t *H5D_rdcc_ent_ptr_t; /* For free lists */
-
 
 /*****************************/
 /* Package Private Variables */
 /*****************************/
 extern H5D_dxpl_cache_t H5D_def_dxpl_cache;
 
-/* Storage layout classes */
-H5_DLLVAR const H5D_layout_ops_t H5D_LOPS_CONTIG[1];
-H5_DLLVAR const H5D_layout_ops_t H5D_LOPS_EFL[1];
-H5_DLLVAR const H5D_layout_ops_t H5D_LOPS_COMPACT[1];
-H5_DLLVAR const H5D_layout_ops_t H5D_LOPS_CHUNK[1];
-
 
 /******************************/
 /* Package Private Prototypes */
@@ -468,51 +361,54 @@ H5_DLL herr_t H5D_vlen_get_buf_size(void *elem, hid_t type_id, unsigned ndim,
     const hsize_t *point, void *op_data);
 H5_DLL herr_t H5D_check_filters(H5D_t *dataset);
 H5_DLL herr_t H5D_set_extent(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id);
-H5_DLL herr_t H5D_get_dxpl_cache(hid_t dxpl_id, H5D_dxpl_cache_t **cache);
-
-/* Functions that perform direct serial I/O operations */
-H5_DLL herr_t H5D_select_read(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
-H5_DLL herr_t H5D_select_write(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
-
-/* Functions that perform scatter-gather serial I/O operations */
-H5_DLL herr_t H5D_scatter_mem(const void *_tscat_buf,
+
+/* Functions that perform serial I/O operations */
+H5_DLL herr_t H5D_select_fscat(H5D_io_info_t *io_info,
+    const H5S_t *file_space, H5S_sel_iter_t *file_iter, size_t nelmts,
+    haddr_t chunk_addr, void *chunk, const void *_buf);
+H5_DLL size_t H5D_select_fgath(H5D_io_info_t *io_info,
+    const H5S_t *file_space, H5S_sel_iter_t *file_iter, size_t nelmts,
+    haddr_t chunk_addr, void *chunk, void *buf);
+H5_DLL herr_t H5D_select_mscat(const void *_tscat_buf,
     const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
-    const H5D_dxpl_cache_t *dxpl_cache, void *_buf);
-H5_DLL herr_t H5D_scatgath_read(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
-H5_DLL herr_t H5D_scatgath_write(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
+    const H5D_dxpl_cache_t *dxpl_cache, void *_buf/*out*/);
+H5_DLL size_t H5D_select_mgath(const void *_buf,
+    const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
+    const H5D_dxpl_cache_t *dxpl_cache, void *_tgath_buf/*out*/);
+H5_DLL herr_t H5D_select_read(H5D_io_info_t *io_info,
+    size_t nelmts, size_t elmt_size,
+    const H5S_t *file_space, const H5S_t *mem_space,
+    haddr_t addr, void *chunk/*in*/, void *buf/*out*/);
+H5_DLL herr_t H5D_select_write(H5D_io_info_t *io_info,
+    size_t nelmts, size_t elmt_size,
+    const H5S_t *file_space, const H5S_t *mem_space,
+    haddr_t addr, void *chunk/*in*/, const void *buf/*out*/);
 
 /* Functions that operate on contiguous storage */
 H5_DLL herr_t H5D_contig_create(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout);
 H5_DLL herr_t H5D_contig_fill(H5D_t *dset, hid_t dxpl_id);
 H5_DLL haddr_t H5D_contig_get_addr(const H5D_t *dset);
-H5_DLL herr_t H5D_contig_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *fm);
-H5_DLL herr_t H5D_contig_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *fm);
 H5_DLL ssize_t H5D_contig_readvv(const H5D_io_info_t *io_info,
     size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
+    haddr_t UNUSED address, void UNUSED *pointer, void *buf);
 H5_DLL ssize_t H5D_contig_writevv(const H5D_io_info_t *io_info,
     size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
+    haddr_t UNUSED address, void UNUSED *pointer, const void *buf);
 H5_DLL herr_t H5D_contig_copy(H5F_t *f_src, const H5O_layout_t *layout_src, H5F_t *f_dst, 
     H5O_layout_t *layout_dst, H5T_t *src_dtype, H5O_copy_t *cpy_info, hid_t dxpl_id);
 
-/* Functions that operate on chunked dataset storage */
-H5_DLL hbool_t H5D_chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr);
-
 /* Functions that operate on compact dataset storage */
 H5_DLL herr_t H5D_compact_fill(H5D_t *dset, hid_t dxpl_id);
+H5_DLL ssize_t H5D_compact_readvv(const H5D_io_info_t *io_info,
+    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_size_arr[], hsize_t dset_offset_arr[],
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[],
+    haddr_t UNUSED addr, void UNUSED *pointer/*in*/, void *buf);
+H5_DLL ssize_t H5D_compact_writevv(const H5D_io_info_t *io_info,
+    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_size_arr[], hsize_t dset_offset_arr[],
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_size_arr[], hsize_t mem_offset_arr[],
+    haddr_t UNUSED addr, void UNUSED *pointer/*in*/, const void *buf);
 H5_DLL herr_t H5D_compact_copy(H5F_t *f_src, H5O_layout_t *layout_src,
     H5F_t *f_dst, H5O_layout_t *layout_dst, H5T_t *src_dtype, H5O_copy_t *cpy_info, hid_t dxpl_id);
 
@@ -534,11 +430,19 @@ H5_DLL herr_t H5D_istore_initialize_by_extent(H5D_io_info_t *io_info);
 H5_DLL herr_t H5D_istore_update_cache(H5D_t *dset, hid_t dxpl_id);
 H5_DLL herr_t H5D_istore_dump_btree(H5F_t *f, hid_t dxpl_id, FILE *stream, unsigned ndims,
         haddr_t addr);
-H5_DLL herr_t H5D_istore_chunkmap(const H5D_io_info_t *io_info,
-    haddr_t chunk_addr[], const hsize_t down_chunks[]);
+H5_DLL herr_t H5D_istore_chunkmap(const H5D_io_info_t *io_info, haddr_t chunk_addr[],hsize_t down_chunks[] );
 #ifdef H5D_ISTORE_DEBUG
 H5_DLL herr_t H5D_istore_stats (H5D_t *dset, hbool_t headers);
 #endif /* H5D_ISTORE_DEBUG */
+H5_DLL ssize_t H5D_istore_readvv(const H5D_io_info_t *io_info,
+    size_t chunk_max_nseq, size_t *chunk_curr_seq, size_t chunk_len_arr[],
+    hsize_t chunk_offset_arr[], size_t mem_max_nseq, size_t *mem_curr_seq,
+    size_t mem_len_arr[], hsize_t mem_offset_arr[], haddr_t chunk_addr, void *chunk, void *buf);
+H5_DLL ssize_t H5D_istore_writevv(const H5D_io_info_t *io_info,
+    size_t chunk_max_nseq, size_t *chunk_curr_seq, size_t chunk_len_arr[],
+    hsize_t chunk_offset_arr[], size_t mem_max_nseq, size_t *mem_curr_seq,
+    size_t mem_len_arr[], hsize_t mem_offset_arr[], haddr_t chunk_addr, void *chunk, 
+    const void *buf);
 H5_DLL haddr_t H5D_istore_get_addr(const H5D_io_info_t *io_info,
     struct H5D_istore_ud1_t *_udata);
 H5_DLL herr_t H5D_istore_copy(H5F_t *f_src, H5O_layout_t *layout_src,
@@ -548,6 +452,17 @@ H5_DLL void * H5D_istore_lock(const H5D_io_info_t *io_info, H5D_istore_ud1_t *ud
     hbool_t relax, unsigned *idx_hint/*in,out*/);
 H5_DLL herr_t H5D_istore_unlock(const H5D_io_info_t *io_info,
     hbool_t dirty, unsigned idx_hint, void *chunk, size_t naccessed);
+H5_DLL hbool_t H5D_istore_if_load(const H5D_io_info_t *io_info, haddr_t caddr);
+
+/* Functions that operate on external file list (efl) storage */
+H5_DLL ssize_t H5D_efl_readvv(const H5D_io_info_t *io_info,
+    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
+    haddr_t UNUSED addr, void UNUSED *pointer/*in*/, void *buf);
+H5_DLL ssize_t H5D_efl_writevv(const H5D_io_info_t *io_info,
+    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
+    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
+    haddr_t UNUSED addr, void UNUSED *pointer/*in*/, const void *buf);
 
 /* Functions that perform fill value operations on datasets */
 H5_DLL herr_t H5D_fill(const void *fill, const H5T_t *fill_type, void *buf,
@@ -570,37 +485,36 @@ H5_DLL herr_t H5D_fill_term(H5D_fill_buf_info_t *fb_info);
 #define H5Dmpio_DEBUG
 #endif /*H5Dmpio_DEBUG*/
 #endif/*H5S_DEBUG*/
-/* MPI-IO function to read, it will select either regular or irregular read */
-H5_DLL herr_t H5D_mpio_select_read(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
-
-/* MPI-IO function to write, it will select either regular or irregular read */
-H5_DLL herr_t H5D_mpio_select_write(const H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space);
-
-/* MPI-IO functions to handle contiguous collective IO */
-H5_DLL herr_t H5D_contig_collective_read(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, H5D_chunk_map_t *fm);
-H5_DLL herr_t H5D_contig_collective_write(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, H5D_chunk_map_t *fm);
-
-/* MPI-IO functions to handle chunked collective IO */
-H5_DLL herr_t H5D_chunk_collective_read(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, H5D_chunk_map_t *fm);
-H5_DLL herr_t H5D_chunk_collective_write(H5D_io_info_t *io_info,
-    const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space,
-    const H5S_t *mem_space, H5D_chunk_map_t *fm);
-
+/* MPI-IO function to read , it will select either regular or irregular read */
+H5_DLL herr_t H5D_mpio_select_read(H5D_io_info_t *io_info,
+    size_t nelmts, size_t elmt_size,
+    const struct H5S_t *file_space, const struct H5S_t *mem_space,
+    haddr_t addr, void UNUSED *pointer/*in*/, void *buf/*out*/);
+
+/* MPI-IO function to read , it will select either regular or irregular read */
+H5_DLL herr_t H5D_mpio_select_write(H5D_io_info_t *io_info,
+    size_t nelmts, size_t elmt_size,
+    const struct H5S_t *file_space, const struct H5S_t *mem_space,
+    haddr_t addr, void UNUSED *pointer/*in*/, const void *buf);
+
+/* MPI-IO function to handle contiguous collective IO */
+H5_DLL herr_t
+H5D_contig_collective_io(H5D_io_info_t *io_info,
+			 const H5S_t *file_space,const H5S_t *mem_space,
+			 const void *_buf,hbool_t do_write);
+
+/* MPI-IO function to handle chunked collective IO */
+H5_DLL herr_t
+H5D_chunk_collective_io(H5D_io_info_t * io_info, H5D_chunk_map_t *fm, const void*buf,
+			hbool_t do_write);
 /* MPI-IO function to check if a direct I/O transfer is possible between
  * memory and the file */
-H5_DLL htri_t H5D_mpio_opt_possible(const H5D_io_info_t *io_info,
-    const H5S_t *file_space, const H5S_t *mem_space,
-    const H5D_type_info_t *type_info, const H5D_chunk_map_t *fm);
+H5_DLL htri_t H5D_mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *mem_space,
+    const H5S_t *file_space, const H5T_path_t *tpath);
+
+#ifndef H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS
+H5_DLL herr_t  H5D_mpio_chunk_adjust_iomode(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm);
+#endif /* H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS */
 
 #endif /* H5_HAVE_PARALLEL */
 
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index 8cf134f..410dc43 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -65,6 +65,7 @@
 #define H5D_XFER_HYPER_VECTOR_SIZE_NAME "vec_size"      /* Hyperslab vector size */
 #ifdef H5_HAVE_PARALLEL
 #define H5D_XFER_IO_XFER_MODE_NAME      "io_xfer_mode"  /* I/O transfer mode */
+#define H5D_XFER_IO_XFER_OPT_MODE_NAME  "io_xfer_opt_mode" /* I/O optimization transfer mode (using MPI-IO independent IO with file set view) */
 #define H5D_XFER_MPIO_COLLECTIVE_OPT_NAME "mpio_collective_opt" /* Optimization of MPI-IO transfer mode */
 #define H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME "mpio_chunk_opt_hard"
 #define H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME "mpio_chunk_opt_num"
@@ -106,6 +107,23 @@
 /* Typedef for dataset in memory (defined in H5Dpkg.h) */
 typedef struct H5D_t H5D_t;
 
+/* Typedef for dataset storage information */
+typedef struct {
+    hsize_t index;          /* "Index" of chunk in dataset (must be first for TBBT routines) */
+    hsize_t *offset;        /* Chunk's coordinates in elements */
+} H5D_chunk_storage_t;
+
+typedef struct {
+    haddr_t dset_addr;      /* Address of dataset in file */
+    hsize_t dset_size;      /* Total size of dataset in file */
+} H5D_contig_storage_t;
+
+typedef union H5D_storage_t {
+    H5O_efl_t   efl;            /* External file list information for dataset */
+    H5D_chunk_storage_t chunk;  /* Chunk information for dataset */
+    H5D_contig_storage_t contig; /* Contiguous information for dataset */
+} H5D_storage_t;
+
 /* Typedef for cached dataset transfer property list information */
 typedef struct H5D_dxpl_cache_t {
     size_t max_temp_buf;        /* Maximum temporary buffer size (H5D_XFER_MAX_TEMP_BUF_NAME) */
@@ -117,7 +135,7 @@ typedef struct H5D_dxpl_cache_t {
     size_t vec_size;            /* Size of hyperslab vector (H5D_XFER_HYPER_VECTOR_SIZE_NAME) */
 #ifdef H5_HAVE_PARALLEL
     H5FD_mpio_xfer_t xfer_mode; /* Parallel transfer for this request (H5D_XFER_IO_XFER_MODE_NAME) */
-    H5FD_mpio_collective_opt_t coll_opt_mode; /* Parallel transfer with independent IO or collective IO with this mode */
+    H5FD_mpio_collective_opt_t xfer_opt_mode; /* Parallel transfer with independent IO or collective IO with this mode */
 #endif /*H5_HAVE_PARALLEL*/
     H5Z_cb_t filter_cb;         /* Filter callback function (H5D_XFER_FILTER_CB_NAME) */
     H5Z_data_xform_t *data_xform_prop; /* Data transform prop (H5D_XFER_XFORM_NAME) */
@@ -145,6 +163,8 @@ H5_DLL H5O_loc_t *H5D_oloc(H5D_t *dataset);
 H5_DLL H5G_name_t *H5D_nameof(H5D_t *dataset);
 H5_DLL H5T_t *H5D_typeof(const H5D_t *dset);
 H5_DLL herr_t H5D_flush(const H5F_t *f, hid_t dxpl_id, unsigned flags);
+H5_DLL herr_t H5D_get_dxpl_cache(hid_t dxpl_id, H5D_dxpl_cache_t **cache);
+H5_DLL herr_t H5D_get_dxpl_cache_real(hid_t dxpl_id, H5D_dxpl_cache_t *cache);
 
 /* Functions that operate on vlen data */
 H5_DLL herr_t H5D_vlen_reclaim(hid_t type_id, H5S_t *space, hid_t plist_id,
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c
deleted file mode 100644
index 3ea4c69..0000000
--- a/src/H5Dscatgath.c
+++ /dev/null
@@ -1,899 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/****************/
-/* Module Setup */
-/****************/
-
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg	  */
-
-
-/***********/
-/* Headers */
-/***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Dataset functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-
-
-/****************/
-/* Local Macros */
-/****************/
-
-
-/******************/
-/* Local Typedefs */
-/******************/
-
-
-/********************/
-/* Local Prototypes */
-/********************/
-static size_t H5D_gather_file(const H5D_io_info_t *io_info,
-    const H5S_t *file_space, H5S_sel_iter_t *file_iter, size_t nelmts,
-    void *buf);
-static herr_t H5D_scatter_file(const H5D_io_info_t *io_info,
-    const H5S_t *file_space, H5S_sel_iter_t *file_iter, size_t nelmts,
-    const void *buf);
-static size_t H5D_gather_mem(const void *_buf,
-    const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
-    const H5D_dxpl_cache_t *dxpl_cache, void *_tgath_buf/*out*/);
-static herr_t H5D_compound_opt_read(size_t nelmts, const H5S_t *mem_space,
-    H5S_sel_iter_t *iter, const H5D_dxpl_cache_t *dxpl_cache,
-    const H5D_type_info_t *type_info, void *user_buf/*out*/);
-static herr_t H5D_compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info);
-
-
-/*********************/
-/* Package Variables */
-/*********************/
-
-
-/*******************/
-/* Local Variables */
-/*******************/
-
-/* Declare a free list to manage sequences of size_t */
-H5FL_SEQ_EXTERN(size_t);
-
-/* Declare a free list to manage sequences of hsize_t */
-H5FL_SEQ_EXTERN(hsize_t);
-
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_scatter_file
- *
- * Purpose:	Scatters dataset elements from the type conversion buffer BUF
- *		to the file F where the data points are arranged according to
- *		the file dataspace FILE_SPACE and stored according to
- *		LAYOUT and EFL. Each element is ELMT_SIZE bytes.
- *		The caller is requesting that NELMTS elements are copied.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Thursday, June 20, 2002
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_scatter_file(const H5D_io_info_t *_io_info,
-    const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
-    const void *_buf)
-{
-    H5D_io_info_t tmp_io_info;     /* Temporary I/O info object */
-    hsize_t _off[H5D_IO_VECTOR_SIZE];             /* Array to store sequence offsets */
-    hsize_t *off = NULL;           /* Pointer to sequence offsets */
-    hsize_t mem_off;               /* Offset in memory */
-    size_t mem_curr_seq;           /* "Current sequence" in memory */
-    size_t dset_curr_seq;          /* "Current sequence" in dataset */
-    size_t _len[H5D_IO_VECTOR_SIZE];              /* Array to store sequence lengths */
-    size_t *len = NULL;            /* Array to store sequence lengths */
-    size_t orig_mem_len, mem_len;  /* Length of sequence in memory */
-    size_t  nseq;                  /* Number of sequences generated */
-    size_t  nelem;                 /* Number of elements used in sequences */
-    herr_t  ret_value = SUCCEED;   /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_scatter_file)
-
-    /* Check args */
-    HDassert(_io_info);
-    HDassert(space);
-    HDassert(iter);
-    HDassert(nelmts > 0);
-    HDassert(_buf);
-
-    /* Set up temporary I/O info object */
-    HDmemcpy(&tmp_io_info, _io_info, sizeof(*_io_info));
-    tmp_io_info.op_type = H5D_IO_OP_WRITE;
-    tmp_io_info.u.wbuf = _buf;
-
-    /* Allocate the vector I/O arrays */
-    if(tmp_io_info.dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
-        if(NULL == (len = H5FL_SEQ_MALLOC(size_t, tmp_io_info.dxpl_cache->vec_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array")
-        if(NULL == (off = H5FL_SEQ_MALLOC(hsize_t, tmp_io_info.dxpl_cache->vec_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array")
-    } /* end if */
-    else {
-        len = _len;
-        off = _off;
-    } /* end else */
-
-    /* Loop until all elements are written */
-    while(nelmts > 0) {
-        /* Get list of sequences for selection to write */
-        if(H5S_SELECT_GET_SEQ_LIST(space, H5S_GET_SEQ_LIST_SORTED, iter, tmp_io_info.dxpl_cache->vec_size, nelmts, &nseq, &nelem, off, len) < 0)
-            HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed")
-
-        /* Reset the current sequence information */
-        mem_curr_seq = dset_curr_seq = 0;
-        orig_mem_len = mem_len = nelem * iter->elmt_size;
-        mem_off = 0;
-
-        /* Write sequence list out */
-        if((*tmp_io_info.layout_ops.writevv)(&tmp_io_info, nseq, &dset_curr_seq,
-                len, off, (size_t)1, &mem_curr_seq, &mem_len, &mem_off) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
-
-        /* Update buffer */
-        tmp_io_info.u.wbuf = (const uint8_t *)tmp_io_info.u.wbuf + orig_mem_len;
-
-        /* Decrement number of elements left to process */
-        nelmts -= nelem;
-    } /* end while */
-
-done:
-    /* Release resources, if allocated */
-    if(len && len != _len)
-        H5FL_SEQ_FREE(size_t, len);
-    if(off && off != _off)
-        H5FL_SEQ_FREE(hsize_t, off);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5D_scatter_file() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_gather_file
- *
- * Purpose:	Gathers data points from file F and accumulates them in the
- *		type conversion buffer BUF.  The LAYOUT argument describes
- *		how the data is stored on disk and EFL describes how the data
- *		is organized in external files.  ELMT_SIZE is the size in
- *		bytes of a datum which this function treats as opaque.
- *		FILE_SPACE describes the dataspace of the dataset on disk
- *		and the elements that have been selected for reading (via
- *		hyperslab, etc).  This function will copy at most NELMTS
- *		elements.
- *
- * Return:	Success:	Number of elements copied.
- *		Failure:	0
- *
- * Programmer:	Quincey Koziol
- *              Monday, June 24, 2002
- *
- *-------------------------------------------------------------------------
- */
-static size_t
-H5D_gather_file(const H5D_io_info_t *_io_info,
-    const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
-    void *_buf/*out*/)
-{
-    H5D_io_info_t tmp_io_info;  /* Temporary I/O info object */
-    hsize_t _off[H5D_IO_VECTOR_SIZE];   /* Array to store sequence offsets */
-    hsize_t *off = NULL;        /* Pointer to sequence offsets */
-    hsize_t mem_off;            /* Offset in memory */
-    size_t mem_curr_seq;        /* "Current sequence" in memory */
-    size_t dset_curr_seq;       /* "Current sequence" in dataset */
-    size_t _len[H5D_IO_VECTOR_SIZE];    /* Array to store sequence lengths */
-    size_t *len = NULL;         /* Pointer to sequence lengths */
-    size_t orig_mem_len, mem_len;       /* Length of sequence in memory */
-    size_t nseq;                /* Number of sequences generated */
-    size_t nelem;               /* Number of elements used in sequences */
-    size_t ret_value = nelmts;  /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_gather_file)
-
-    /* Check args */
-    HDassert(_io_info);
-    HDassert(_io_info->dset);
-    HDassert(_io_info->store);
-    HDassert(space);
-    HDassert(iter);
-    HDassert(nelmts > 0);
-    HDassert(_buf);
-
-    /* Set up temporary I/O info object */
-    HDmemcpy(&tmp_io_info, _io_info, sizeof(*_io_info));
-    tmp_io_info.op_type = H5D_IO_OP_READ;
-    tmp_io_info.u.rbuf = _buf;
-
-    /* Allocate the vector I/O arrays */
-    if(tmp_io_info.dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
-        if(NULL == (len = H5FL_SEQ_MALLOC(size_t, tmp_io_info.dxpl_cache->vec_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "can't allocate I/O length vector array")
-        if(NULL == (off = H5FL_SEQ_MALLOC(hsize_t, tmp_io_info.dxpl_cache->vec_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "can't allocate I/O offset vector array")
-    } /* end if */
-    else {
-        len = _len;
-        off = _off;
-    } /* end else */
-
-    /* Loop until all elements are read */
-    while(nelmts > 0) {
-        /* Get list of sequences for selection to read */
-        if(H5S_SELECT_GET_SEQ_LIST(space, H5S_GET_SEQ_LIST_SORTED, iter, tmp_io_info.dxpl_cache->vec_size, nelmts, &nseq, &nelem, off, len) < 0)
-            HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed")
-
-        /* Reset the current sequence information */
-        mem_curr_seq = dset_curr_seq = 0;
-        orig_mem_len = mem_len = nelem * iter->elmt_size;
-        mem_off = 0;
-
-        /* Read sequence list in */
-        if((*tmp_io_info.layout_ops.readvv)(&tmp_io_info, nseq, &dset_curr_seq,
-                len, off, (size_t)1, &mem_curr_seq, &mem_len, &mem_off) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, 0, "read error")
-
-        /* Update buffer */
-        tmp_io_info.u.rbuf = (uint8_t *)tmp_io_info.u.rbuf + orig_mem_len;
-
-        /* Decrement number of elements left to process */
-        nelmts -= nelem;
-    } /* end while */
-
-done:
-    /* Release resources, if allocated */
-    if(len && len != _len)
-        H5FL_SEQ_FREE(size_t, len);
-    if(off && off != _off)
-        H5FL_SEQ_FREE(hsize_t, off);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5D_gather_file() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_scatter_mem
- *
- * Purpose:	Scatters NELMTS data points from the scatter buffer
- *		TSCAT_BUF to the application buffer BUF.  Each element is
- *		ELMT_SIZE bytes and they are organized in application memory
- *		according to SPACE.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Monday, July 8, 2002
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5D_scatter_mem (const void *_tscat_buf, const H5S_t *space,
-    H5S_sel_iter_t *iter, size_t nelmts, const H5D_dxpl_cache_t *dxpl_cache,
-    void *_buf/*out*/)
-{
-    uint8_t *buf = (uint8_t *)_buf;   /* Get local copies for address arithmetic */
-    const uint8_t *tscat_buf = (const uint8_t *)_tscat_buf;
-    hsize_t _off[H5D_IO_VECTOR_SIZE];          /* Array to store sequence offsets */
-    hsize_t *off = NULL;          /* Pointer to sequence offsets */
-    size_t _len[H5D_IO_VECTOR_SIZE];           /* Array to store sequence lengths */
-    size_t *len = NULL;           /* Pointer to sequence lengths */
-    size_t curr_len;            /* Length of bytes left to process in sequence */
-    size_t nseq;                /* Number of sequences generated */
-    size_t curr_seq;            /* Current sequence being processed */
-    size_t nelem;               /* Number of elements used in sequences */
-    herr_t ret_value = SUCCEED;   /* Number of elements scattered */
-
-    FUNC_ENTER_NOAPI(H5D_scatter_mem, FAIL)
-
-    /* Check args */
-    HDassert(tscat_buf);
-    HDassert(space);
-    HDassert(iter);
-    HDassert(nelmts > 0);
-    HDassert(buf);
-
-    /* Allocate the vector I/O arrays */
-    if(dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
-        if(NULL == (len = H5FL_SEQ_MALLOC(size_t, dxpl_cache->vec_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array")
-        if(NULL == (off = H5FL_SEQ_MALLOC(hsize_t, dxpl_cache->vec_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array")
-    } /* end if */
-    else {
-        len = _len;
-        off = _off;
-    } /* end else */
-
-    /* Loop until all elements are written */
-    while(nelmts > 0) {
-        /* Get list of sequences for selection to write */
-        if(H5S_SELECT_GET_SEQ_LIST(space, 0, iter, dxpl_cache->vec_size, nelmts, &nseq, &nelem, off, len) < 0)
-            HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed")
-
-        /* Loop, while sequences left to process */
-        for(curr_seq = 0; curr_seq < nseq; curr_seq++) {
-            /* Get the number of bytes in sequence */
-            curr_len = len[curr_seq];
-
-            HDmemcpy(buf + off[curr_seq], tscat_buf, curr_len);
-
-            /* Advance offset in destination buffer */
-            tscat_buf += curr_len;
-        } /* end for */
-
-        /* Decrement number of elements left to process */
-        nelmts -= nelem;
-    } /* end while */
-
-done:
-    /* Release resources, if allocated */
-    if(len && len != _len)
-        H5FL_SEQ_FREE(size_t, len);
-    if(off && off != _off)
-        H5FL_SEQ_FREE(hsize_t, off);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5D_scatter_mem() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_gather_mem
- *
- * Purpose:	Gathers dataset elements from application memory BUF and
- *		copies them into the gather buffer TGATH_BUF.
- *		Each element is ELMT_SIZE bytes and arranged in application
- *		memory according to SPACE.
- *		The caller is requesting that at most NELMTS be gathered.
- *
- * Return:	Success:	Number of elements copied.
- *		Failure:	0
- *
- * Programmer:	Quincey Koziol
- *              Monday, June 24, 2002
- *
- *-------------------------------------------------------------------------
- */
-static size_t
-H5D_gather_mem(const void *_buf, const H5S_t *space,
-    H5S_sel_iter_t *iter, size_t nelmts, const H5D_dxpl_cache_t *dxpl_cache,
-    void *_tgath_buf/*out*/)
-{
-    const uint8_t *buf = (const uint8_t *)_buf;   /* Get local copies for address arithmetic */
-    uint8_t *tgath_buf = (uint8_t *)_tgath_buf;
-    hsize_t _off[H5D_IO_VECTOR_SIZE];          /* Array to store sequence offsets */
-    hsize_t *off = NULL;          /* Pointer to sequence offsets */
-    size_t _len[H5D_IO_VECTOR_SIZE];           /* Array to store sequence lengths */
-    size_t *len = NULL;           /* Pointer to sequence lengths */
-    size_t curr_len;            /* Length of bytes left to process in sequence */
-    size_t nseq;                /* Number of sequences generated */
-    size_t curr_seq;            /* Current sequence being processed */
-    size_t nelem;               /* Number of elements used in sequences */
-    size_t ret_value = nelmts;    /* Number of elements gathered */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_gather_mem)
-
-    /* Check args */
-    HDassert(buf);
-    HDassert(space);
-    HDassert(iter);
-    HDassert(nelmts > 0);
-    HDassert(tgath_buf);
-
-    /* Allocate the vector I/O arrays */
-    if(dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
-        if(NULL == (len = H5FL_SEQ_MALLOC(size_t, dxpl_cache->vec_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "can't allocate I/O length vector array")
-        if(NULL == (off = H5FL_SEQ_MALLOC(hsize_t, dxpl_cache->vec_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "can't allocate I/O offset vector array")
-    } /* end if */
-    else {
-        len = _len;
-        off = _off;
-    } /* end else */
-
-    /* Loop until all elements are written */
-    while(nelmts > 0) {
-        /* Get list of sequences for selection to write */
-        if(H5S_SELECT_GET_SEQ_LIST(space, 0, iter, dxpl_cache->vec_size, nelmts, &nseq, &nelem, off, len) < 0)
-            HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed")
-
-        /* Loop, while sequences left to process */
-        for(curr_seq = 0; curr_seq < nseq; curr_seq++) {
-            /* Get the number of bytes in sequence */
-            curr_len = len[curr_seq];
-
-            HDmemcpy(tgath_buf, buf + off[curr_seq], curr_len);
-
-            /* Advance offset in gather buffer */
-            tgath_buf += curr_len;
-        } /* end for */
-
-        /* Decrement number of elements left to process */
-        nelmts -= nelem;
-    } /* end while */
-
-done:
-    /* Release resources, if allocated */
-    if(len && len != _len)
-        H5FL_SEQ_FREE(size_t, len);
-    if(off && off != _off)
-        H5FL_SEQ_FREE(hsize_t, off);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-}   /* H5D_gather_mem() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_scatgath_read
- *
- * Purpose:	Perform scatter/gather ead from a contiguous [piece of a] dataset.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *		Thursday, March  6, 2008
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5D_scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space)
-{
-    const H5D_dxpl_cache_t *dxpl_cache = io_info->dxpl_cache;     /* Local pointer to dataset transfer info */
-    void        *buf = io_info->u.rbuf; /* Local pointer to application buffer */
-    H5S_sel_iter_t mem_iter;            /*memory selection iteration info*/
-    hbool_t	mem_iter_init = FALSE;	/*memory selection iteration info has been initialized */
-    H5S_sel_iter_t bkg_iter;            /*background iteration info*/
-    hbool_t	bkg_iter_init = FALSE;	/*background iteration info has been initialized */
-    H5S_sel_iter_t file_iter;           /*file selection iteration info*/
-    hbool_t	file_iter_init = FALSE;	/*file selection iteration info has been initialized */
-    hsize_t	smine_start;		/*strip mine start loc	*/
-    size_t	smine_nelmts;		/*elements per strip	*/
-    herr_t	ret_value = SUCCEED;	/*return value		*/
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_scatgath_read)
-
-    /* Sanity check */
-    HDassert(io_info);
-    HDassert(type_info);
-    HDassert(mem_space);
-    HDassert(file_space);
-    HDassert(buf);
-
-    /* Check for NOOP read */
-    if(nelmts == 0)
-        HGOTO_DONE(SUCCEED)
-
-    /* Figure out the strip mine size. */
-    if(H5S_select_iter_init(&file_iter, file_space, type_info->src_type_size) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize file selection information")
-    file_iter_init = TRUE;	/*file selection iteration info has been initialized */
-    if(H5S_select_iter_init(&mem_iter, mem_space, type_info->dst_type_size) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize memory selection information")
-    mem_iter_init = TRUE;	/*file selection iteration info has been initialized */
-    if(H5S_select_iter_init(&bkg_iter, mem_space, type_info->dst_type_size) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize background selection information")
-    bkg_iter_init = TRUE;	/*file selection iteration info has been initialized */
-
-    /* Start strip mining... */
-    for(smine_start = 0; smine_start < nelmts; smine_start += smine_nelmts) {
-        size_t n;               /* Elements operated on */
-
-        /* Go figure out how many elements to read from the file */
-        HDassert(H5S_SELECT_ITER_NELMTS(&file_iter) == (nelmts - smine_start));
-        smine_nelmts = (size_t)MIN(type_info->request_nelmts, (nelmts - smine_start));
-
-        /*
-         * Gather the data from disk into the datatype conversion
-         * buffer. Also gather data from application to background buffer
-         * if necessary.
-         */
-
-	/* 
-         * Gather data
-         */
-        n = H5D_gather_file(io_info, file_space, &file_iter, smine_nelmts,
-                type_info->tconv_buf/*out*/);
-	if(n != smine_nelmts)
-            HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed")
-
-        /* If the source and destination are compound types and subset of each other
-         * and no conversion is needed, copy the data directly into user's buffer and 
-         * bypass the rest of steps.
-         */
-        if(H5T_SUBSET_FALSE != type_info->cmpd_subset) {
-            if(H5D_compound_opt_read(smine_nelmts, mem_space, &mem_iter, dxpl_cache,
-                    type_info, buf /*out*/) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
-        } /* end if */
-        else {
-            if(H5T_BKG_YES == type_info->need_bkg) {
-                n = H5D_gather_mem(buf, mem_space, &bkg_iter, smine_nelmts,
-                        dxpl_cache, type_info->bkg_buf/*out*/);
-                if(n != smine_nelmts)
-                    HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "mem gather failed")
-            } /* end if */
-
-            /*
-             * Perform datatype conversion.
-             */
-            if(H5T_convert(type_info->tpath, type_info->src_type_id, type_info->dst_type_id,
-                    smine_nelmts, (size_t)0, (size_t)0, type_info->tconv_buf,
-                    type_info->bkg_buf, io_info->dxpl_id) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed")
-
-            /* Do the data transform after the conversion (since we're using type mem_type) */
-            if(!type_info->is_xform_noop)
-                if(H5Z_xform_eval(dxpl_cache->data_xform_prop, type_info->tconv_buf, smine_nelmts, type_info->mem_type) < 0)
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Error performing data transform")
-
-            /*
-             * Scatter the data into memory.
-             */
-            if(H5D_scatter_mem(type_info->tconv_buf, mem_space, &mem_iter,
-                    smine_nelmts, dxpl_cache, buf/*out*/) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "scatter failed")
-        } /* end else */
-    } /* end for */
-
-done:
-    /* Release selection iterators */
-    if(file_iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
-            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
-    } /* end if */
-    if(mem_iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
-            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
-    } /* end if */
-    if(bkg_iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&bkg_iter) < 0)
-            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
-    } /* end if */
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_scatgath_read() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_scatgath_write
- *
- * Purpose:	Perform scatter/gather write to a contiguous [piece of a] dataset.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *		Thursday, March  6, 2008
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5D_scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space)
-{
-    const H5D_dxpl_cache_t *dxpl_cache = io_info->dxpl_cache;     /* Local pointer to dataset transfer info */
-    const void  *buf = io_info->u.wbuf; /* Local pointer to application buffer */
-    H5S_sel_iter_t mem_iter;            /*memory selection iteration info*/
-    hbool_t	mem_iter_init = FALSE;	/*memory selection iteration info has been initialized */
-    H5S_sel_iter_t bkg_iter;            /*background iteration info*/
-    hbool_t	bkg_iter_init = FALSE;	/*background iteration info has been initialized */
-    H5S_sel_iter_t file_iter;           /*file selection iteration info*/
-    hbool_t	file_iter_init = FALSE;	/*file selection iteration info has been initialized */
-    hsize_t	smine_start;		/*strip mine start loc	*/
-    size_t	smine_nelmts;		/*elements per strip	*/
-    herr_t	ret_value = SUCCEED;	/*return value		*/
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_scatgath_write)
-
-    /* Sanity check */
-    HDassert(io_info);
-    HDassert(type_info);
-    HDassert(mem_space);
-    HDassert(file_space);
-    HDassert(buf);
-
-    /* Check for NOOP write */
-    if(nelmts == 0)
-        HGOTO_DONE(SUCCEED)
-
-    /* Figure out the strip mine size. */
-    if(H5S_select_iter_init(&file_iter, file_space, type_info->dst_type_size) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize file selection information")
-    file_iter_init = TRUE;	/*file selection iteration info has been initialized */
-    if(H5S_select_iter_init(&mem_iter, mem_space, type_info->src_type_size) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize memory selection information")
-    mem_iter_init = TRUE;	/*file selection iteration info has been initialized */
-    if(H5S_select_iter_init(&bkg_iter, file_space, type_info->dst_type_size) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize background selection information")
-    bkg_iter_init = TRUE;	/*file selection iteration info has been initialized */
-
-    /* Start strip mining... */
-    for(smine_start = 0; smine_start < nelmts; smine_start += smine_nelmts) {
-        size_t n;               /* Elements operated on */
-
-        /* Go figure out how many elements to read from the file */
-        HDassert(H5S_SELECT_ITER_NELMTS(&file_iter) == (nelmts - smine_start));
-        smine_nelmts = (size_t)MIN(type_info->request_nelmts, (nelmts - smine_start));
-
-        /*
-         * Gather data from application buffer into the datatype conversion
-         * buffer. Also gather data from the file into the background buffer
-         * if necessary.
-         */
-        n = H5D_gather_mem(buf, mem_space, &mem_iter, smine_nelmts,
-                dxpl_cache, type_info->tconv_buf/*out*/);
-        if(n != smine_nelmts)
-            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "mem gather failed")
-
-        /* If the source and destination are compound types and the destination is
-         * is a subset of the source and no conversion is needed, copy the data 
-         * directly into user's buffer and bypass the rest of steps.  If the source
-         * is a subset of the destination, the optimization is done in conversion
-         * function H5T_conv_struct_opt to protect the background data.
-         */
-        if(H5T_SUBSET_DST == type_info->cmpd_subset) {
-            if(H5D_compound_opt_write(smine_nelmts, type_info) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "datatype conversion failed")
-        } /* end if */
-        else {
-            if(H5T_BKG_YES == type_info->need_bkg) {
-                n = H5D_gather_file(io_info, file_space, &bkg_iter, smine_nelmts,
-                        type_info->bkg_buf/*out*/);
-                if(n != smine_nelmts)
-                    HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed")
-            } /* end if */
-
-            /*
-             * Perform datatype conversion.
-             */
-            if(H5T_convert(type_info->tpath, type_info->src_type_id, type_info->dst_type_id,
-                    smine_nelmts, (size_t)0, (size_t)0, type_info->tconv_buf,
-                    type_info->bkg_buf, io_info->dxpl_id) < 0)
-                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed")
-
-	    /* Do the data transform after the type conversion (since we're using dataset->shared->type). */
-	    if(!type_info->is_xform_noop)
-	        if(H5Z_xform_eval(dxpl_cache->data_xform_prop, type_info->tconv_buf, smine_nelmts, type_info->dset_type) < 0)
-		    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Error performing data transform")
-        } /* end else */
-
-        /*
-         * Scatter the data out to the file.
-         */
-        if(H5D_scatter_file(io_info, file_space, &file_iter, smine_nelmts,
-                type_info->tconv_buf) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "scatter failed")
-    } /* end for */
-
-done:
-    /* Release selection iterators */
-    if(file_iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
-            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
-    } /* end if */
-    if(mem_iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
-            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
-    } /* end if */
-    if(bkg_iter_init) {
-        if(H5S_SELECT_ITER_RELEASE(&bkg_iter) < 0)
-            HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't release selection iterator")
-    } /* end if */
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_scatgath_write() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_compound_opt_read
- *
- * Purpose:	A special optimization case when the source and 
- *              destination members are a subset of each other, and 
- *              the order is the same, and no conversion is needed.  
- *              For example:
- *                  struct source {            struct destination {
- *                      TYPE1 A;      -->          TYPE1 A;
- *                      TYPE2 B;      -->          TYPE2 B;
- *                      TYPE3 C;      -->          TYPE3 C;
- *                  };                             TYPE4 D;
- *                                                 TYPE5 E;
- *                                             };
- *              or
- *                  struct destination {       struct source {
- *                      TYPE1 A;      <--          TYPE1 A;
- *                      TYPE2 B;      <--          TYPE2 B;
- *                      TYPE3 C;      <--          TYPE3 C;
- *                  };                             TYPE4 D;
- *                                                 TYPE5 E;
- *                                             };
- *              The optimization is simply moving data to the appropriate 
- *              places in the buffer.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Raymond Lu
- *		11 June 2007
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_compound_opt_read(size_t nelmts, const H5S_t *space,
-    H5S_sel_iter_t *iter, const H5D_dxpl_cache_t *dxpl_cache,
-    const H5D_type_info_t *type_info, void *user_buf/*out*/)
-{
-    uint8_t    *ubuf = (uint8_t *)user_buf;     /* Cast for pointer arithmetic	*/
-    uint8_t    *xdbuf;                          /* Pointer into dataset buffer */
-    hsize_t    _off[H5D_IO_VECTOR_SIZE];        /* Array to store sequence offsets */
-    hsize_t    *off = NULL;                     /* Pointer to sequence offsets */
-    size_t     _len[H5D_IO_VECTOR_SIZE];        /* Array to store sequence lengths */
-    size_t     *len = NULL;                     /* Pointer to sequence lengths */
-    size_t     src_stride, dst_stride, type_size;
-    herr_t     ret_value = SUCCEED;	       /*return value		*/
-
-    FUNC_ENTER_NOAPI_NOINIT(H5D_compound_opt_read)
-
-    /* Check args */
-    HDassert(nelmts > 0);
-    HDassert(space);
-    HDassert(iter);
-    HDassert(dxpl_cache);
-    HDassert(type_info);
-    HDassert(user_buf);
-
-    /* Allocate the vector I/O arrays */
-    if(dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
-        if(NULL == (len = H5FL_SEQ_MALLOC(size_t, dxpl_cache->vec_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array")
-        if(NULL == (off = H5FL_SEQ_MALLOC(hsize_t, dxpl_cache->vec_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array")
-    } /* end if */
-    else {
-        len = _len;
-        off = _off;
-    } /* end else */
-
-    /* Get source & destination strides */
-    src_stride = type_info->src_type_size;
-    dst_stride = type_info->dst_type_size;
-
-    if(H5T_SUBSET_SRC == type_info->cmpd_subset)
-        type_size = src_stride;
-    else {
-        HDassert(H5T_SUBSET_DST == type_info->cmpd_subset);
-        type_size = dst_stride;
-    } /* end else */
-
-    /* Loop until all elements are written */
-    xdbuf = type_info->tconv_buf;
-    while(nelmts > 0) {
-        size_t     nseq;                /* Number of sequences generated */
-        size_t     curr_seq;            /* Current sequence being processed */
-        size_t     elmtno;		/* Element counter */
-
-        /* Get list of sequences for selection to write */
-        if(H5S_SELECT_GET_SEQ_LIST(space, 0, iter, dxpl_cache->vec_size, nelmts, &nseq, &elmtno, off, len) < 0)
-            HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed")
-
-        /* Loop, while sequences left to process */
-        for(curr_seq = 0; curr_seq < nseq; curr_seq++) {
-            size_t     curr_off;        /* Offset of bytes left to process in sequence */
-            size_t     curr_len;        /* Length of bytes left to process in sequence */
-            size_t     curr_nelmts;	/* Number of elements to process in sequence   */
-            uint8_t    *xubuf;
-            size_t     i;               /* Local index variable */
-
-            /* Get the number of bytes and offset in sequence */
-            curr_len = len[curr_seq];
-            curr_off = off[curr_seq];
-
-            /* Decide the number of elements and position in the buffer. */
-            curr_nelmts = curr_len / dst_stride;
-            xubuf = ubuf + curr_off;
-
-            /* Copy the data into the right place. */
-            for(i = 0; i < curr_nelmts; i++) {
-                HDmemmove(xubuf, xdbuf, type_size); 
-
-                /* Update pointers */
-                xdbuf += src_stride;
-                xubuf += dst_stride;
-            } /* end for */
-        } /* end for */
-
-        /* Decrement number of elements left to process */
-        nelmts -= elmtno;
-    } /* end while */
-
-done:
-    /* Release resources, if allocated */
-    if(len && len != _len)
-        H5FL_SEQ_FREE(size_t, len);
-    if(off && off != _off)
-        H5FL_SEQ_FREE(hsize_t, off);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_compound_opt_read() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5D_compound_opt_write
- *
- * Purpose:	A special optimization case when the source and 
- *              destination members are a subset of each other, and 
- *              the order is the same, and no conversion is needed.  
- *              For example:
- *                  struct source {            struct destination {
- *                      TYPE1 A;      -->          TYPE1 A;
- *                      TYPE2 B;      -->          TYPE2 B;
- *                      TYPE3 C;      -->          TYPE3 C;
- *                  };                             TYPE4 D;
- *                                                 TYPE5 E;
- *                                             };
- *              or
- *                  struct destination {       struct source {
- *                      TYPE1 A;      <--          TYPE1 A;
- *                      TYPE2 B;      <--          TYPE2 B;
- *                      TYPE3 C;      <--          TYPE3 C;
- *                  };                             TYPE4 D;
- *                                                 TYPE5 E;
- *                                             };
- *              The optimization is simply moving data to the appropriate 
- *              places in the buffer.
- *
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Raymond Lu
- *		11 June 2007
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5D_compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info)
-{
-    uint8_t    *xsbuf, *xdbuf;                  /* Source & destination pointers into dataset buffer */
-    size_t     src_stride, dst_stride;          /* Strides through source & destination datatypes */
-    size_t     i;                               /* Local index variable */
-
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_compound_opt_write)
-
-    /* Check args */
-    HDassert(nelmts > 0);
-    HDassert(type_info);
-
-    /* Initialize values for loop */
-    src_stride = type_info->src_type_size;
-    dst_stride = type_info->dst_type_size;
-
-    /* Loop until all elements are written */
-    xsbuf = (uint8_t *)type_info->tconv_buf;
-    xdbuf = (uint8_t *)type_info->tconv_buf;
-    for(i = 0; i < nelmts; i++) {
-        HDmemmove(xdbuf, xsbuf, dst_stride); 
-
-        /* Update pointers */
-        xsbuf += src_stride;
-        xdbuf += dst_stride;
-    } /* end for */
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5D_compound_opt_write() */
-
diff --git a/src/H5Dselect.c b/src/H5Dselect.c
index 947c81e..f08672f 100644
--- a/src/H5Dselect.c
+++ b/src/H5Dselect.c
@@ -34,37 +34,400 @@
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FLprivate.h"	/* Free Lists                           */
 
-
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
+/* Struct for holding the vectorized I/O operation buffers "loosely" */
+typedef struct {
+    enum {
+        H5S_SELECT_READ,                /* Read selection */
+        H5S_SELECT_WRITE                /* Write selection */
+    } op_type;
+    union {
+        void *rbuf;                          /* Buffer for read */
+        const void *wbuf;                    /* Buffer to write */
+    } u;
+} H5D_select_buf_t;
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* Declare a free list to manage sequences of size_t */
-H5FL_SEQ_DEFINE(size_t);
+H5FL_SEQ_DEFINE_STATIC(size_t);
 
 /* Declare a free list to manage sequences of hsize_t */
-H5FL_SEQ_DEFINE(hsize_t);
+H5FL_SEQ_DEFINE_STATIC(hsize_t);
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_select_fscat
+ *
+ * Purpose:	Scatters dataset elements from the type conversion buffer BUF
+ *		to the file F where the data points are arranged according to
+ *		the file dataspace FILE_SPACE and stored according to
+ *		LAYOUT and EFL. Each element is ELMT_SIZE bytes.
+ *		The caller is requesting that NELMTS elements are copied.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *              Thursday, June 20, 2002
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5D_select_fscat (H5D_io_info_t *io_info,
+    const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
+    haddr_t chunk_addr, void *chunk/*in*/, const void *_buf)
+{
+    const uint8_t *buf=_buf;       /* Alias for pointer arithmetic */
+    hsize_t _off[H5D_IO_VECTOR_SIZE];             /* Array to store sequence offsets */
+    hsize_t *off=NULL;             /* Pointer to sequence offsets */
+    hsize_t mem_off;               /* Offset in memory */
+    size_t mem_curr_seq;           /* "Current sequence" in memory */
+    size_t dset_curr_seq;          /* "Current sequence" in dataset */
+    size_t _len[H5D_IO_VECTOR_SIZE];              /* Array to store sequence lengths */
+    size_t *len=NULL;              /* Array to store sequence lengths */
+    size_t orig_mem_len, mem_len;  /* Length of sequence in memory */
+    size_t  nseq;                  /* Number of sequences generated */
+    size_t  nelem;                 /* Number of elements used in sequences */
+    herr_t  ret_value=SUCCEED;     /* Return value */
+
+    FUNC_ENTER_NOAPI(H5D_select_fscat, FAIL);
+
+    /* Check args */
+    assert (io_info);
+    assert (space);
+    assert (iter);
+    assert (nelmts>0);
+    assert (_buf);
+    assert(TRUE==H5P_isa_class(io_info->dxpl_id,H5P_DATASET_XFER));
+
+    /* Allocate the vector I/O arrays */
+    if(io_info->dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
+        if((len = H5FL_SEQ_MALLOC(size_t,io_info->dxpl_cache->vec_size))==NULL)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array");
+        if((off = H5FL_SEQ_MALLOC(hsize_t,io_info->dxpl_cache->vec_size))==NULL)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array");
+    } /* end if */
+    else {
+        len=_len;
+        off=_off;
+    } /* end else */
+
+    /* Loop until all elements are written */
+    while(nelmts>0) {
+        /* Get list of sequences for selection to write */
+        if(H5S_SELECT_GET_SEQ_LIST(space,H5S_GET_SEQ_LIST_SORTED,iter,io_info->dxpl_cache->vec_size,nelmts,&nseq,&nelem,off,len)<0)
+            HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed");
+
+        /* Reset the current sequence information */
+        mem_curr_seq=dset_curr_seq=0;
+        orig_mem_len=mem_len=nelem*iter->elmt_size;
+        mem_off=0;
+
+        /* Write sequence list out */
+        if((*io_info->ops.writevv)(io_info, nseq, &dset_curr_seq, len, off, (size_t)1, &mem_curr_seq, &mem_len, &mem_off, chunk_addr, chunk, buf) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error");
+
+        /* Update buffer */
+        buf += orig_mem_len;
+
+        /* Decrement number of elements left to process */
+        nelmts -= nelem;
+    } /* end while */
+
+done:
+    if(io_info->dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
+        if(len!=NULL)
+            H5FL_SEQ_FREE(size_t,len);
+        if(off!=NULL)
+            H5FL_SEQ_FREE(hsize_t,off);
+    } /* end if */
+    FUNC_LEAVE_NOAPI(ret_value);
+} /* H5D_select_fscat() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_select_fgath
+ *
+ * Purpose:	Gathers data points from file F and accumulates them in the
+ *		type conversion buffer BUF.  The LAYOUT argument describes
+ *		how the data is stored on disk and EFL describes how the data
+ *		is organized in external files.  ELMT_SIZE is the size in
+ *		bytes of a datum which this function treats as opaque.
+ *		FILE_SPACE describes the dataspace of the dataset on disk
+ *		and the elements that have been selected for reading (via
+ *		hyperslab, etc).  This function will copy at most NELMTS
+ *		elements.
+ *
+ * Return:	Success:	Number of elements copied.
+ *		Failure:	0
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, June 24, 2002
+ *
+ *-------------------------------------------------------------------------
+ */
+size_t
+H5D_select_fgath (H5D_io_info_t *io_info,
+    const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
+    haddr_t chunk_addr, void *chunk/*in*/, void *_buf/*out*/)
+{
+    uint8_t *buf=(uint8_t*)_buf;          /* Alias for pointer arithmetic */
+    hsize_t _off[H5D_IO_VECTOR_SIZE];          /* Array to store sequence offsets */
+    hsize_t *off=NULL;          /* Pointer to sequence offsets */
+    hsize_t mem_off;            /* Offset in memory */
+    size_t mem_curr_seq;        /* "Current sequence" in memory */
+    size_t dset_curr_seq;       /* "Current sequence" in dataset */
+    size_t _len[H5D_IO_VECTOR_SIZE];           /* Array to store sequence lengths */
+    size_t *len=NULL;           /* Pointer to sequence lengths */
+    size_t orig_mem_len, mem_len;       /* Length of sequence in memory */
+    size_t nseq;                /* Number of sequences generated */
+    size_t nelem;               /* Number of elements used in sequences */
+    size_t ret_value=nelmts;    /* Return value */
+
+    FUNC_ENTER_NOAPI(H5D_select_fgath, 0);
+
+    /* Check args */
+    assert (io_info);
+    assert (io_info->dset);
+    assert (io_info->store);
+    assert (space);
+    assert (iter);
+    assert (nelmts>0);
+    assert (_buf);
+
+    /* Allocate the vector I/O arrays */
+    if(io_info->dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
+        if((len = H5FL_SEQ_MALLOC(size_t,io_info->dxpl_cache->vec_size))==NULL)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "can't allocate I/O length vector array");
+        if((off = H5FL_SEQ_MALLOC(hsize_t,io_info->dxpl_cache->vec_size))==NULL)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "can't allocate I/O offset vector array");
+    } /* end if */
+    else {
+        len=_len;
+        off=_off;
+    } /* end else */
+
+    /* Loop until all elements are read */
+    while(nelmts>0) {
+        /* Get list of sequences for selection to read */
+        if(H5S_SELECT_GET_SEQ_LIST(space,H5S_GET_SEQ_LIST_SORTED,iter,io_info->dxpl_cache->vec_size,nelmts,&nseq,&nelem,off,len)<0)
+            HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed");
+
+        /* Reset the current sequence information */
+        mem_curr_seq=dset_curr_seq=0;
+        orig_mem_len=mem_len=nelem*iter->elmt_size;
+        mem_off=0;
+
+        /* Read sequence list in */
+        if((*io_info->ops.readvv)(io_info, nseq, &dset_curr_seq, len, off, (size_t)1, 
+                                  &mem_curr_seq, &mem_len, &mem_off, chunk_addr, chunk, buf) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, 0, "read error");
+
+        /* Update buffer */
+        buf += orig_mem_len;
+
+        /* Decrement number of elements left to process */
+        nelmts -= nelem;
+    } /* end while */
+
+done:
+    if(io_info->dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
+        if(len!=NULL)
+            H5FL_SEQ_FREE(size_t,len);
+        if(off!=NULL)
+            H5FL_SEQ_FREE(hsize_t,off);
+    } /* end if */
+    FUNC_LEAVE_NOAPI(ret_value);
+} /* H5D_select_fgath() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_select_mscat
+ *
+ * Purpose:	Scatters NELMTS data points from the scatter buffer
+ *		TSCAT_BUF to the application buffer BUF.  Each element is
+ *		ELMT_SIZE bytes and they are organized in application memory
+ *		according to SPACE.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, July 8, 2002
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5D_select_mscat (const void *_tscat_buf, const H5S_t *space,
+    H5S_sel_iter_t *iter, size_t nelmts, const H5D_dxpl_cache_t *dxpl_cache,
+    void *_buf/*out*/)
+{
+    uint8_t *buf=(uint8_t *)_buf;   /* Get local copies for address arithmetic */
+    const uint8_t *tscat_buf=(const uint8_t *)_tscat_buf;
+    hsize_t _off[H5D_IO_VECTOR_SIZE];          /* Array to store sequence offsets */
+    hsize_t *off=NULL;          /* Pointer to sequence offsets */
+    size_t _len[H5D_IO_VECTOR_SIZE];           /* Array to store sequence lengths */
+    size_t *len=NULL;           /* Pointer to sequence lengths */
+    size_t curr_len;            /* Length of bytes left to process in sequence */
+    size_t nseq;                /* Number of sequences generated */
+    size_t curr_seq;            /* Current sequence being processed */
+    size_t nelem;               /* Number of elements used in sequences */
+    herr_t ret_value=SUCCEED;   /* Number of elements scattered */
+
+    FUNC_ENTER_NOAPI(H5D_select_mscat, FAIL);
+
+    /* Check args */
+    assert (tscat_buf);
+    assert (space);
+    assert (iter);
+    assert (nelmts>0);
+    assert (buf);
+
+    /* Allocate the vector I/O arrays */
+    if(dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
+        if((len = H5FL_SEQ_MALLOC(size_t,dxpl_cache->vec_size))==NULL)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array");
+        if((off = H5FL_SEQ_MALLOC(hsize_t,dxpl_cache->vec_size))==NULL)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array");
+    } /* end if */
+    else {
+        len=_len;
+        off=_off;
+    } /* end else */
+
+    /* Loop until all elements are written */
+    while(nelmts>0) {
+        /* Get list of sequences for selection to write */
+        if(H5S_SELECT_GET_SEQ_LIST(space,0,iter,dxpl_cache->vec_size,nelmts,&nseq,&nelem,off,len)<0)
+            HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed");
+
+        /* Loop, while sequences left to process */
+        for(curr_seq=0; curr_seq<nseq; curr_seq++) {
+            /* Get the number of bytes in sequence */
+            curr_len=len[curr_seq];
 
+            HDmemcpy(buf+off[curr_seq],tscat_buf,curr_len);
+
+            /* Advance offset in destination buffer */
+            tscat_buf+=curr_len;
+        } /* end for */
+
+        /* Decrement number of elements left to process */
+        nelmts -= nelem;
+    } /* end while */
+
+done:
+    if(dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
+        if(len!=NULL)
+            H5FL_SEQ_FREE(size_t,len);
+        if(off!=NULL)
+            H5FL_SEQ_FREE(hsize_t,off);
+    } /* end if */
+    FUNC_LEAVE_NOAPI(ret_value);
+}   /* H5D_select_mscat() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_select_mgath
+ *
+ * Purpose:	Gathers dataset elements from application memory BUF and
+ *		copies them into the gather buffer TGATH_BUF.
+ *		Each element is ELMT_SIZE bytes and arranged in application
+ *		memory according to SPACE.
+ *		The caller is requesting that at most NELMTS be gathered.
+ *
+ * Return:	Success:	Number of elements copied.
+ *		Failure:	0
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, June 24, 2002
+ *
+ *-------------------------------------------------------------------------
+ */
+size_t
+H5D_select_mgath (const void *_buf, const H5S_t *space,
+    H5S_sel_iter_t *iter, size_t nelmts, const H5D_dxpl_cache_t *dxpl_cache,
+    void *_tgath_buf/*out*/)
+{
+    const uint8_t *buf=(const uint8_t *)_buf;   /* Get local copies for address arithmetic */
+    uint8_t *tgath_buf=(uint8_t *)_tgath_buf;
+    hsize_t _off[H5D_IO_VECTOR_SIZE];          /* Array to store sequence offsets */
+    hsize_t *off=NULL;          /* Pointer to sequence offsets */
+    size_t _len[H5D_IO_VECTOR_SIZE];           /* Array to store sequence lengths */
+    size_t *len=NULL;           /* Pointer to sequence lengths */
+    size_t curr_len;            /* Length of bytes left to process in sequence */
+    size_t nseq;                /* Number of sequences generated */
+    size_t curr_seq;            /* Current sequence being processed */
+    size_t nelem;               /* Number of elements used in sequences */
+    size_t ret_value=nelmts;    /* Number of elements gathered */
+
+    FUNC_ENTER_NOAPI(H5D_select_mgath, 0);
+
+    /* Check args */
+    assert (buf);
+    assert (space);
+    assert (iter);
+    assert (nelmts>0);
+    assert (tgath_buf);
+
+    /* Allocate the vector I/O arrays */
+    if(dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
+        if((len = H5FL_SEQ_MALLOC(size_t,dxpl_cache->vec_size))==NULL)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "can't allocate I/O length vector array");
+        if((off = H5FL_SEQ_MALLOC(hsize_t,dxpl_cache->vec_size))==NULL)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "can't allocate I/O offset vector array");
+    } /* end if */
+    else {
+        len=_len;
+        off=_off;
+    } /* end else */
+
+    /* Loop until all elements are written */
+    while(nelmts>0) {
+        /* Get list of sequences for selection to write */
+        if(H5S_SELECT_GET_SEQ_LIST(space,0,iter,dxpl_cache->vec_size,nelmts,&nseq,&nelem,off,len)<0)
+            HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, 0, "sequence length generation failed");
+
+        /* Loop, while sequences left to process */
+        for(curr_seq=0; curr_seq<nseq; curr_seq++) {
+            /* Get the number of bytes in sequence */
+            curr_len=len[curr_seq];
+
+            HDmemcpy(tgath_buf,buf+off[curr_seq],curr_len);
+
+            /* Advance offset in gather buffer */
+            tgath_buf+=curr_len;
+        } /* end for */
+
+        /* Decrement number of elements left to process */
+        nelmts -= nelem;
+    } /* end while */
+
+done:
+    if(dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
+        if(len!=NULL)
+            H5FL_SEQ_FREE(size_t,len);
+        if(off!=NULL)
+            H5FL_SEQ_FREE(hsize_t,off);
+    } /* end if */
+    FUNC_LEAVE_NOAPI(ret_value);
+}   /* H5D_select_mgath() */
 
 
 /*-------------------------------------------------------------------------
@@ -80,8 +443,11 @@ H5FL_SEQ_DEFINE(hsize_t);
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_select_io(const H5D_io_info_t *io_info, size_t elmt_size,
-    size_t nelmts, const H5S_t *file_space, const H5S_t *mem_space)
+H5D_select_io(H5D_io_info_t *io_info,
+    size_t nelmts, size_t elmt_size,
+    const H5S_t *file_space, const H5S_t *mem_space,
+    haddr_t addr, void *chunk/*in*/,
+    const H5D_select_buf_t *io_buf)
 {
     H5S_sel_iter_t mem_iter;    /* Memory selection iteration info */
     hbool_t mem_iter_init = 0;  /* Memory selection iteration info has been initialized */
@@ -109,10 +475,10 @@ H5D_select_io(const H5D_io_info_t *io_info, size_t elmt_size,
     HDassert(io_info->dset);
     HDassert(io_info->store);
     HDassert(TRUE == H5P_isa_class(io_info->dxpl_id, H5P_DATASET_XFER));
-    HDassert(io_info->u.rbuf);
+    HDassert(io_buf->u.rbuf);
 
     /* Allocate the vector I/O arrays */
-    if(io_info->dxpl_cache->vec_size > H5D_IO_VECTOR_SIZE) {
+    if(io_info->dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
         if(NULL == (mem_len = H5FL_SEQ_MALLOC(size_t,io_info->dxpl_cache->vec_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array")
         if(NULL == (mem_off = H5FL_SEQ_MALLOC(hsize_t,io_info->dxpl_cache->vec_size)))
@@ -145,17 +511,19 @@ H5D_select_io(const H5D_io_info_t *io_info, size_t elmt_size,
         *file_len = *mem_len = elmt_size;
 
         /* Perform I/O on memory and file sequences */
-        if(io_info->op_type == H5D_IO_OP_READ) {
-            if((tmp_file_len = (*io_info->layout_ops.readvv)(io_info,
+        if(io_buf->op_type == H5S_SELECT_READ) {
+            if((tmp_file_len = (*io_info->ops.readvv)(io_info,
                     file_nseq, &curr_file_seq, file_len, file_off,
-                    mem_nseq, &curr_mem_seq, mem_len, mem_off)) < 0)
+                    mem_nseq, &curr_mem_seq, mem_len, mem_off,
+                    addr, chunk, io_buf->u.rbuf)) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, FAIL, "read error")
         } /* end if */
         else {
-            HDassert(io_info->op_type == H5D_IO_OP_WRITE);
-            if((tmp_file_len = (*io_info->layout_ops.writevv)(io_info,
+            HDassert(io_buf->op_type == H5S_SELECT_WRITE);
+            if((tmp_file_len = (*io_info->ops.writevv)(io_info,
                     file_nseq, &curr_file_seq, file_len, file_off,
-                    mem_nseq, &curr_mem_seq, mem_len, mem_off)) < 0)
+                    mem_nseq, &curr_mem_seq, mem_len, mem_off,
+                    addr, chunk, io_buf->u.wbuf)) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
         } /* end else */
 
@@ -203,17 +571,19 @@ H5D_select_io(const H5D_io_info_t *io_info, size_t elmt_size,
             } /* end if */
 
             /* Perform I/O on memory and file sequences */
-            if(io_info->op_type == H5D_IO_OP_READ) {
-                if((tmp_file_len = (*io_info->layout_ops.readvv)(io_info,
+            if(io_buf->op_type == H5S_SELECT_READ) {
+                if((tmp_file_len = (*io_info->ops.readvv)(io_info,
                         file_nseq, &curr_file_seq, file_len, file_off,
-                        mem_nseq, &curr_mem_seq, mem_len, mem_off)) < 0)
+                        mem_nseq, &curr_mem_seq, mem_len, mem_off,
+                        addr, chunk, io_buf->u.rbuf)) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, FAIL, "read error")
             } /* end if */
             else {
-                HDassert(io_info->op_type == H5D_IO_OP_WRITE);
-                if((tmp_file_len = (*io_info->layout_ops.writevv)(io_info,
+                HDassert(io_buf->op_type == H5S_SELECT_WRITE);
+                if((tmp_file_len = (*io_info->ops.writevv)(io_info,
                         file_nseq, &curr_file_seq, file_len, file_off,
-                        mem_nseq, &curr_mem_seq, mem_len, mem_off)) < 0)
+                        mem_nseq, &curr_mem_seq, mem_len, mem_off,
+                        addr, chunk, io_buf->u.wbuf)) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
             } /* end else */
 
@@ -234,15 +604,17 @@ done:
         if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator")
 
-    /* Release vector arrays, if allocated */
-    if(file_len && file_len != _file_len)
-        H5FL_SEQ_FREE(size_t, file_len);
-    if(file_off && file_off != _file_off)
-        H5FL_SEQ_FREE(hsize_t, file_off);
-    if(mem_len && mem_len != _mem_len)
-        H5FL_SEQ_FREE(size_t, mem_len);
-    if(mem_off && mem_off != _mem_off)
-        H5FL_SEQ_FREE(hsize_t, mem_off);
+    /* Free vector arrays */
+    if(io_info->dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
+        if(file_len != NULL)
+            H5FL_SEQ_FREE(size_t, file_len);
+        if(file_off != NULL)
+            H5FL_SEQ_FREE(hsize_t, file_off);
+        if(mem_len != NULL)
+            H5FL_SEQ_FREE(size_t, mem_len);
+        if(mem_off != NULL)
+            H5FL_SEQ_FREE(hsize_t, mem_off);
+    } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_select_io() */
@@ -261,17 +633,23 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D_select_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space)
+H5D_select_read(H5D_io_info_t *io_info,
+    size_t nelmts, size_t elmt_size,
+    const H5S_t *file_space, const H5S_t *mem_space,
+    haddr_t addr, void *chunk/*in*/,
+    void *buf/*out*/)
 {
+    H5D_select_buf_t io_buf;      /* Selection I/O operation to perform */
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(H5D_select_read, FAIL)
 
+    /* Construct proper I/O operation */
+    io_buf.op_type = H5S_SELECT_READ;
+    io_buf.u.rbuf = buf;
+
     /* Call generic selection operation */
-    H5_CHECK_OVERFLOW(nelmts, hsize_t, size_t);
-    if(H5D_select_io(io_info, type_info->src_type_size, (size_t)nelmts,
-            file_space, mem_space) < 0)
+    if(H5D_select_io(io_info, nelmts, elmt_size, file_space, mem_space, addr, chunk, &io_buf) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, FAIL, "read error")
 
 done:
@@ -292,17 +670,23 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D_select_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space)
+H5D_select_write(H5D_io_info_t *io_info,
+    size_t nelmts, size_t elmt_size,
+    const H5S_t *file_space, const H5S_t *mem_space,
+    haddr_t addr, void *chunk/*in*/,
+    const void *buf/*out*/)
 {
+    H5D_select_buf_t io_buf;      /* Selection I/O operation to perform */
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(H5D_select_write, FAIL)
 
+    /* Construct proper I/O operation */
+    io_buf.op_type = H5S_SELECT_WRITE;
+    io_buf.u.wbuf = buf;
+
     /* Call generic selection operation */
-    H5_CHECK_OVERFLOW(nelmts, hsize_t, size_t);
-    if(H5D_select_io(io_info, type_info->dst_type_size, (size_t)nelmts,
-            file_space, mem_space) < 0)
+    if(H5D_select_io(io_info, nelmts, elmt_size, file_space, mem_space, addr, chunk, &io_buf) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
 
 done:
diff --git a/src/H5F.c b/src/H5F.c
index 80c28bc..cb9e3b8 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -978,9 +978,6 @@ done:
  * Programmer:	Robb Matzke
  *		matzke@llnl.gov
  *		Jul 18 1997
- * Modifications:
- *		Vailin Choi,  April 2, 2008
- *		Free f->extpath
  *
  *-------------------------------------------------------------------------
  */
@@ -1071,7 +1068,6 @@ H5F_dest(H5F_t *f, hid_t dxpl_id)
 
     /* Free the non-shared part of the file */
     f->name = H5MM_xfree(f->name);
-    f->extpath = H5MM_xfree(f->extpath);
     f->mtab.child = H5MM_xfree(f->mtab.child);
     f->mtab.nalloc = 0;
     if(H5FO_top_dest(f) < 0)
@@ -1082,8 +1078,6 @@ H5F_dest(H5F_t *f, hid_t dxpl_id)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_dest() */
 
-
-
 
 /*-------------------------------------------------------------------------
  * Function:	H5F_open
@@ -1163,9 +1157,6 @@ H5F_dest(H5F_t *f, hid_t dxpl_id)
  *		Modified H5F_flush call to take one flag instead of
  *		multiple Boolean flags.
  *
- *		Vailin Choi, 2008-04-02
- *		To formulate path for later searching of target file for external link
- *		via H5_build_extpath().
  *-------------------------------------------------------------------------
  */
 H5F_t *
@@ -1362,10 +1353,6 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t d
             HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "file close degree doesn't match")
     } /* end if */
 
-    /* formulate the absolute path for later search of target file for external link */
-    if (H5_build_extpath(name, &file->extpath) < 0)
-	HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to build extpath")
-    
     /* Success */
     ret_value = file;
 
@@ -2153,33 +2140,6 @@ H5F_get_intent(const H5F_t *f)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_get_extpath
- *
- * Purpose:	Retrieve the file's 'extpath' flags
- *		This is used by H5L_extern_traverse() to retrieve the main file's location
- *		when searching the target file.
- *
- * Return:	'extpath' on success/abort on failure (shouldn't fail)
- * 
- * Programmer:	Vailin Choi, April 2, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-char *
-H5F_get_extpath(const H5F_t *f)
-{
-    /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_extpath)
-
-    HDassert(f);
-
-    FUNC_LEAVE_NOAPI(f->extpath)
-} /* end H5F_get_extpath() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5F_sizeof_addr
  *
  * Purpose:	Quick and dirty routine to retrieve the size of the file's size_t
@@ -3658,3 +3618,4 @@ H5Fget_info(hid_t obj_id, H5F_info_t *finfo)
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fget_info() */
+
diff --git a/src/H5FDmpi.h b/src/H5FDmpi.h
index 0384018..90aa0e2 100644
--- a/src/H5FDmpi.h
+++ b/src/H5FDmpi.h
@@ -42,14 +42,14 @@ typedef enum H5FD_mpio_xfer_t {
     H5FD_MPIO_COLLECTIVE
 } H5FD_mpio_xfer_t;
 
-/* Type of chunked dataset I/O */
+/* Type of I/O for data transfer properties */
 typedef enum H5FD_mpio_chunk_opt_t {
     H5FD_MPIO_CHUNK_DEFAULT = 0,
     H5FD_MPIO_CHUNK_ONE_IO,  		/*zero is the default*/
     H5FD_MPIO_CHUNK_MULTI_IO
 } H5FD_mpio_chunk_opt_t;
 
-/* Type of collective I/O */
+/* Type of I/O for data transfer properties */
 typedef enum H5FD_mpio_collective_opt_t {
     H5FD_MPIO_COLLECTIVE_IO = 0,
     H5FD_MPIO_INDIVIDUAL_IO  		/*zero is the default*/
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 89a8637..c8087bb 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -572,15 +572,15 @@ H5Pset_dxpl_mpio_collective_opt(hid_t dxpl_id, H5FD_mpio_collective_opt_t opt_mo
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
-    if(H5P_set(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &opt_mode) < 0)
+    if (H5P_set(plist,H5D_XFER_MPIO_COLLECTIVE_OPT_NAME,&opt_mode)<0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
     /* Initialize driver-specific properties */
-    ret_value = H5P_set_driver(plist, H5FD_MPIO, NULL);
+    ret_value= H5P_set_driver(plist, H5FD_MPIO, NULL);
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Pset_dxpl_mpio_collective_opt() */
+}
 
 
 /*-------------------------------------------------------------------------
@@ -1413,8 +1413,8 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
     int                         type_size;      /* MPI datatype used for I/O's size */
     int                         io_size;        /* Actual number of bytes requested */
     H5P_genplist_t              *plist;      /* Property list pointer */
-    hbool_t			use_view_this_time = FALSE;
-    herr_t              	ret_value = SUCCEED;
+    unsigned			use_view_this_time=0;
+    herr_t              	ret_value=SUCCEED;
 
     FUNC_ENTER_NOAPI(H5FD_mpio_read, FAIL)
 
@@ -1464,7 +1464,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
             MPI_Datatype		file_type;
 
             /* Remember that views are used */
-            use_view_this_time = TRUE;
+            use_view_this_time=TRUE;
 
             /* prepare for a full-blown xfer using btype, ftype, and disp */
             if(H5P_get(plist,H5FD_MPI_XFER_MEM_MPI_TYPE_NAME,&buf_type)<0)
@@ -1487,9 +1487,9 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
     } /* end if */
 
     /* Read the data. */
-    if(use_view_this_time) {
+    if (use_view_this_time) {
        H5FD_mpio_collective_opt_t coll_opt_mode;
-
+       H5FD_mpio_collective_opt_t xfer_opt_mode;
 #ifdef H5FDmpio_DEBUG
 	if (H5FD_mpio_Debug[(int)'t'])
 	    fprintf(stdout, "H5FD_mpio_read: using MPIO collective mode\n");
@@ -1497,23 +1497,28 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
         /* Peek the collective_opt property to check whether the application wants to do IO individually. */
         coll_opt_mode = (H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME);
 
-        if(coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
+       /* Peek the xfer_opt_mode property to check whether the application wants to do IO individually. */
+        xfer_opt_mode = (H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_OPT_MODE_NAME);
+     
+        if(coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO && xfer_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
 #ifdef H5FDmpio_DEBUG
-            if(H5FD_mpio_Debug[(int)'t'])
-                fprintf(stdout, "H5FD_mpio_read: doing MPI collective IO\n");
+        if (H5FD_mpio_Debug[(int)'t'])
+            fprintf(stdout, "H5FD_mpio_read: doing MPI collective IO\n");
 #endif
-            if(MPI_SUCCESS != (mpi_code = MPI_File_read_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
-                HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at_all failed", mpi_code)
-        } /* end if */
+/* Temporarily change to read_at_all 
+        if (MPI_SUCCESS!= (mpi_code=MPI_File_read_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat )))*/
+        if (MPI_SUCCESS!= (mpi_code=MPI_File_read_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat )))
+            HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at_all failed", mpi_code)
+        }
         else {
 #ifdef H5FDmpio_DEBUG
-            if(H5FD_mpio_Debug[(int)'t'])
-                fprintf(stdout, "H5FD_mpio_read: doing MPI independent IO\n");
+        if (H5FD_mpio_Debug[(int)'t'])
+            fprintf(stdout, "H5FD_mpio_read: doing MPI independent IO\n");
 #endif
 
-            if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
-                HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code)
-        } /* end else */
+        if (MPI_SUCCESS!= (mpi_code=MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat )))
+            HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code)
+        }
  
         /*
          * Reset the file view when we used MPI derived types
@@ -1695,7 +1700,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
     int         		size_i, bytes_written;
     int                         type_size;      /* MPI datatype used for I/O's size */
     int                         io_size;        /* Actual number of bytes requested */
-    hbool_t			use_view_this_time = FALSE;
+    unsigned			use_view_this_time=0;
     H5P_genplist_t              *plist;                 /* Property list pointer */
     herr_t              	ret_value=SUCCEED;
 
@@ -1713,25 +1718,26 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
     assert(buf);
 
     /* Portably initialize MPI status variable */
-    HDmemset(&mpi_stat, 0, sizeof(MPI_Status));
+    HDmemset(&mpi_stat,0,sizeof(MPI_Status));
 
     /* some numeric conversions */
-    if(H5FD_mpi_haddr_to_MPIOff(addr, &mpi_off) < 0)
+    if (H5FD_mpi_haddr_to_MPIOff(addr, &mpi_off)<0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from haddr to MPI off")
     size_i = (int)size;
-    if((hsize_t)size_i != size)
+    if ((hsize_t)size_i != size)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from size to size_i")
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'w'])
-        fprintf(stdout, "in H5FD_mpio_write  mpi_off=%ld  size_i=%d\n", (long)mpi_off, size_i);
+    if (H5FD_mpio_Debug[(int)'w'])
+        fprintf(stdout, "in H5FD_mpio_write  mpi_off=%ld  size_i=%d\n",
+                (long)mpi_off, size_i);
 #endif
 
     /* Obtain the data transfer properties */
     if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
-    if(type == H5FD_MEM_DRAW) {
+    if(type==H5FD_MEM_DRAW) {
         H5FD_mpio_xfer_t            xfer_mode;   /* I/O tranfer mode */
 
         /* Obtain the data transfer properties */
@@ -1743,71 +1749,114 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
          * us to test that btype=ftype=MPI_BYTE (or even MPI_TYPE_NULL, which
          * could mean "use MPI_BYTE" by convention).
          */
-        if(xfer_mode == H5FD_MPIO_COLLECTIVE) {
+        if(xfer_mode==H5FD_MPIO_COLLECTIVE) {
             MPI_Datatype		file_type;
 
             /* Remember that views are used */
-            use_view_this_time = TRUE;
+            use_view_this_time=TRUE;
 
             /* prepare for a full-blown xfer using btype, ftype, and disp */
-            if(H5P_get(plist, H5FD_MPI_XFER_MEM_MPI_TYPE_NAME, &buf_type) < 0)
+            if(H5P_get(plist,H5FD_MPI_XFER_MEM_MPI_TYPE_NAME,&buf_type)<0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get MPI-I/O type property")
-            if(H5P_get(plist, H5FD_MPI_XFER_FILE_MPI_TYPE_NAME, &file_type) < 0)
+            if(H5P_get(plist,H5FD_MPI_XFER_FILE_MPI_TYPE_NAME,&file_type)<0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get MPI-I/O type property")
 
             /*
              * Set the file view when we are using MPI derived types
              */
             /*OKAY: CAST DISCARDS CONST QUALIFIER*/
-            if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, mpi_off, MPI_BYTE, file_type, H5FD_mpi_native_g, file->info)))
+            if (MPI_SUCCESS != (mpi_code=MPI_File_set_view(file->f, mpi_off, MPI_BYTE, file_type, H5FD_mpi_native_g, file->info)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
 
             /* When using types, use the address as the displacement for
              * MPI_File_set_view and reset the address for the read to zero
              */
-            mpi_off = 0;
+            mpi_off=0;
         } /* end if */
     } /* end if */
     else {
-        /* Only one process can do the actual metadata write */
-        if(file->mpi_rank != H5_PAR_META_WRITE)
-#ifdef LATER
-            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "can't write metadata from non-zero rank")
-#else /* LATER */
+        unsigned		        block_before_meta_write=0;      /* Whether to block before a metadata write */
+
+        /* Check if we need to syncronize all processes before attempting metadata write
+         * (Prevents race condition where the process writing the metadata goes ahead
+         * and writes the metadata to the file before all the processes have
+         * read the data, "transmitting" data from the "future" to the reading
+         * process. -QAK )
+         *
+         * The only time we don't want to block before a metadata write is when
+         * we are flushing out a bunch of metadata.  Then, we block before the
+         * first write and don't block for further writes in the sequence.
+         */
+        if(H5P_exist_plist(plist,H5AC_BLOCK_BEFORE_META_WRITE_NAME)>0)
+            if(H5P_get(plist,H5AC_BLOCK_BEFORE_META_WRITE_NAME,&block_before_meta_write)<0)
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get H5AC property")
+
+#if 0 /* JRM */
+	/* The metadata cache now only writes from process 0, which makes
+	 * this synchronization incorrect.  I'm leaving this code commented
+	 * out instead of deleting it to remind us that we should re-write
+	 * this function so that a metadata write from any other process 
+	 * should flag an error.
+	 *                                  -- JRM 9/1/05
+	 */
+        if(block_before_meta_write)
+            if (MPI_SUCCESS!= (mpi_code=MPI_Barrier(file->comm)))
+                HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed", mpi_code)
+#endif /* JRM */
+
+        /* Only one process will do the actual write if all procs in comm write same metadata */
+        if (file->mpi_rank != H5_PAR_META_WRITE) {
+#ifdef H5FDmpio_DEBUG
+            if (H5FD_mpio_Debug[(int)'w']) {
+                fprintf(stdout,
+                    "  proc %d: in H5FD_mpio_write (write omitted)\n",
+                    file->mpi_rank );
+            }
+#endif
             HGOTO_DONE(SUCCEED) /* skip the actual write */
-#endif /* LATER */
+        } /* end if */
     } /* end if */
 
     /* Write the data. */
-    if(use_view_this_time) {
-        H5FD_mpio_collective_opt_t coll_opt_mode;
-
+    if (use_view_this_time) {
+       H5FD_mpio_collective_opt_t coll_opt_mode;
+       H5FD_mpio_collective_opt_t  xfer_opt_mode;
 #ifdef H5FDmpio_DEBUG
-        if(H5FD_mpio_Debug[(int)'t'])
+        if (H5FD_mpio_Debug[(int)'t'])
             fprintf(stdout, "H5FD_mpio_write: using MPIO collective mode\n");
 #endif
         /* Peek the collective_opt property to check whether the application wants to do IO individually. */
-        coll_opt_mode = (H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME);
+        coll_opt_mode = (H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist,H5D_XFER_MPIO_COLLECTIVE_OPT_NAME);
+
+         /* Peek the xfer_opt_mode property to check whether the application wants to do IO individually. */
+        xfer_opt_mode = (H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist,H5D_XFER_IO_XFER_OPT_MODE_NAME);
 
         /*OKAY: CAST DISCARDS CONST QUALIFIER*/
-        if(coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
+        if(coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO && xfer_opt_mode == H5FD_MPIO_COLLECTIVE_IO ) {
 #ifdef H5FDmpio_DEBUG
-            if(H5FD_mpio_Debug[(int)'t'])
-                fprintf(stdout, "H5FD_mpio_write: doing MPI collective IO\n");
+        if (H5FD_mpio_Debug[(int)'t'])
+            fprintf(stdout, "H5FD_mpio_write: doing MPI collective IO\n");
 #endif
-            if(MPI_SUCCESS != (mpi_code = MPI_File_write_at_all(file->f, mpi_off, (void*)buf, size_i, buf_type, &mpi_stat)))
-                HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at_all failed", mpi_code)
-        } /* end if */
+        /* Temporarily change to _at 
+if (MPI_SUCCESS != (mpi_code=MPI_File_write_at_all(file->f, mpi_off, (void*)buf, size_i, buf_type, &mpi_stat)))
+*/
+        if (MPI_SUCCESS != (mpi_code=MPI_File_write_at_all(file->f, mpi_off, (void*)buf, size_i, buf_type, &mpi_stat)))
+            HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at_all failed", mpi_code)
+        }
         else {
 #ifdef H5FDmpio_DEBUG
-            if(H5FD_mpio_Debug[(int)'t'])
-                fprintf(stdout, "H5FD_mpio_write: doing MPI independent IO\n");
+        if (H5FD_mpio_Debug[(int)'t'])
+            fprintf(stdout, "H5FD_mpio_write: doing MPI independent IO\n");
 #endif
-            if(MPI_SUCCESS != (mpi_code = MPI_File_write_at(file->f, mpi_off, (void*)buf, size_i, buf_type, &mpi_stat)))
-                HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at failed", mpi_code)
-        } /* end else */
+ 
+          if (MPI_SUCCESS != (mpi_code=MPI_File_write_at(file->f, mpi_off, (void*)buf, size_i, buf_type, &mpi_stat)))
+            HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at failed", mpi_code)
+        }
+
 
-        /* Reset the file view when we used MPI derived types */
+       /*
+         * Reset the file view when we used MPI derived types
+         */
         /*OKAY: CAST DISCARDS CONST QUALIFIER*/
         if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, (MPI_Offset)0, MPI_BYTE, MPI_BYTE, H5FD_mpi_native_g,  file->info)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
@@ -1823,31 +1872,48 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
      *  datatype in this call though... (We aren't because using it causes
      *  the LANL "qsc" machine to dump core - 12/19/03) - QAK]
      */
-    if(MPI_SUCCESS != (mpi_code = MPI_Get_elements(&mpi_stat, MPI_BYTE, &bytes_written)))
+    if (MPI_SUCCESS != (mpi_code=MPI_Get_elements(&mpi_stat, MPI_BYTE, &bytes_written)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Get_elements failed", mpi_code)
 
     /* Get the type's size */
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_size(buf_type, &type_size)))
+    if (MPI_SUCCESS != (mpi_code=MPI_Type_size(buf_type,&type_size)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_size failed", mpi_code)
 
     /* Compute the actual number of bytes requested */
-    io_size = type_size * size_i;
+    io_size=type_size*size_i;
 
     /* Check for write failure */
-    if(bytes_written != io_size)
+    if (bytes_written != io_size)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
 
     /* Forget the EOF value (see H5FD_mpio_get_eof()) --rpm 1999-08-06 */
     file->eof = HADDR_UNDEF;
 
 done:
+
+#if 0 /* JRM */
+    /* Since metadata writes are now done by process 0 only, this broadcast
+     * is no longer needed.  I leave it in and commented out to remind us 
+     * that we need to re-work this function to reflect this reallity.
+     *
+     *                                          -- JRM 9/1/05
+     */
+    /* if only one process writes, need to broadcast the ret_value to 
+     * other processes 
+     */
+    if(type != H5FD_MEM_DRAW) {
+	if(MPI_SUCCESS != (mpi_code = MPI_Bcast(&ret_value, (int)sizeof(ret_value), MPI_BYTE, H5_PAR_META_WRITE, file->comm)))
+	    HMPI_DONE_ERROR(FAIL, "MPI_Bcast failed", mpi_code)
+    } /* end if */
+#endif /* JRM */
+
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
     	fprintf(stdout, "proc %d: Leaving H5FD_mpio_write with ret_value=%d\n",
 	    file->mpi_rank, ret_value );
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_mpio_write() */
+}
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5FScache.c b/src/H5FScache.c
index 8ad9631..74a9aab 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -606,7 +606,7 @@ HDfprintf(stderr, "%s: fspace->addr = %a, fs_addr = %a\n", FUNC, fspace->addr, f
         unsigned sect_cnt_size;         /* The size of the section size counts */
 
         /* Compute the size of the section counts */
-        sect_cnt_size = H5V_limit_enc_size((uint64_t)fspace->serial_sect_count);
+        sect_cnt_size = MAX(1, (H5V_log2_gen(fspace->serial_sect_count) + 7) / 8);
 #ifdef QAK
 HDfprintf(stderr, "%s: sect_cnt_size = %u\n", FUNC, sect_cnt_size);
 HDfprintf(stderr, "%s: fspace->sect_len_size = %u\n", FUNC, fspace->sect_len_size);
@@ -905,7 +905,7 @@ HDfprintf(stderr, "%s: sinfo->fspace->addr = %a\n", FUNC, sinfo->fspace->addr);
         /* Set up user data for iterator */
         udata.sinfo = sinfo;
         udata.p = &p;
-        udata.sect_cnt_size = H5V_limit_enc_size((uint64_t)sinfo->fspace->serial_sect_count);
+        udata.sect_cnt_size = MAX(1, (H5V_log2_gen(sinfo->fspace->serial_sect_count) + 7) / 8);
 #ifdef QAK
 HDfprintf(stderr, "%s: udata.sect_cnt_size = %u\n", FUNC, udata.sect_cnt_size);
 #endif /* QAK */
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index 34da067..c589aa0 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -147,7 +147,7 @@ H5FS_sinfo_new(H5F_t *f, H5FS_t *fspace)
     sinfo->nbins = H5V_log2_gen(fspace->max_sect_size);
     sinfo->sect_prefix_size = H5FS_SINFO_PREFIX_SIZE(f);
     sinfo->sect_off_size = (fspace->max_sect_addr + 7) / 8;
-    sinfo->sect_len_size = H5V_limit_enc_size((uint64_t)fspace->max_sect_size);
+    sinfo->sect_len_size = (H5V_log2_gen(fspace->max_sect_size) + 7) / 8;
     sinfo->fspace = fspace;
 #ifdef QAK
 HDfprintf(stderr, "%s: sinfo->nbins = %u\n", FUNC, sinfo->nbins);
@@ -1300,7 +1300,7 @@ HDfprintf(stderr, "%s: fspace->sinfo->serial_size_count = %Zu\n", FUNC, fspace->
 HDfprintf(stderr, "%s: fspace->sinfo->serial_size_count = %Zu\n", FUNC, fspace->sinfo->serial_size_count);
 HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", FUNC, fspace->serial_sect_count);
 #endif /* QAK */
-        sect_buf_size += fspace->sinfo->serial_size_count * H5V_limit_enc_size((uint64_t)fspace->serial_sect_count);
+        sect_buf_size += fspace->sinfo->serial_size_count * MAX(1, ((H5V_log2_gen(fspace->serial_sect_count) + 7) / 8));
 
         /* Size for each differently sized serializable section */
         sect_buf_size += fspace->sinfo->serial_size_count * fspace->sinfo->sect_len_size;
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index 288ef8a..3f10e1a 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -142,7 +142,6 @@ typedef struct H5F_mtab_t {
 struct H5F_t {
     unsigned		intent;		/* The flags passed to H5F_open()*/
     char		*name;		/* Name used to open file	*/
-    char               	*extpath;       /* Path for searching target external link file */
     H5F_file_t		*shared;	/* The shared file info		*/
     unsigned		nopen_objs;	/* Number of open object headers*/
     H5FO_t              *obj_count;     /* # of time each object is opened through top file structure */
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 27b45f2..1044b14 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -265,7 +265,6 @@ typedef struct H5F_t H5F_t;
 #define H5F_GC_REF(F)           ((F)->shared->gc_ref)
 #define H5F_USE_LATEST_FORMAT(F) ((F)->shared->latest_format)
 #define H5F_INTENT(F)           ((F)->intent)
-#define H5F_EXTPATH(F)          ((F)->extpath)
 #define H5F_GET_FC_DEGREE(F)    ((F)->shared->fc_degree)
 #define H5F_STORE_MSG_CRT_IDX(F)    ((F)->shared->store_msg_crt_idx)
 #define H5F_GET_FILENO(F,FILENUM) ((FILENUM) = (F)->shared->lf->fileno)
@@ -285,7 +284,6 @@ typedef struct H5F_t H5F_t;
 #define H5F_GC_REF(F)           (H5F_gc_ref(F))
 #define H5F_USE_LATEST_FORMAT(F) (H5F_use_latest_format(F))
 #define H5F_INTENT(F)           (H5F_get_intent(F))
-#define H5F_EXTPATH(F)          (H5F_get_extpath(F))
 #define H5F_GET_FC_DEGREE(F)    (H5F_get_fc_degree(F))
 #define H5F_STORE_MSG_CRT_IDX(F)    (H5F_store_msg_crt_idx(F))
 #define H5F_GET_FILENO(F,FILENUM) (H5F_get_filenum((F), &(FILENUM)))
@@ -419,7 +417,6 @@ H5_DLL herr_t H5F_try_close(H5F_t *f);
 H5_DLL hid_t H5F_get_driver_id(const H5F_t *f);
 H5_DLL hid_t H5F_get_access_plist(H5F_t *f);
 H5_DLL unsigned H5F_get_intent(const H5F_t *f);
-H5_DLL char *H5F_get_extpath(const H5F_t *f);
 H5_DLL herr_t H5F_get_fileno(const H5F_t *f, unsigned long *filenum);
 H5_DLL hid_t H5F_get_id(H5F_t *file);
 H5_DLL unsigned H5F_get_obj_count(const H5F_t *f, unsigned types);
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c
index 60d5002..c1b856b 100644
--- a/src/H5HFhdr.c
+++ b/src/H5HFhdr.c
@@ -225,7 +225,7 @@ H5HF_hdr_finish_init_phase1(H5HF_hdr_t *hdr)
 
     /* Set the size of heap IDs */
     hdr->heap_len_size = MIN(hdr->man_dtable.max_dir_blk_off_size,
-            H5V_limit_enc_size((uint64_t)hdr->max_man_size));
+            ((H5V_log2_gen((uint64_t)hdr->max_man_size) + 7) / 8));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c
index 7fedc48..70133aa 100644
--- a/src/H5HFiblock.c
+++ b/src/H5HFiblock.c
@@ -1591,7 +1591,7 @@ done:
  */
 herr_t
 H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_addr,
-    unsigned nrows, H5HF_indirect_t *par_iblock, unsigned par_entry, hsize_t *heap_size)
+    unsigned nrows, hsize_t *heap_size)
 {
     H5HF_indirect_t     *iblock = NULL;         /* Pointer to indirect block */
     hbool_t             did_protect;            /* Whether we protected the indirect block or not */
@@ -1608,7 +1608,7 @@ H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_ad
     HDassert(heap_size);
 
     /* Protect the indirect block */
-    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, nrows, par_iblock, par_entry, FALSE, H5AC_READ, &did_protect)))
+    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, nrows, NULL, 0, FALSE, H5AC_READ, &did_protect)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap indirect block")
 
     /* Accumulate size of this indirect block */
@@ -1624,14 +1624,13 @@ H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_ad
         entry = hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width;
 	first_row_bits = H5V_log2_of2((uint32_t)hdr->man_dtable.cparam.start_block_size) +
 			    H5V_log2_of2(hdr->man_dtable.cparam.width);
-        num_indirect_rows = 
-	    (H5V_log2_gen(hdr->man_dtable.row_block_size[hdr->man_dtable.max_direct_rows]) - first_row_bits) + 1;
+        num_indirect_rows = (H5V_log2_gen(hdr->man_dtable.row_block_size[u]) - first_row_bits) + 1;
         for(u = hdr->man_dtable.max_direct_rows; u < iblock->nrows; u++, num_indirect_rows++) {
             size_t      v;                      /* Local index variable */
 
 	    for(v = 0; v < hdr->man_dtable.cparam.width; v++, entry++)
 		if(H5F_addr_defined(iblock->ents[entry].addr))
-		    if(H5HF_man_iblock_size(f, dxpl_id, hdr, iblock->ents[entry].addr, num_indirect_rows, iblock, entry, heap_size) < 0)
+		    if(H5HF_man_iblock_size(f, dxpl_id, hdr, iblock->ents[entry].addr, num_indirect_rows, heap_size) < 0)
 			HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to get fractal heap storage info for indirect block")
         } /* end for */
     } /* end if */
@@ -1640,7 +1639,6 @@ done:
     /* Release the indirect block */
     if(iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
-    iblock = NULL;
 
    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5HF_man_iblock_size() */
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h
index fd332e5..702ce08 100644
--- a/src/H5HFpkg.h
+++ b/src/H5HFpkg.h
@@ -601,7 +601,7 @@ H5_DLL herr_t H5HF_man_iblock_delete(H5HF_hdr_t *hdr, hid_t dxpl_id,
     haddr_t iblock_addr, unsigned iblock_nrows, H5HF_indirect_t *par_iblock,
     unsigned par_entry);
 H5_DLL herr_t H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr,
-    haddr_t iblock_addr, unsigned nrows, H5HF_indirect_t *par_iblock, unsigned par_entry, hsize_t *heap_size/*out*/);
+    haddr_t iblock_addr, unsigned nrows, hsize_t *heap_size/*out*/);
 
 /* Direct block routines */
 H5_DLL herr_t H5HF_man_dblock_new(H5HF_hdr_t *fh, hid_t dxpl_id, size_t request,
diff --git a/src/H5HFstat.c b/src/H5HFstat.c
index d151b47..2e3e189 100644
--- a/src/H5HFstat.c
+++ b/src/H5HFstat.c
@@ -128,7 +128,6 @@ H5HF_size(const H5HF_t *fh, hid_t dxpl_id, hsize_t *heap_size)
 {
     H5HF_hdr_t *hdr;                            /* Fractal heap header */
     herr_t      ret_value = SUCCEED;            /* Return value */
-    hsize_t	meta_size = 0;			/* free space storage size */
 
     FUNC_ENTER_NOAPI(H5HF_size, FAIL)
 
@@ -148,7 +147,7 @@ H5HF_size(const H5HF_t *fh, hid_t dxpl_id, hsize_t *heap_size)
 
     /* Check for indirect blocks for managed objects */
     if(H5F_addr_defined(hdr->man_dtable.table_addr) && hdr->man_dtable.curr_root_rows != 0)
-        if(H5HF_man_iblock_size(hdr->f, dxpl_id, hdr, hdr->man_dtable.table_addr, hdr->man_dtable.curr_root_rows, NULL, 0, heap_size) < 0)
+        if(H5HF_man_iblock_size(hdr->f, dxpl_id, hdr, hdr->man_dtable.table_addr, hdr->man_dtable.curr_root_rows, heap_size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to get fractal heap storage info for indirect block")
 
     /* Get B-tree storage for huge objects in fractal heap */
@@ -173,11 +172,9 @@ H5HF_size(const H5HF_t *fh, hid_t dxpl_id, hsize_t *heap_size)
     } /* end if */
 
     /* Get storage for free-space tracking info */
-    if(H5F_addr_defined(hdr->fs_addr)) {
-        if(H5HF_space_size(hdr, dxpl_id, &meta_size) < 0)
+    if(H5F_addr_defined(hdr->fs_addr))
+        if(H5HF_space_size(hdr, dxpl_id, heap_size) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "can't retrieve FS meta storage info")
-	*heap_size += meta_size;
-    }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c
index 4e355bb..5a8eb33 100644
--- a/src/H5Lexternal.c
+++ b/src/H5Lexternal.c
@@ -76,81 +76,6 @@ H5L_init_extern_interface(void)
 } /* H5L_init_extern_interface() */
 
 
-
-/*--------------------------------------------------------------------------
- * Function: H5L_getenv_prefix_name --
- *
- * Purpose:  Get the first pathname in the list of pathnames stored in ENV_PREFIX,
- *           which is separated by the environment delimiter.
- *           ENV_PREFIX is modified to point to the remaining pathnames
- *           in the list.
- *
- * Return:   A pointer to a pathname
- *
- * Programmer:	Vailin Choi, April 2, 2008
- *
---------------------------------------------------------------------------*/
-static char *
-H5L_getenv_prefix_name(char **env_prefix/*in,out*/)
-{
-    char        *retptr=NULL;
-    char        *strret=NULL;
-
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5L_getenv_prefix_name)
-
-    strret = HDstrchr(*env_prefix, COLON_SEPC);
-    if (strret == NULL) {
-        retptr = *env_prefix;
-        *env_prefix = strret;
-    } else {
-        retptr = *env_prefix;
-        *env_prefix = strret + 1;
-        *strret = '\0';
-    }
-    return(retptr);
-    FUNC_LEAVE_NOAPI(retptr)
-}
-
-
-/*--------------------------------------------------------------------------
- * Function: H5L_build_name
- *
- * Purpose:  Prepend PREFIX to FILE_NAME and store in FULL_NAME
- *
- * Return:   Non-negative on success/Negative on failure
- *
- * Programmer:	Vailin Choi, April 2, 2008
- *
---------------------------------------------------------------------------*/
-static herr_t
-H5L_build_name(char *prefix, char *file_name, char **full_name/*out*/)
-{
-    size_t      prefix_len;             /* length of prefix */
-    size_t      fname_len;              /* Length of external link file name */
-    herr_t      ret_value = SUCCEED;    /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5L_build_name)
-
-    prefix_len = HDstrlen(prefix);
-    fname_len = HDstrlen(file_name);
-
-    /* Allocate a buffer to hold the filename + prefix + possibly the delimiter + terminating null byte */
-    if(NULL == (*full_name = H5MM_malloc(prefix_len + fname_len + 2)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate filename buffer")
-
-    /* Copy the prefix into the buffer */
-    HDstrcpy(*full_name, prefix);
-    if (!CHECK_DELIMITER(prefix[prefix_len-1]))
-        HDstrcat(*full_name, DIR_SEPS);
-
-    /* Add the external link's filename to the prefix supplied */
-    HDstrcat(*full_name, file_name);
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5L_build_name() */
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5L_extern_traverse
  *
@@ -167,10 +92,6 @@ done:
  *
  * Programmer:	James Laird
  *              Monday, July 10, 2006
- * Modifications:
- *		Vailin Choi, April 2, 2008
- *		Add handling to search for the target file 
- *		See description in RM: H5Lcreate_external
  *
  *-------------------------------------------------------------------------
  */
@@ -193,11 +114,6 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
     hid_t       ext_obj = -1;           /* ID for external link's object */
     hid_t       ret_value;              /* Return value */
 
-    char        *tempname=NULL, *ptr=NULL, *extpath=NULL;
-    char        *env_prefix=NULL, *tmp_env_prefix=NULL;
-    char        *out_prefix_name=NULL, *pp=NULL;
-
-
     FUNC_ENTER_NOAPI(H5L_extern_traverse, FAIL)
 
     /* Sanity checks */
@@ -219,6 +135,28 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
     if(NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
+    /* Get the current prefix */
+    if(H5P_get(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external link prefix")
+
+    /* Check for prefix being set, if so, prepend it to the filename */
+    if(my_prefix) {
+        size_t prefix_len = HDstrlen(my_prefix);
+
+        /* Allocate a buffer to hold the filename plus prefix */
+        if(NULL == (full_name = H5MM_malloc(prefix_len + fname_len + 1)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate filename buffer")
+
+        /* Copy the prefix into the buffer */
+        HDstrcpy(full_name, my_prefix);
+
+        /* Add the external link's filename to the prefix supplied */
+        HDstrcat(full_name, (const char *)p);
+
+        /* Point to name w/prefix */
+        file_name = full_name;
+    } /* end if */
+
     /* Get the location for the group holding the external link */
     if(H5G_loc(cur_group, &loc) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't get object location")
@@ -245,92 +183,10 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file close degree")
     } /* end if */
 
-    /*
-     * Start searching for the target file
-     */
-    if ((tempname=H5MM_strdup(file_name)) == NULL)
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-
-    /* target file_name is an absolute pathname: see RM for detailed description */
-    if (CHECK_ABSOLUTE(file_name) || CHECK_ABS_PATH(file_name)) {
-        if(NULL == (ext_file = H5F_open(file_name, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY),
-                                H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id))) {
-            H5E_clear_stack(NULL);
-            /* get last component of file_name */
-	    GET_LAST_DELIMITER(file_name, ptr)
-	    HDassert(ptr);
-	    HDstrcpy(tempname, ++ptr);
-        }
-    } else if (CHECK_ABS_DRIVE(file_name)) {
-        if(NULL == (ext_file = H5F_open(file_name, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY),
-                                H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id))) {
-            H5E_clear_stack(NULL);
-	    /* strip "<drive-letter>:" */
-	    HDstrcpy(tempname, &file_name[2]);
-	}
-    }
-    
-    /* try searching from paths set in the environment variable */
-    if ((ext_file == NULL) && (env_prefix=HDgetenv("HDF5_EXT_PREFIX"))) {
-
-        tmp_env_prefix = H5MM_strdup(env_prefix);
-	pp = tmp_env_prefix;
-
-        while ((tmp_env_prefix) && (*tmp_env_prefix)) {
-            out_prefix_name = H5L_getenv_prefix_name(&tmp_env_prefix/*in,out*/);
-            if ((out_prefix_name) && (*out_prefix_name)) {
-
-                if (H5L_build_name(out_prefix_name, tempname, &full_name/*out*/) < 0)
-                    HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
-
-                ext_file = H5F_open(full_name, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY),
-                            H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id);
-                if (full_name)
-                    H5MM_xfree(full_name);
-                if (ext_file != NULL)
-                    break;
-                H5E_clear_stack(NULL);
-            }
-        } /* end while */
-        if (pp)
-            H5MM_xfree(pp);
-    }
-    
-    /* try searching from property list */
-    if (ext_file == NULL) {
-        if(H5P_get(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external link prefix")
-        if (my_prefix) {
-            if (H5L_build_name(my_prefix, tempname, &full_name/*out*/) < 0)
-                HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
-            if ((ext_file=H5F_open(full_name, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY),
-                        H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)) == NULL)
-                H5E_clear_stack(NULL);
-            if (full_name)
-                H5MM_xfree(full_name);
-        }
-    }
-
-    /* try searching from main file's "extpath":see description in H5F_open() & H5_build_extpath() */
-    if ((ext_file == NULL) && (extpath=H5F_EXTPATH(loc.oloc->file))) {
-        if (H5L_build_name(extpath, tempname, &full_name/*out*/) < 0)
-            HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
-        if ((ext_file = H5F_open(full_name, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY),
-                    H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)) == NULL)
-            H5E_clear_stack(NULL);
-        if (full_name)
-            H5MM_xfree(full_name);
-    }
-
-    /* try the relative file_name stored in tempname */
-    if (ext_file == NULL) {
-        if ((ext_file=H5F_open(tempname, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY),
-                        H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)) == NULL)
-            HGOTO_ERROR(H5E_LINK, H5E_CANTOPENFILE, FAIL, "unable to open external file")
-    }
-
-    if (tempname)
-        H5MM_xfree(tempname);
+    /* Open the external file */
+    /* (extra work with file intent to mask off inappropriate flags) */
+    if(NULL == (ext_file = H5F_open(file_name, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY), H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)))
+	HGOTO_ERROR(H5E_LINK, H5E_CANTOPENFILE, FAIL, "unable to open external file")
 
     /* Increment the number of open objects, to hold the file open */
     H5F_incr_nopen_objs(ext_file);
@@ -363,6 +219,10 @@ done:
     if(ext_file && H5F_try_close(ext_file) < 0)
         HDONE_ERROR(H5E_LINK, H5E_CANTCLOSEFILE, FAIL, "problem closing external file")
 
+    /* Free full_name if it's been allocated */
+    if(full_name)
+        H5MM_xfree(full_name);
+
     /* Close object if it's open and something failed */
     if(ret_value < 0 && ext_obj >= 0 && H5I_dec_ref(ext_obj) < 0)
         HDONE_ERROR(H5E_ATOM, H5E_CANTRELEASE, FAIL, "unable to close atom for external object")
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index ba343bc..ac07edf 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -232,11 +232,10 @@ H5O_dtype_decode_helper(H5F_t *f, const uint8_t **pp, H5T_t *dt)
         case H5T_COMPOUND:
             {
                 unsigned offset_nbytes;         /* Size needed to encode member offsets */
-                size_t max_memb_pos = 0;        /* Maximum member covered, so far */
                 unsigned j;
 
                 /* Compute the # of bytes required to store a member offset */
-                offset_nbytes = H5V_limit_enc_size((uint64_t)dt->shared->size);
+                offset_nbytes = (H5V_log2_gen((uint64_t)dt->shared->size) + 7) / 8;
 
                 /*
                  * Compound datatypes...
@@ -337,18 +336,6 @@ H5O_dtype_decode_helper(H5F_t *f, const uint8_t **pp, H5T_t *dt)
                     /* Set the field datatype (finally :-) */
                     dt->shared->u.compnd.memb[i].type = temp_type;
 
-                    /* Check if this field overlaps with a prior field */
-                    /* (probably indicates that the file is corrupt) */
-                    if(i > 0 && dt->shared->u.compnd.memb[i].offset < max_memb_pos) {
-                        for(j = 0; j < i; j++)
-                            if(dt->shared->u.compnd.memb[i].offset >= dt->shared->u.compnd.memb[j].offset
-                                    && dt->shared->u.compnd.memb[i].offset < (dt->shared->u.compnd.memb[j].offset + dt->shared->u.compnd.memb[j].size))
-                                HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "member overlaps with previous member")
-                    } /* end if */
-
-                    /* Update the maximum member position covered */
-                    max_memb_pos = MAX(max_memb_pos, (dt->shared->u.compnd.memb[i].offset + dt->shared->u.compnd.memb[i].size));
-
                     /* Check if the datatype stayed packed */
                     if(dt->shared->u.compnd.packed) {
                         /* Check if the member type is packed */
@@ -747,7 +734,7 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                 unsigned offset_nbytes;         /* Size needed to encode member offsets */
 
                 /* Compute the # of bytes required to store a member offset */
-                offset_nbytes = H5V_limit_enc_size((uint64_t)dt->shared->size);
+                offset_nbytes = (H5V_log2_gen((uint64_t)dt->shared->size) + 7) / 8;
 
                 /*
                  * Compound datatypes...
@@ -1110,7 +1097,7 @@ H5O_dtype_size(const H5F_t *f, const void *_mesg)
                 unsigned offset_nbytes;         /* Size needed to encode member offsets */
 
                 /* Compute the # of bytes required to store a member offset */
-                offset_nbytes = H5V_limit_enc_size((uint64_t)dt->shared->size);
+                offset_nbytes = (H5V_log2_gen((uint64_t)dt->shared->size) + 7) / 8;
 
                 /* Compute the total size needed to encode compound datatype */
                 for(u = 0; u < dt->shared->u.compnd.nmembs; u++) {
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 8bc263a..6affcad 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -90,6 +90,9 @@
 /* Definitions for I/O transfer mode property */
 #define H5D_XFER_IO_XFER_MODE_SIZE       sizeof(H5FD_mpio_xfer_t)
 #define H5D_XFER_IO_XFER_MODE_DEF        H5FD_MPIO_INDEPENDENT
+/* Definitions for I/O optimization transfer mode property(using MPI-IO independent IO with file set view) */
+#define H5D_XFER_IO_XFER_OPT_MODE_SIZE    sizeof(H5FD_mpio_collective_opt_t)
+#define H5D_XFER_IO_XFER_OPT_MODE_DEF         H5FD_MPIO_COLLECTIVE_IO
 /* Definitions for optimization of MPI-IO transfer mode property */
 #define H5D_XFER_MPIO_COLLECTIVE_OPT_SIZE       sizeof(H5FD_mpio_collective_opt_t)
 #define H5D_XFER_MPIO_COLLECTIVE_OPT_DEF        H5FD_MPIO_COLLECTIVE_IO
@@ -196,6 +199,7 @@ H5P_dxfr_reg_prop(H5P_genclass_t *pclass)
     size_t def_hyp_vec_size = H5D_XFER_HYPER_VECTOR_SIZE_DEF;   /* Default value for vector size */
 #ifdef H5_HAVE_PARALLEL
     H5FD_mpio_xfer_t def_io_xfer_mode = H5D_XFER_IO_XFER_MODE_DEF;      /* Default value for I/O transfer mode */
+    H5FD_mpio_collective_opt_t def_io_xfer_opt_mode = H5D_XFER_IO_XFER_OPT_MODE_DEF;
     H5FD_mpio_chunk_opt_t def_mpio_chunk_opt_mode = H5D_XFER_MPIO_CHUNK_OPT_HARD_DEF;
     H5FD_mpio_collective_opt_t def_mpio_collective_opt_mode = H5D_XFER_MPIO_COLLECTIVE_OPT_DEF;
     unsigned def_mpio_chunk_opt_num = H5D_XFER_MPIO_CHUNK_OPT_NUM_DEF;
@@ -261,6 +265,8 @@ H5P_dxfr_reg_prop(H5P_genclass_t *pclass)
     /* Register the I/O transfer mode property */
     if(H5P_register(pclass, H5D_XFER_IO_XFER_MODE_NAME, H5D_XFER_IO_XFER_MODE_SIZE, &def_io_xfer_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+    if(H5P_register(pclass, H5D_XFER_IO_XFER_OPT_MODE_NAME, H5D_XFER_IO_XFER_OPT_MODE_SIZE, &def_io_xfer_opt_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
     if(H5P_register(pclass, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, H5D_XFER_MPIO_COLLECTIVE_OPT_SIZE, &def_mpio_collective_opt_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
     if(H5P_register(pclass, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME, H5D_XFER_MPIO_CHUNK_OPT_HARD_SIZE, &def_mpio_chunk_opt_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
diff --git a/src/H5S.c b/src/H5S.c
index 4996f1f..8a58cba 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -45,6 +45,18 @@ static herr_t H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc);
 static H5S_t *H5S_decode(const unsigned char *buf);
 static htri_t H5S_extent_equal(const H5S_t *ds1, const H5S_t *ds2);
 
+#ifdef H5S_DEBUG
+/* Names of the selection names, for debugging */
+static const char *H5S_sel_names[]={
+    "none", "point", "hyperslab", "all"
+};
+
+/* The path table, variable length */
+static H5S_iostats_t		**H5S_iostats_g = NULL;
+static size_t			H5S_aiostats_g = 0;	/*entries allocated*/
+static size_t			H5S_niostats_g = 0;	/*entries used*/
+#endif /* H5S_DEBUG */
+
 #ifdef H5_HAVE_PARALLEL
 /* Global vars whose value can be set from environment variable also */
 hbool_t H5S_mpi_opt_types_g = TRUE;
@@ -75,9 +87,9 @@ DESCRIPTION
 static herr_t
 H5S_init_interface(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value=SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_init_interface)
+    FUNC_ENTER_NOAPI_NOINIT(H5S_init_interface);
 
     /* Initialize the atom group for the file IDs */
     if(H5I_register_type(H5I_DATASPACE, (size_t)H5I_DATASPACEID_HASHSIZE, H5S_RESERVED_ATOMS, (H5I_free_t)H5S_close) < 0)
@@ -93,8 +105,8 @@ H5S_init_interface(void)
 #endif /* H5_HAVE_PARALLEL */
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5S_init_interface() */
+    FUNC_LEAVE_NOAPI(ret_value);
+}
 
 
 /*--------------------------------------------------------------------------
@@ -117,26 +129,156 @@ done:
 int
 H5S_term_interface(void)
 {
-    int	n = 0;
-
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_term_interface)
-
-    if(H5_interface_initialize_g) {
-	if((n = H5I_nmembers(H5I_DATASPACE))) {
+    int	n=0;
+#ifdef H5S_DEBUG
+    size_t	i;
+    int		j, nprints=0;
+    H5S_iostats_t	*path=NULL;
+    char	buf[256];
+#endif /* H5S_DEBUG */
+
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_term_interface);
+
+    if (H5_interface_initialize_g) {
+	if ((n=H5I_nmembers(H5I_DATASPACE))) {
 	    H5I_clear_type(H5I_DATASPACE, FALSE);
-	} /* end if */
-        else {
+	} else {
+#ifdef H5S_DEBUG
+	    /*
+	     * Print statistics about each conversion path.
+	     */
+	    if (H5DEBUG(S)) {
+		for (i=0; i<H5S_niostats_g; i++) {
+		    path = H5S_iostats_g[i];
+		    for (j=0; j<2; j++) {
+			if (0==path->stats[j].gath_ncalls &&
+			    0==path->stats[j].scat_ncalls &&
+			    0==path->stats[j].bkg_ncalls &&
+			    0==path->stats[j].read_ncalls &&
+			    0==path->stats[j].write_ncalls) {
+			    continue;
+			}
+			if (0==nprints++) {
+			    fprintf(H5DEBUG(S), "H5S: data space conversion "
+				    "statistics:\n");
+			    fprintf(H5DEBUG(S),
+				    "   %-16s %10s %10s %8s %8s %8s %10s\n",
+				    "Memory <> File", "Bytes", "Calls",
+				    "User", "System", "Elapsed", "Bandwidth");
+			    fprintf(H5DEBUG(S),
+				    "   %-16s %10s %10s %8s %8s %8s %10s\n",
+				    "--------------", "-----", "-----",
+				    "----", "------", "-------", "---------");
+			}
+
+			/* Summary */
+			sprintf(buf, "%s %c %s",
+				H5S_sel_names[path->mtype], 0==j?'>':'<', H5S_sel_names[path->ftype]);
+			fprintf(H5DEBUG(S), "   %-16s\n", buf);
+
+			/* Gather */
+			if (path->stats[j].gath_ncalls) {
+			    H5_bandwidth(buf,
+					 (double)(path->stats[j].gath_nbytes),
+					 path->stats[j].gath_timer.etime);
+			    HDfprintf(H5DEBUG(S),
+				      "   %16s %10Hu %10Hu %8.2f %8.2f %8.2f "
+				      "%10s\n", "gather",
+				      path->stats[j].gath_nbytes,
+				      path->stats[j].gath_ncalls,
+				      path->stats[j].gath_timer.utime,
+				      path->stats[j].gath_timer.stime,
+				      path->stats[j].gath_timer.etime,
+				      buf);
+			}
+
+			/* Scatter */
+			if (path->stats[j].scat_ncalls) {
+			    H5_bandwidth(buf,
+					 (double)(path->stats[j].scat_nbytes),
+					 path->stats[j].scat_timer.etime);
+			    HDfprintf(H5DEBUG(S),
+				      "   %16s %10Hu %10Hu %8.2f %8.2f %8.2f "
+				      "%10s\n", "scatter",
+				      path->stats[j].scat_nbytes,
+				      path->stats[j].scat_ncalls,
+				      path->stats[j].scat_timer.utime,
+				      path->stats[j].scat_timer.stime,
+				      path->stats[j].scat_timer.etime,
+				      buf);
+			}
+
+			/* Background */
+			if (path->stats[j].bkg_ncalls) {
+			    H5_bandwidth(buf,
+					 (double)(path->stats[j].bkg_nbytes),
+					 path->stats[j].bkg_timer.etime);
+			    HDfprintf(H5DEBUG(S),
+				      "   %16s %10Hu %10Hu %8.2f %8.2f %8.2f "
+				      "%10s\n", "background",
+				      path->stats[j].bkg_nbytes,
+				      path->stats[j].bkg_ncalls,
+				      path->stats[j].bkg_timer.utime,
+				      path->stats[j].bkg_timer.stime,
+				      path->stats[j].bkg_timer.etime,
+				      buf);
+			}
+
+			/* Read */
+			if (path->stats[j].read_ncalls) {
+			    H5_bandwidth(buf,
+					 (double)(path->stats[j].read_nbytes),
+					 path->stats[j].read_timer.etime);
+			    HDfprintf(H5DEBUG(S),
+				      "   %16s %10Hu %10Hu %8.2f %8.2f %8.2f "
+				      "%10s\n", "read",
+				      path->stats[j].read_nbytes,
+				      path->stats[j].read_ncalls,
+				      path->stats[j].read_timer.utime,
+				      path->stats[j].read_timer.stime,
+				      path->stats[j].read_timer.etime,
+				      buf);
+			}
+
+			/* Write */
+			if (path->stats[j].write_ncalls) {
+			    H5_bandwidth(buf,
+					 (double)(path->stats[j].write_nbytes),
+					 path->stats[j].write_timer.etime);
+			    HDfprintf(H5DEBUG(S),
+				      "   %16s %10Hu %10Hu %8.2f %8.2f %8.2f "
+				      "%10s\n", "write",
+				      path->stats[j].write_nbytes,
+				      path->stats[j].write_ncalls,
+				      path->stats[j].write_timer.utime,
+				      path->stats[j].write_timer.stime,
+				      path->stats[j].write_timer.etime,
+				      buf);
+			}
+		    }
+		}
+	    }
+#endif /* H5S_DEBUG */
+
 	    /* Free data types */
 	    H5I_dec_type_ref(H5I_DATASPACE);
 
+#ifdef H5S_DEBUG
+	    /* Clear/free conversion table */
+	    for (i=0; i<H5S_niostats_g; i++)
+                H5MM_xfree(H5S_iostats_g[i]);
+	    H5S_iostats_g = H5MM_xfree(H5S_iostats_g);
+	    H5S_niostats_g = H5S_aiostats_g = 0;
+#endif /* H5S_DEBUG */
+
 	    /* Shut down interface */
 	    H5_interface_initialize_g = 0;
 	    n = 1; /*H5I*/
-	} /* end else */
-    } /* end if */
+	}
+    }
 
-    FUNC_LEAVE_NOAPI(n)
-} /* end H5S_term_interface() */
+    FUNC_LEAVE_NOAPI(n);
+}
 
 
 /*--------------------------------------------------------------------------
@@ -1242,6 +1384,105 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5S_set_extent_simple() */
 
+#ifdef H5S_DEBUG
+
+/*-------------------------------------------------------------------------
+ * Function:	H5S_find
+ *
+ * Purpose:	Given two data spaces (MEM_SPACE and FILE_SPACE) this
+ *		function returns a pointer to the conversion path information,
+ *		creating a new conversion path entry if necessary.
+ *
+ * Return:	Success:	Ptr to a conversion path entry
+ *
+ *		Failure:	NULL
+ *
+ * Programmer:	Robb Matzke
+ *		Wednesday, January 21, 1998
+ *
+ * Modifications:
+ *
+ * 	Quincey Koziol
+ *	Instead of returning a point into the data space conversion table we
+ *	copy all the information into a user-supplied CONV buffer and return
+ *	non-negative on success or negative on failure.
+ *
+ * 	Robb Matzke, 11 Aug 1998
+ *	Returns a pointer into the conversion path table.  A path entry
+ *	contains pointers to the memory and file half of the conversion (the
+ *	pointers registered in the H5S_fconv_g[] and H5S_mconv_g[] tables)
+ *	along with other data whose scope is the conversion path (like path
+ *	statistics).
+ *
+ *	John Mainzer, 8/30/04
+ *	Modified code to check with all other processes that have the
+ *	file open before OKing collective I/O.
+ *
+ *-------------------------------------------------------------------------
+ */
+H5S_iostats_t *
+H5S_find (const H5S_t *mem_space, const H5S_t *file_space)
+{
+    H5S_iostats_t	*path=NULL;  /* Space conversion path */
+    size_t	u;      /* Index variable */
+    H5S_iostats_t *ret_value;   /* Return value */
+
+    FUNC_ENTER_NOAPI(H5S_find, NULL);
+
+    /* Check args */
+    assert (mem_space && (H5S_SIMPLE==H5S_GET_EXTENT_TYPE(mem_space) ||
+                          H5S_NULL==H5S_GET_EXTENT_TYPE(mem_space) ||
+			  H5S_SCALAR==H5S_GET_EXTENT_TYPE(mem_space)));
+    assert (file_space && (H5S_SIMPLE==H5S_GET_EXTENT_TYPE(file_space) ||
+                           H5S_NULL==H5S_GET_EXTENT_TYPE(file_space) ||
+			   H5S_SCALAR==H5S_GET_EXTENT_TYPE(file_space)));
+
+    /*
+     * Is this path already present in the data space conversion path table?
+     * If so then return a pointer to that entry.
+     */
+    for (u=0; u<H5S_niostats_g; u++)
+        if (H5S_iostats_g[u]->ftype==H5S_GET_SELECT_TYPE(file_space) &&
+                H5S_iostats_g[u]->mtype==H5S_GET_SELECT_TYPE(mem_space))
+            HGOTO_DONE(H5S_iostats_g[u]);
+
+    /*
+     * The path wasn't found.  Create a new path.
+     */
+    if (NULL==(path = H5MM_calloc(sizeof(*path))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for data space conversion path")
+
+    /* Initialize file & memory conversion functions */
+    path->ftype = H5S_GET_SELECT_TYPE(file_space);
+    path->mtype = H5S_GET_SELECT_TYPE(mem_space);
+
+    /*
+     * Add the new path to the table.
+     */
+    if (H5S_niostats_g>=H5S_aiostats_g) {
+        size_t n = MAX(10, 2*H5S_aiostats_g);
+        H5S_iostats_t **p = H5MM_realloc(H5S_iostats_g, n*sizeof(H5S_iostats_g[0]));
+
+        if (NULL==p)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for data space conversion path table")
+        H5S_aiostats_g = n;
+        H5S_iostats_g = p;
+    } /* end if */
+    H5S_iostats_g[H5S_niostats_g++] = path;
+
+    /* Set the return value */
+    ret_value=path;
+
+done:
+    if(ret_value==NULL) {
+        if(path!=NULL)
+            H5MM_xfree(path);
+    } /* end if */
+
+    FUNC_LEAVE_NOAPI(ret_value);
+} /* end H5S_find() */
+#endif /* H5S_DEBUG */
+
 
 /*-------------------------------------------------------------------------
  * Function:	H5Screate_simple
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index 725b8fc..cc89b49 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -123,7 +123,7 @@ H5S_mpio_all_type( const H5S_t *space, size_t elmt_size,
     *new_type = MPI_BYTE;
     H5_ASSIGN_OVERFLOW(*count, total_bytes, hsize_t, size_t);
     *extra_offset = 0;
-    *is_derived_type = FALSE;
+    *is_derived_type = 0;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -163,7 +163,7 @@ H5S_mpio_none_type( const H5S_t UNUSED *space, size_t UNUSED elmt_size,
     *new_type = MPI_BYTE;
     *count = 0;
     *extra_offset = 0;
-    *is_derived_type = FALSE;
+    *is_derived_type = 0;
 
     FUNC_LEAVE_NOAPI(SUCCEED);
 } /* H5S_mpio_none_type() */
@@ -456,7 +456,7 @@ H5S_mpio_hyper_type( const H5S_t *space, size_t elmt_size,
     /* fill in the remaining return values */
     *count = 1;			/* only have to move one of these suckers! */
     *extra_offset = 0;
-    *is_derived_type = TRUE;
+    *is_derived_type = 1;
     HGOTO_DONE(SUCCEED);
 
 empty:
@@ -464,7 +464,7 @@ empty:
     *new_type = MPI_BYTE;
     *count = 0;
     *extra_offset = 0;
-    *is_derived_type = FALSE;
+    *is_derived_type = 0;
 
 done:
     /* Release selection iterator */
@@ -475,7 +475,7 @@ done:
 
 #ifdef H5S_DEBUG
   if(H5DEBUG(S)){
-    HDfprintf(H5DEBUG(S), "Leave %s, count=%ld  is_derived_type=%t\n",
+    HDfprintf(H5DEBUG(S), "Leave %s, count=%ld  is_derived_type=%d\n",
 		FUNC, *count, *is_derived_type );
   }
 #endif
@@ -556,7 +556,7 @@ H5S_mpio_span_hyper_type( const           H5S_t *space,
     /* fill in the remaining return values */
     *count = 1;
     *extra_offset = 0;
-    *is_derived_type = TRUE;
+    *is_derived_type = 1;
 
     HGOTO_DONE(SUCCEED);
 
@@ -565,7 +565,7 @@ empty:
     *new_type        = MPI_BYTE;
     *count           = 0;
     *extra_offset    = 0;
-    *is_derived_type = FALSE;
+    *is_derived_type = 0;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index 8744872..bd27f09 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -115,6 +115,31 @@ typedef struct H5S_sel_iter_t {
     } u;
 } H5S_sel_iter_t;
 
+#ifdef H5S_DEBUG
+typedef struct H5S_iostats_t {
+    H5S_sel_type	ftype;
+    H5S_sel_type	mtype;
+
+    struct {
+	H5_timer_t	scat_timer;		/*time spent scattering	*/
+	hsize_t		scat_nbytes;		/*scatter throughput	*/
+	hsize_t		scat_ncalls;		/*number of calls	*/
+	H5_timer_t	gath_timer;		/*time spent gathering	*/
+	hsize_t		gath_nbytes;		/*gather throughput	*/
+	hsize_t		gath_ncalls;		/*number of calls	*/
+	H5_timer_t	bkg_timer;		/*time for background	*/
+	hsize_t		bkg_nbytes;		/*background throughput	*/
+	hsize_t		bkg_ncalls;		/*number of calls	*/
+	H5_timer_t	read_timer;		/*time for read calls	*/
+	hsize_t		read_nbytes;		/*total bytes read	*/
+	hsize_t		read_ncalls;		/*number of calls	*/
+	H5_timer_t	write_timer;		/*time for write calls	*/
+	hsize_t		write_nbytes;		/*total bytes written	*/
+	hsize_t		write_ncalls;		/*number of calls	*/
+    } stats[2];		/* 0=output, 1=input */
+} H5S_iostats_t;
+#endif
+
 /* If the module using this macro is allowed access to the private variables, access them directly */
 #ifdef H5S_PACKAGE
 #define H5S_GET_EXTENT_TYPE(S)          ((S)->extent.type)
@@ -173,6 +198,9 @@ typedef struct H5S_sel_iter_t {
 /* Operations on dataspaces */
 H5_DLL H5S_t *H5S_copy(const H5S_t *src, hbool_t share_selection, hbool_t copy_max);
 H5_DLL herr_t H5S_close(H5S_t *ds);
+#ifdef H5S_DEBUG
+H5_DLL H5S_iostats_t *H5S_find(const H5S_t *mem_space, const H5S_t *file_space);
+#endif /* H5S_DEBUG */
 H5_DLL H5S_class_t H5S_get_simple_extent_type(const H5S_t *ds);
 H5_DLL hssize_t H5S_get_simple_extent_npoints(const H5S_t *ds);
 H5_DLL hsize_t H5S_get_npoints_max(const H5S_t *ds);
diff --git a/src/H5T.c b/src/H5T.c
index c726e5c..04d6c0b 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -4552,7 +4552,7 @@ H5T_path_compound_subset(const H5T_path_t *p)
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_path_compound_subset);
 
-    HDassert(p);
+    assert(p);
 
     if(p->are_compounds)
         ret_value = H5T_conv_struct_subset(&(p->cdata));
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 7803d07..0da4d53 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -1890,15 +1890,17 @@ H5T_subset_t
 H5T_conv_struct_subset(const H5T_cdata_t *cdata)
 {
     H5T_conv_struct_t	*priv;
+    H5T_subset_t        ret_value;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_conv_struct_subset)
 
     HDassert(cdata);
     HDassert(cdata->priv);
 
-    priv = (H5T_conv_struct_t *)(cdata->priv);
+    priv = (H5T_conv_struct_t*)(cdata->priv);
+    ret_value = priv->smembs_subset;
 
-    FUNC_LEAVE_NOAPI(priv->smembs_subset)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5T_conv_struct_subset() */
 
 
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index 2fe4c3a..dfe2367 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -69,7 +69,7 @@ typedef struct H5T_conv_cb_t {
 
 /* Values for the optimization of compound data reading and writing.  They indicate
  * whether the fields of the source and destination are subset of each other and
- * there is no conversion needed.
+ * there is no conversion needed.  It's for the Chicago company.
  */
 typedef enum {
     H5T_SUBSET_BADVALUE = -1,   /* Invalid value */
diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h
index b92266c..94b3699 100644
--- a/src/H5Vprivate.h
+++ b/src/H5Vprivate.h
@@ -410,25 +410,5 @@ H5V_log2_of2(uint32_t n)
     return(MultiplyDeBruijnBitPosition[(n * (uint32_t)0x077CB531UL) >> 27]);
 } /* H5V_log2_of2() */
 
-
-/*-------------------------------------------------------------------------
- * Function:    H5V_limit_enc_size
- *
- * Purpose:     Determine the # of bytes needed to encode values within a
- *              range from 0 to a given limit
- *
- * Return:      Number of bytes needed
- *
- * Programmer:  Quincey Koziol
- *              Thursday, March 13, 2008
- *
- *-------------------------------------------------------------------------
- */
-static H5_inline unsigned UNUSED
-H5V_limit_enc_size(uint64_t limit)
-{
-    return (H5V_log2_gen(limit) / 8) + 1;
-} /* end H5V_limit_enc_size() */
-
 #endif /* H5Vprivate_H */
 
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 77a3b23..5c767ef 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -368,9 +368,6 @@
 /* Define to 1 if you have the `waitpid' function. */
 #undef HAVE_WAITPID
 
-/* Define if your system has window style path name. */
-#undef HAVE_WINDOW_PATH
-
 /* Define to 1 if you have the <winsock.h> header file. */
 #undef HAVE_WINSOCK_H
 
diff --git a/src/H5private.h b/src/H5private.h
index b60c50a..11f3037 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -638,15 +638,7 @@ H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...);
 #define HDfwrite(M,Z,N,F)	fwrite(M,Z,N,F)
 #define HDgetc(F)		getc(F)
 #define HDgetchar()		getchar()
-#ifdef _WIN32
-#define HDgetcwd(S,Z)		_getcwd(S,Z)
-#define HDgetdcwd(D,S,Z)	_getdcwd(D,S,Z)
-#define HDgetdrive()		_getdrive()
-#else
 #define HDgetcwd(S,Z)		getcwd(S,Z)
-#define HDgetdcwd(D,S,Z)	getcwd(S,Z)
-#define HDgetdrive()		0
-#endif
 #define HDgetegid()		getegid()
 #define HDgetenv(S)		getenv(S)
 #define HDgeteuid()		geteuid()
@@ -919,42 +911,6 @@ extern char *strdup(const char *s);
 
 #endif /* _WIN32 */
 
-#ifdef H5_HAVE_WINDOW_PATH
-
-/* directory delimiter for Windows: slash and backslash are acceptable on Windows */
-#define	DIR_SLASH_SEPC 		'/'
-#define	DIR_SEPC 		'\\'
-#define	DIR_SEPS 		"\\"
-#define CHECK_DELIMITER(SS)     ((SS == DIR_SEPC)||(SS == DIR_SLASH_SEPC))
-#define CHECK_ABSOLUTE(NAME)    ((isalpha(NAME[0])) && (NAME[1] == ':') && (CHECK_DELIMITER(NAME[2])))
-#define CHECK_ABS_DRIVE(NAME)   ((isalpha(NAME[0])) && (NAME[1] == ':'))
-#define CHECK_ABS_PATH(NAME)    (CHECK_DELIMITER(NAME[0]))
-
-#define GET_LAST_DELIMITER(NAME, ptr) {                 \
-    char        *slash, *backslash;                     \
-    slash = strrchr(NAME, DIR_SLASH_SEPC);              \
-    backslash = strrchr(NAME, DIR_SEPC);                \
-    if (backslash > slash)                              \
-        (ptr = backslash);                              \
-    else                                                \
-        (ptr = slash);                                  \
-}
-
-#else
-
-#define		DIR_SEPC	'/'
-#define		DIR_SEPS	"/"
-#define         CHECK_DELIMITER(SS)             (SS == DIR_SEPC)
-#define         CHECK_ABSOLUTE(NAME)            (CHECK_DELIMITER(*NAME))
-#define 	CHECK_ABS_DRIVE(NAME)   	(0)
-#define 	CHECK_ABS_PATH(NAME)    	(0)
-#define         GET_LAST_DELIMITER(NAME, ptr)   ptr = strrchr(NAME, DIR_SEPC);
-
-#endif
-
-#define 	COLON_SEPC	':'
-H5_DLL herr_t   H5_build_extpath(const char *, char ** /*out*/ );
-
 
 /*
  * These macros check whether debugging has been requested for a certain
diff --git a/src/H5public.h b/src/H5public.h
index 5606171..06060dd 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -70,11 +70,11 @@ extern "C" {
 
 /* Version numbers */
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
-#define H5_VERS_MINOR	9	/* For minor interface/format changes  	     */
-#define H5_VERS_RELEASE	5	/* For tweaks, bug-fixes, or development     */
+#define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
+#define H5_VERS_RELEASE	0	/* For tweaks, bug-fixes, or development     */
 #define H5_VERS_SUBRELEASE ""	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.9.5"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.0"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
diff --git a/src/H5system.c b/src/H5system.c
index 4a49d71..5eae11d 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -35,8 +35,6 @@
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Fprivate.h"		/* File access				*/
 #include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Eprivate.h"
-
 
 
 /****************/
@@ -580,100 +578,4 @@ HDremove_all(const char *fname)
 }
 #endif
 
-
-/*
- *-------------------------------------------------------------------------
- *
- * Function: H5_build_extpath
- *
- * Purpose:  To build the path for later searching of target file for external link.
- *   	     This path can be either:
- *                      1. The absolute path of NAME
- *                      or
- *                      2. The current working directory + relative path of NAME
- *
- * Return:	Success:        0
- *		Failure:	-1
- *
- * Programmer:	Vailin Choi
- *		April 2, 2008
- *-------------------------------------------------------------------------
- */
-#define MAX_PATH_LEN     1024
-
-herr_t
-H5_build_extpath(const char *name, char **extpath/*out*/)
-{
-    char        *full_path=NULL, *ptr=NULL;
-    char        *retcwd=NULL, *cwdpath=NULL, *new_name=NULL;
-    int         drive;
-    size_t      cwdlen, path_len;
-    herr_t      ret_value = SUCCEED;    /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5_build_extpath)
-
-    *extpath = NULL;
-
-    /* 
-     * Unix: name[0] is a "/"
-     * Windows: name[0-2] is "<drive letter>:\" or "<drive-letter>:/"
-     */
-    if (CHECK_ABSOLUTE(name)) {
-        if ((full_path=H5MM_strdup(name)) == NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-    } else { /* relative pathname */
-        if ((cwdpath=H5MM_malloc(MAX_PATH_LEN)) == NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-        if ((new_name=H5MM_strdup(name)) == NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-
-	/* 
-	 * Windows: name[0-1] is "<drive-letter>:"
-	 * 	Get current working directory on the drive specified in NAME 
-	 * Unix: does not apply
-	 */
-        if (CHECK_ABS_DRIVE(name)) {
-            drive = name[0] - 'A' + 1;
-            retcwd = HDgetdcwd(drive, cwdpath, MAX_PATH_LEN);
-            HDstrcpy(new_name, &name[2]);
-	/* 
-	 * Windows: name[0] is a '/' or '\' 
-	 *	Get current drive
-	 * Unix: does not apply
-	 */
-        } else if (CHECK_ABS_PATH(name) && (drive=HDgetdrive())) {
-            sprintf(cwdpath, "%c:%c", (drive+'A'-1), name[0]);
-            retcwd = cwdpath;
-            HDstrcpy(new_name, &name[1]);
-        } else /* totally relative for both Unix and Windows: get current working directory  */
-            retcwd = HDgetcwd(cwdpath, MAX_PATH_LEN);
-
-        if (retcwd != NULL) {
-            cwdlen = HDstrlen(cwdpath);
-            HDassert(cwdlen);
-            path_len = cwdlen + HDstrlen(new_name) + 2;
-            if ((full_path=H5MM_malloc(path_len)) == NULL)
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-
-            HDstrcpy(full_path, cwdpath);
-            if (!CHECK_DELIMITER(cwdpath[cwdlen-1]))
-                HDstrcat(full_path, DIR_SEPS);
-            HDstrcat(full_path, new_name);
-        }
-    }
-
-    /* strip out the last component (the file name itself) from the path */
-    if (full_path) {
-        GET_LAST_DELIMITER(full_path, ptr)
-        HDassert(ptr);
-        *++ptr = '\0';
-        *extpath = full_path;
-    }
 
-done:
-    if (cwdpath)
-	H5MM_xfree(cwdpath);
-    if (new_name)
-	H5MM_xfree(new_name);
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5_build_extpath() */
diff --git a/src/Makefile.am b/src/Makefile.am
index fcb47e2..0e5030b 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,10 +46,10 @@ libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
         H5AC.c H5B.c H5Bcache.c \
         H5B2.c H5B2cache.c H5B2dbg.c H5B2int.c H5B2stat.c H5B2test.c \
         H5C.c H5CS.c \
-        H5D.c H5Dchunk.c H5Dcompact.c H5Dcontig.c H5Ddbg.c \
+        H5D.c H5Dcompact.c H5Dcontig.c H5Ddbg.c \
         H5Ddeprec.c H5Defl.c H5Dfill.c H5Dint.c \
         H5Dio.c \
-        H5Distore.c H5Dmpio.c H5Doh.c H5Dscatgath.c H5Dselect.c H5Dtest.c \
+        H5Distore.c H5Dmpio.c H5Doh.c H5Dselect.c H5Dtest.c \
         H5E.c H5Edeprec.c H5Eint.c \
         H5F.c H5Fdbg.c H5Ffake.c H5Fmount.c H5Fsfile.c H5Fsuper.c H5Ftest.c \
         H5FD.c H5FDcore.c  \
diff --git a/src/Makefile.in b/src/Makefile.in
index 8e8f339..085bf96 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -82,20 +82,19 @@ am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \
 	H5timer.lo H5trace.lo H5A.lo H5Abtree2.lo H5Adense.lo \
 	H5Adeprec.lo H5Aint.lo H5Atest.lo H5AC.lo H5B.lo H5Bcache.lo \
 	H5B2.lo H5B2cache.lo H5B2dbg.lo H5B2int.lo H5B2stat.lo \
-	H5B2test.lo H5C.lo H5CS.lo H5D.lo H5Dchunk.lo H5Dcompact.lo \
-	H5Dcontig.lo H5Ddbg.lo H5Ddeprec.lo H5Defl.lo H5Dfill.lo \
-	H5Dint.lo H5Dio.lo H5Distore.lo H5Dmpio.lo H5Doh.lo \
-	H5Dscatgath.lo H5Dselect.lo H5Dtest.lo H5E.lo H5Edeprec.lo \
-	H5Eint.lo H5F.lo H5Fdbg.lo H5Ffake.lo H5Fmount.lo H5Fsfile.lo \
-	H5Fsuper.lo H5Ftest.lo H5FD.lo H5FDcore.lo H5FDdirect.lo \
-	H5FDfamily.lo H5FDlog.lo H5FDmpi.lo H5FDmpio.lo \
-	H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo H5FDspace.lo \
-	H5FDstdio.lo H5FL.lo H5FO.lo H5FS.lo H5FScache.lo H5FSdbg.lo \
-	H5FSsection.lo H5G.lo H5Gbtree2.lo H5Gcompact.lo H5Gdense.lo \
-	H5Gdeprec.lo H5Gent.lo H5Gint.lo H5Glink.lo H5Gloc.lo \
-	H5Gname.lo H5Gnode.lo H5Gobj.lo H5Goh.lo H5Gstab.lo H5Gtest.lo \
-	H5Gtraverse.lo H5HF.lo H5HFbtree2.lo H5HFcache.lo H5HFdbg.lo \
-	H5HFdblock.lo H5HFdtable.lo H5HFhdr.lo H5HFhuge.lo \
+	H5B2test.lo H5C.lo H5CS.lo H5D.lo H5Dcompact.lo H5Dcontig.lo \
+	H5Ddbg.lo H5Ddeprec.lo H5Defl.lo H5Dfill.lo H5Dint.lo H5Dio.lo \
+	H5Distore.lo H5Dmpio.lo H5Doh.lo H5Dselect.lo H5Dtest.lo \
+	H5E.lo H5Edeprec.lo H5Eint.lo H5F.lo H5Fdbg.lo H5Ffake.lo \
+	H5Fmount.lo H5Fsfile.lo H5Fsuper.lo H5Ftest.lo H5FD.lo \
+	H5FDcore.lo H5FDdirect.lo H5FDfamily.lo H5FDlog.lo H5FDmpi.lo \
+	H5FDmpio.lo H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo \
+	H5FDspace.lo H5FDstdio.lo H5FL.lo H5FO.lo H5FS.lo H5FScache.lo \
+	H5FSdbg.lo H5FSsection.lo H5G.lo H5Gbtree2.lo H5Gcompact.lo \
+	H5Gdense.lo H5Gdeprec.lo H5Gent.lo H5Gint.lo H5Glink.lo \
+	H5Gloc.lo H5Gname.lo H5Gnode.lo H5Gobj.lo H5Goh.lo H5Gstab.lo \
+	H5Gtest.lo H5Gtraverse.lo H5HF.lo H5HFbtree2.lo H5HFcache.lo \
+	H5HFdbg.lo H5HFdblock.lo H5HFdtable.lo H5HFhdr.lo H5HFhuge.lo \
 	H5HFiblock.lo H5HFiter.lo H5HFman.lo H5HFsection.lo \
 	H5HFspace.lo H5HFstat.lo H5HFtest.lo H5HFtiny.lo H5HG.lo \
 	H5HGdbg.lo H5HL.lo H5HLdbg.lo H5HP.lo H5I.lo H5L.lo \
@@ -384,7 +383,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 5
-LT_VERS_REVISION = 6
+LT_VERS_REVISION = 0
 LT_VERS_AGE = 0
 H5detect_CFLAGS = -g
 
@@ -405,10 +404,10 @@ libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
         H5AC.c H5B.c H5Bcache.c \
         H5B2.c H5B2cache.c H5B2dbg.c H5B2int.c H5B2stat.c H5B2test.c \
         H5C.c H5CS.c \
-        H5D.c H5Dchunk.c H5Dcompact.c H5Dcontig.c H5Ddbg.c \
+        H5D.c H5Dcompact.c H5Dcontig.c H5Ddbg.c \
         H5Ddeprec.c H5Defl.c H5Dfill.c H5Dint.c \
         H5Dio.c \
-        H5Distore.c H5Dmpio.c H5Doh.c H5Dscatgath.c H5Dselect.c H5Dtest.c \
+        H5Distore.c H5Dmpio.c H5Doh.c H5Dselect.c H5Dtest.c \
         H5E.c H5Edeprec.c H5Eint.c \
         H5F.c H5Fdbg.c H5Ffake.c H5Fmount.c H5Fsfile.c H5Fsuper.c H5Ftest.c \
         H5FD.c H5FDcore.c  \
@@ -603,7 +602,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5C.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5CS.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5D.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dchunk.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dcompact.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dcontig.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ddbg.Plo@am__quote@
@@ -615,7 +613,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Distore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dmpio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Doh.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dscatgath.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dselect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dtest.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5E.Plo@am__quote@
diff --git a/test/Makefile.am b/test/Makefile.am
index b0f80cb..53df8bb 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -105,8 +105,7 @@ flush2.chkexe_: flush1.chkexe_
 CHECK_CLEANFILES+=cmpd_dset.h5 compact_dataset.h5 dataset.h5 extend.h5 istore.h5\
             tfile[1-4].h5 th5s[1-3].h5 lheap.h5 fheap.h5 ohdr.h5 stab.h5 \
             extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 dt_arith[1-2]\
-            links.h5 links[0-6]*.h5 extlinks[0-15].h5 tmp \
-	    big.data big[0-9][0-9][0-9][0-9][0-9].h5  \
+            links.h5 links[0-6]*.h5 big.data big[0-9][0-9][0-9][0-9][0-9].h5  \
             stdio.h5 sec2.h5 dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5        \
             tselect.h5 mtime.h5 unlink.h5 unicode.h5 coord.h5 \
             fillval_[0-9].h5 fillval.raw mount_[0-9].h5 testmeta.h5 ttime.h5 \
diff --git a/test/Makefile.in b/test/Makefile.in
index 64d0e0a..7e47249 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -595,8 +595,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog cmpd_dset.h5 \
 	compact_dataset.h5 dataset.h5 extend.h5 istore.h5 \
 	tfile[1-4].h5 th5s[1-3].h5 lheap.h5 fheap.h5 ohdr.h5 stab.h5 \
 	extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 \
-	dt_arith[1-2] links.h5 links[0-6]*.h5 extlinks[0-15].h5 tmp \
-	big.data big[0-9][0-9][0-9][0-9][0-9].h5 stdio.h5 sec2.h5 \
+	dt_arith[1-2] links.h5 links[0-6]*.h5 big.data \
+	big[0-9][0-9][0-9][0-9][0-9].h5 stdio.h5 sec2.h5 \
 	dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 \
 	unlink.h5 unicode.h5 coord.h5 fillval_[0-9].h5 fillval.raw \
 	mount_[0-9].h5 testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 \
diff --git a/test/chunk_info.c b/test/chunk_info.c
deleted file mode 100644
index 48db292..0000000
--- a/test/chunk_info.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Programmer:  Pedro Vicente <pvn@hdfgroup.edu>
- *              April 7, 2008
- *
- * Purpose:     Tests the H5Dget_chunk_info API function
- *              This program writes a 4x4 dataset by iterating on 2x2 chunks
- *               at a time
- */
-
-
-#include "hdf5.h"
-#include "h5test.h"
-
-#define PRINT_DATA
-#define H5FILE_NAME "chunk_info.h5"
-#define DATASETNAME "2d"
-#define RANK         2
-
-
-int main( void )
-{
-    
-    hid_t   fid;      /* file ID */
-    hid_t   did;      /* dataset ID */
-    hid_t   f_sid;    /* file space ID */
-    hid_t   m_sid;    /* memory space ID */
-    hid_t   pid;      /* property list ID */
-    hsize_t start[2]; /* chunk location to start writing */
-    hsize_t dims[2]  = { 4, 4};       
-    hsize_t chunk_dims[2] = { 2, 2 };
-    int     chunk_data[2][2] = { {1, 1}, {1, 1} }; 
-    int     buf[4][4];  
-    int     fillvalue = 0;
-    int     i, j, ii, jj;
-
-    /* create a new file using default properties. */
-    if ((fid = H5Fcreate(H5FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR;
-    /* create the file space */
-    if ((f_sid = H5Screate_simple(RANK, dims, dims)) < 0) TEST_ERROR;
-    /* create the memory space with chunk dimensions */
-    if ((m_sid = H5Screate_simple(RANK, chunk_dims, chunk_dims)) < 0) TEST_ERROR;
-    start[0] = 0;
-    start[1] = 0;
-    if (H5Sselect_hyperslab(m_sid, H5S_SELECT_SET, start, NULL, chunk_dims, NULL) < 0) TEST_ERROR;
-
-    TESTING("chunk info");
-
-   /*-------------------------------------------------------------------------
-    * create a dataset
-    *-------------------------------------------------------------------------
-    */
-
-    /* modify dataset creation properties, i.e. enable chunking. */
-    if ((pid = H5Pcreate (H5P_DATASET_CREATE)) < 0) TEST_ERROR;
-    if (H5Pset_chunk(pid, RANK, chunk_dims) < 0) TEST_ERROR;
-    if (H5Pset_fill_value(pid, H5T_NATIVE_INT, &fillvalue) < 0) TEST_ERROR;
-
-    /* create a new dataset */
-    if((did = H5Dcreate2(fid , DATASETNAME, H5T_NATIVE_INT, f_sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0) TEST_ERROR;
-
-
-   /*-------------------------------------------------------------------------
-    * write the dataset in 2x2 chunks
-    *-------------------------------------------------------------------------
-    */
-
-    /* iterate in dim 0 */
-    for (j = 0; j < chunk_dims[0]; j++)
-    {
-        
-        /* reset start in dim 1 */
-        start[1] = 0;
-        
-        /* iterate in dim 1 */
-        for (i = 0; i < chunk_dims[1]; i++)
-        {
-            
-            /* select file hyperslab to save a 2x2 chunk */
-            if (H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, start, NULL, chunk_dims, NULL) < 0) TEST_ERROR;
-            
-            /* write the data to the hyperslab. */
-            if (H5Dwrite(did, H5T_NATIVE_INT, m_sid, f_sid, H5P_DEFAULT, chunk_data) < 0) TEST_ERROR; 
-         
-            /* read back and display complete dataset 4x4 */   
-            if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR; 
-
-
-#if defined (PRINT_DATA)
-            printf("\n");
-            printf("dataset: \n");
-            for (jj = 0; jj < dims[0]; jj++) {
-                for (ii = 0; ii < dims[1]; ii++) printf("%d ", buf[jj][ii]);
-                printf("\n");
-            }
-#endif
-            
-            
-            /* increment start in dim 1 */
-            start[1] += 2;
-            
-            
-        }
-        
-        /* increment start in dim 0 */
-        start[0] += 2;
-    }
-
-
-
-   /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-
-    if (H5Dclose(did) < 0) TEST_ERROR
-    if (H5Sclose(f_sid) < 0) TEST_ERROR
-    if (H5Sclose(m_sid) < 0) TEST_ERROR
-    if (H5Pclose(pid) < 0) TEST_ERROR
-    if (H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-  
-    puts("All chunk info tests passed.");
-    return 0;
-
-
-error:
-    H5Dclose( did );
-    H5Sclose( f_sid );
-    H5Sclose( m_sid );
-    H5Pclose( pid  );
-    H5Fclose( fid );
-    H5_FAILED();
-    return 1;
-}
-
-
-
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index a03d37e..66993e0 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -1421,32 +1421,32 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
 
     /* Create xfer properties to preserve initialized data */
     if((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-       FAIL_STACK_ERROR
+       goto error;
 
     if(H5Pset_preserve(dxpl, TRUE) < 0)
-       FAIL_STACK_ERROR
+       goto error;
 
     /* Rewrite contiguous data set */
     if((dataset = H5Dopen2(file, DSET_NAME[0], H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     /* Write the data to the dataset */
     if(H5Dwrite(dataset, rew_tid, H5S_ALL, H5S_ALL, dxpl, rew_buf) < 0)
-	FAIL_STACK_ERROR
+	goto error;
 
     if(H5Dclose(dataset) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     /* Rewrite chunked data set */
     if((dataset = H5Dopen2(file, DSET_NAME[1], H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     /* Write the data to the dataset */
     if(H5Dwrite(dataset, rew_tid, H5S_ALL, H5S_ALL, dxpl, rew_buf) < 0)
-	FAIL_STACK_ERROR
+	goto error;
 
     if(H5Dclose(dataset) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     PASSED();
 
@@ -1458,48 +1458,48 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
 
     /* Check contiguous data set */
     if((dataset = H5Dopen2(file, DSET_NAME[0], H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     if(H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     if(compare_data(orig, rbuf, TRUE) < 0) 
-        TEST_ERROR
+        goto error;
 
     if(H5Dclose(dataset) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     /* Check chunked data set */
     if((dataset = H5Dopen2(file, DSET_NAME[1], H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     if(H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     if(compare_data(orig, rbuf, TRUE) < 0) 
-        TEST_ERROR
+        goto error;
 
     if(H5Dclose(dataset) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     /* Finishing test and release resources */
     if(H5Sclose(space) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     if(H5Pclose(dcpl) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     if(H5Pclose(dxpl) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     if(H5Tclose(src_tid) < 0)
-        FAIL_STACK_ERROR
+        goto error;
     if(H5Tclose(dst_tid) < 0)
-        FAIL_STACK_ERROR
+        goto error;
     if(H5Tclose(rew_tid) < 0)
-        FAIL_STACK_ERROR
+        goto error;
     if(H5Fclose(file) < 0)
-        FAIL_STACK_ERROR
+        goto error;
 
     free(orig);
     free(rbuf);
diff --git a/test/dtypes.c b/test/dtypes.c
index 6707d2e..0388003 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -90,10 +90,6 @@ typedef enum dtype_t {
 /* Constant for size of conversion buffer for int <-> float exception test */
 #define CONVERT_SIZE    4
 
-/* Constants for compound_13 test */
-#define COMPOUND13_ARRAY_SIZE   256
-#define COMPOUND13_ATTR_NAME    "attr"
-
 /* Count opaque conversions */
 static int num_opaque_conversions_g = 0;
 
@@ -2178,107 +2174,6 @@ test_compound_12(void)
 
 
 /*-------------------------------------------------------------------------
- * Function:    test_compound_12
- *
- * Purpose:     Tests compound datatypes whose size is at the boundary for
- *              needing 2 bytes for the datatype size and "use the latest
- *              format" flag is enabled so that the size of the offsets uses
- *              the smallest # of bytes possible.
- *
- * Return:      Success:        0
- *              Failure:        number of errors
- *
- * Programmer:  Quincey Koziol
- *              Thursday, March 13, 2008
- *
- *-------------------------------------------------------------------------
- */
-static int
-test_compound_13(void)
-{
-    struct s1 {
-        unsigned char x[COMPOUND13_ARRAY_SIZE + 1];
-        float y;
-    };
-    struct s1   data_out, data_in;
-    hid_t       fileid, grpid, typeid, array1_tid, spaceid, attid;
-    hid_t       fapl_id;
-    hsize_t     dims[1] = {COMPOUND13_ARRAY_SIZE + 1};
-    char        filename[1024];
-    unsigned    u;
-
-    TESTING("compound datatypes of boundary size with latest format");
-
-    /* Create some phony data. */   
-    for(u = 0; u < COMPOUND13_ARRAY_SIZE + 1; u++)
-        data_out.x[u] = u;
-    data_out.y = 99.99;
-
-    /* Set latest_format in access propertly list to enable the latest
-     * compound datatype format.
-     */
-    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) FAIL_STACK_ERROR
-    if(H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) FAIL_STACK_ERROR
-
-    /* Open file and get root group. */
-    h5_fixname(FILENAME[4], H5P_DEFAULT, filename, sizeof filename);
-    if((fileid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0) FAIL_STACK_ERROR
-    if((grpid = H5Gopen2(fileid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-
-    /* Create a compound type. */
-    if((typeid = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) FAIL_STACK_ERROR
-    if((array1_tid = H5Tarray_create2(H5T_NATIVE_UCHAR, 1, dims)) < 0) FAIL_STACK_ERROR
-    if(H5Tinsert(typeid, "x", HOFFSET(struct s1, x), array1_tid) < 0) FAIL_STACK_ERROR
-    if(H5Tinsert(typeid, "y", HOFFSET(struct s1, y), H5T_NATIVE_FLOAT) < 0) FAIL_STACK_ERROR
-
-    /* Create a space. */
-    if((spaceid = H5Screate(H5S_SCALAR)) < 0) FAIL_STACK_ERROR
-
-    /* Create an attribute of this compound type. */
-    if((attid = H5Acreate2(grpid, COMPOUND13_ATTR_NAME, typeid, spaceid, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-
-    /* Write some data. */
-    if(H5Awrite(attid, typeid, &data_out) < 0) FAIL_STACK_ERROR
-    
-    /* Release all resources. */
-    if(H5Aclose(attid) < 0) FAIL_STACK_ERROR
-    if(H5Tclose(array1_tid) < 0) FAIL_STACK_ERROR
-    if(H5Tclose(typeid) < 0) FAIL_STACK_ERROR
-    if(H5Sclose(spaceid) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(grpid) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(fileid) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(fapl_id) < 0) FAIL_STACK_ERROR
-
-    /* Now open the file and read it. */
-    if((fileid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if((grpid = H5Gopen2(fileid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if((attid = H5Aopen(grpid, COMPOUND13_ATTR_NAME, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if((typeid = H5Aget_type(attid)) < 0) FAIL_STACK_ERROR
-    if(H5Tget_class(typeid) != H5T_COMPOUND) FAIL_STACK_ERROR
-    if(HOFFSET(struct s1, x) != H5Tget_member_offset(typeid, 0)) TEST_ERROR
-    if(HOFFSET(struct s1, y) != H5Tget_member_offset(typeid, 1)) TEST_ERROR
-    if(H5Aread(attid, typeid, &data_in) < 0) FAIL_STACK_ERROR
-
-    /* Check the data. */
-    for (u = 0; u < COMPOUND13_ARRAY_SIZE + 1; u++)
-        if(data_out.x[u] != data_in.x[u]) TEST_ERROR
-    if(data_out.y != data_in.y) TEST_ERROR
-
-    /* Release all resources. */
-    if(H5Aclose(attid) < 0) FAIL_STACK_ERROR
-    if(H5Tclose(typeid) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(grpid) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(fileid) < 0) FAIL_STACK_ERROR
-
-    PASSED();
-    return 0;
-
-error:
-    return 1;
-} /* end test_compound_13() */
-
-
-/*-------------------------------------------------------------------------
  * Function:    test_query
  *
  * Purpose:     Tests query functions of compound and enumeration types.
@@ -4808,7 +4703,7 @@ test_deprec(hid_t fapl)
 
     /* Create an array datatype with an atomic base type */
     /* (dimension permutations allowed, but not stored) */
-    if((type = H5Tarray_create1(H5T_NATIVE_INT, (int)rank, dims, perm)) < 0)
+    if((type = H5Tarray_create1(H5T_NATIVE_INT, rank, dims, perm)) < 0)
         FAIL_STACK_ERROR
 
     /* Make certain that the correct classes can be detected */
@@ -4967,7 +4862,6 @@ main(void)
     nerrors += test_compound_10();
     nerrors += test_compound_11();
     nerrors += test_compound_12();
-    nerrors += test_compound_13();
     nerrors += test_conv_enum_1();
     nerrors += test_conv_enum_2();
     nerrors += test_conv_bitfield();
diff --git a/test/links.c b/test/links.c
index ed60748..1bff4c6 100644
--- a/test/links.c
+++ b/test/links.c
@@ -20,6 +20,10 @@
  * Purpose:	Tests hard, soft (symbolic) & external links.
  */
 
+#include "h5test.h"
+
+#include "H5Lprivate.h"
+
 /*
  * This file needs to access private information from the H5G package.
  * This file also needs to access the group testing code.
@@ -28,9 +32,6 @@
 #define H5G_TESTING
 #include "H5Gpkg.h"		/* Groups 				*/
 
-#include "h5test.h"
-#include "H5Lprivate.h"
-
 /* File for external link test.  Created with gen_udlinks.c */
 #define LINKED_FILE  "be_extlink2.h5"
 
@@ -39,47 +40,15 @@ const char *FILENAME[] = {
     "links1",
     "links2",
     "links3",
-    "links4a", /* 4 */
-    "links4b", /* 5 */
-    "links4c", /* 6 */
-    "links4d", /* 7 */
-    "links5",  /* 8 */
-    "links6",  /* 9 */
-    "links7",  /* 10 */
-    "links8",  /* 11 */
-    "extlinks0",  	/* 12: main files */
-    "tmp/extlinks0",  	/* 13: */
-    "extlinks1",  	/* 14: target files */
-    "tmp/extlinks1",  	/* 15: */
-    "extlinks2",	/* 16: */
-    "tmp/extlinks2",	/* 17: */
-    "extlinks3",	/* 18: */
-    "tmp/extlinks3",	/* 19: */
-    "extlinks4",	/* 20: */
-    "tmp/extlinks4",	/* 21: */
-    "extlinks5",	/* 22: */
-    "tmp/extlinks6",	/* 23: */
-    "extlinks7",	/* 24: */
-    "tmp/extlinks7",	/* 25: */
-    "tmp/extlinks8",	/* 26: */
-    "extlinks9",	/* 27: */
-    "tmp/extlinks9",	/* 28: */
-    "extlinks10",	/* 29: */ /* TESTS for windows */
-    "tmp/extlinks10",	/* 30: */ 
-    "tmp/extlinks11",	/* 31: */ 
-    "tmp/extlinks12",	/* 32: */ 
-    "extlinks13",	/* 33: */ 
-    "tmp/extlinks13",	/* 34: */ 
-    "extlinks14",	/* 35: */ 
-    "tmp/extlinks14",	/* 36: */ 
-    "tmp/extlinks15",	/* 37: */ 
+    "links4a",
+    "links4b",
+    "links4c",
+    "links4d",
+    "links5",
+    "links6",
     NULL
 };
 
-#define TMPDIR		"tmp"
-/* do not do check_all_closed() for "ext*" files and "tmp/ext*" */
-#define EXTSTOP		12
-
 #define LINK_BUF_SIZE   1024
 #define NAME_BUF_SIZE   1024
 #define MAX_NAME_LEN    ((64*1024)+1024)
@@ -2583,1418 +2552,6 @@ external_link_dangling(hid_t fapl, hbool_t new_format)
     return -1;
 } /* end external_link_dangling() */
 
-
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_env: test 1
- *
- * Purpose:     
- *		1. target link: "extlinks1"
- *		2. main file: "extlinks0"
- *		3. target file: "tmp/extlinks1"
- * 		4. The environment variable "HDF5_EXT_PREFIX" should be set to ".:tmp"
- *		Should be able to access the target file in tmp directory through searching 
- *			the pathnames set in HDF5_EXT_PREFIX.
- *		This test will be skipped if HDF5_EXT_PREFIX is not set as expected.
- *		
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              Feb. 20, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_env(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    const char  *envval = NULL;
-
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via environment variable (w/new group format)")
-    else
-        TESTING("external links via environment variable")
-
-    if ((envval = HDgetenv("HDF5_EXT_PREFIX")) == NULL)
-        envval = "nomatch";
-    if (HDstrcmp(envval, ".:tmp")) {
-	SKIPPED();
-	return(0);
-    }
-
-    /* set up name for main file:"extlinks0" */
-    h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
-    /* set up name for external linked target file: "extlinks1" */
-    h5_fixname(FILENAME[14], fapl, filename2, sizeof filename2);
-
-    if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
-	TEST_ERROR
-
-    /* set up name for target file: "tmp/extlinks1" */
-    h5_fixname(FILENAME[15], fapl, filename3, sizeof filename3);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file from pathnames set via environment variable */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in tmp directory.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_env() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_prefix: test 2
- *
- * Purpose:     1. target link: "extlinks2"
- *		2. main file: "extlinks0"
- *		3. target file: "tmp/extlinks2"
- * 		4. Set up external link prefix via H5Pset_elink_prefix() to be "tmp"
- *		Should be able to access the target file in tmp directory via the prefix set 
- *		by H5Pset_elink_prefix()
- *		
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              Feb 19, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_prefix(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    hid_t	gapl_id = (-1);
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via H5Pset_elink_prefix()(w/new group format)")
-    else
-        TESTING("external links via H5Pset_elink_prefix()")
-
-    /* set up name for main file: "extlinks0" */
-    h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
-    /* set up name for external linked target file: "extlinks2" */
-    h5_fixname(FILENAME[16], fapl, filename2, sizeof filename2);
-
-    /* create tmp directory and get current working directory path */
-    if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
-	TEST_ERROR
-
-    /* set up name for target file: "tmp/extlinks2" */
-    h5_fixname(FILENAME[17], fapl, filename3, sizeof filename3);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file (without the absolute path) */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* set up prefix for external link */
-    if((gapl_id = H5Pcreate(H5P_GROUP_ACCESS)) < 0) TEST_ERROR
-    if(H5Pset_elink_prefix(gapl_id, TMPDIR) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", gapl_id);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file from pathnames set via H5Pset_elink_prefix() */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in tmp directory.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_prefix() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_abs_mainpath: test 3
- *
- * Purpose:     1. target link: "extlinks3"
- *		2. main file: Linux:"/CWD/tmp/extlinks0"; Windows: "<cur drive>:/CWD/tmp/extlinks0"
- *		3. target file: "tmp/extlinks3"
- *		Should be able to access the target file via the main file's absolute path
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              Feb 19, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_abs_mainpath(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE],
-    		tmpname[NAME_BUF_SIZE],
-    		cwdpath[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via main file's absolute path (w/new group format)")
-    else
-        TESTING("external links via main file's absolute path")
-
-    /* set up name for external linked target file: "extlinks3" */
-    h5_fixname(FILENAME[18], fapl, filename2, sizeof filename2);
-    /* set up name for target file: "tmp/extlinks3" */
-    h5_fixname(FILENAME[19], fapl, filename3, sizeof filename3); 
-
-    /* create tmp directory and get current working directory path */
-    if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL))
-        TEST_ERROR
-
-    /* 
-     * set up name for main file: 
-     *	Linux: "/CWD/tmp/extlinks0"
-     *  Window: "<cur drive>:/CWD/tmp/extlinks0" 
-     */
-    HDstrcpy(tmpname, cwdpath);
-    HDstrcat(tmpname, "/");
-    HDstrcat(tmpname, FILENAME[13]);
-    h5_fixname(tmpname, fapl, filename1, sizeof filename1);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file from absolute path set for main file */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in tmp directory.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_abs_mainpath() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_rel_mainpath: test 4
- *
- * Purpose: 	1. target link: "extlinks4"
- *		2. main file: "tmp/extlinks0"
- *		3. target file: "tmp/extlinks4"
- *		Should be able to access the target file via the main file's CWD+relative path
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              Feb 19, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_rel_mainpath(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via main file's CWD + relative path(w/new group format)")
-    else
-        TESTING("external links via main file's CWD + relative path")
-
-    /* set up name for external linked target file: "extlinks4" */
-    h5_fixname(FILENAME[20], fapl, filename2, sizeof filename2);
-
-    if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
-        TEST_ERROR
-
-     /* set up name for main file: "tmp/extlinks0" */
-    h5_fixname(FILENAME[13], fapl, filename1, sizeof filename1);
-    /* set up name for target file: "tmp/extlinks4" */
-    h5_fixname(FILENAME[21], fapl, filename3, sizeof filename3);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file from the main file's relative pathname */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in current working directory");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_rel_mainpath() */
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_cwd: test 5
- *
- * Purpose:     1. target link: "extlinks5"
- *		2. main file: Linux:"/CWD/tmp/extlinks0"; Window: "<cur drive>:/CWD/tmp/extlinks0"
- * 		2. target file: "extlinks5"
- *		Should be able to access the target file in the current working directory
- *		
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              Feb 19, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_cwd(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-		tmpname[NAME_BUF_SIZE],
-                cwdpath[NAME_BUF_SIZE];
-
-
-    if(new_format)
-        TESTING("external links via current working directory(w/new group format)")
-    else
-        TESTING("external links via current working directory")
-
-    /* set up name for external linked target file: "extlinks5"  */
-    /* set up name for target file: "extlinks5" */
-    h5_fixname(FILENAME[22], fapl, filename2, sizeof filename2);
-
-    if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL))
-        TEST_ERROR
- 
-    /* 
-     * set up name for main file: 
-     *	 Linux: "/CWD/tmp/extlinks0" 
-     *   Windows: "<cur drive>:/CWD/tmp/extlinks0"
-     */ 
-    HDstrcpy(tmpname, cwdpath);
-    HDstrcat(tmpname, "/");
-    HDstrcat(tmpname, FILENAME[13]);
-    h5_fixname(tmpname, fapl, filename1, sizeof filename1);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file from the current working directory */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in current working directory");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_cwd() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_abstar: test 6
- *
- * Purpose:     1. target link: Linux:"/CWD/tmp/extlinks6"; Windows:"<cur drive>:/CWD/tmp/extlinks6"
- *		2. main file: "extlinks0"
- *		3. target file: "tmp/extlinks6"
- *		Should be able to access the target file's absolute path
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              Feb. 20, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_abstar(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE],
-		tmpname[NAME_BUF_SIZE],
-                cwdpath[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via target's absolute path (w/new group format)")
-    else
-        TESTING("external links via target's absolute path")
-
-    /* set up name for main file: "extlinks0" */
-    h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
-
-     /* create tmp directory and get current working directory path */
-    if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL))
-        TEST_ERROR 
-    
-    /* 
-     * set up name for external linked target file: 
-     *   Linux: "/CWD/tmp/extlinks6" 
-     *	 Windows: "<cur drive>:/CWD/tmp/extlinks6"
-     */
-    HDstrcpy(tmpname, cwdpath);
-    HDstrcat(tmpname, "/");
-    HDstrcat(tmpname, FILENAME[23]);
-    h5_fixname(tmpname, fapl, filename2, sizeof filename2);
-
-    /* set up name for target file: "tmp/extlinks6" */
-    h5_fixname(FILENAME[23], fapl, filename3, sizeof filename3);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file with abolute path */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in tmp directory.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_abstar() */
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_abstar_cur: test 7
- *
- * Purpose:     1. target link: Linux: "/CWD/tmp/extlinks7"; Windows: "<cur drive>:/CWD/tmp/extlinks7"
- *		2. main file: "extlinks0"
- *		3. target file: "extlinks7"
- *		Should be able to access the target file via the main file's CWD.
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              Feb. 20, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_abstar_cur(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE],
-    		tmpname[NAME_BUF_SIZE],
-    		cwdpath[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via main file's CWD (w/new group format)")
-    else
-        TESTING("external links via main file's CWD")
-
-    /* set up name for main file: "extlinks0" */
-    h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
-
-    /* set up name for target file name: "extlinks7" */
-    h5_fixname(FILENAME[24], fapl, filename3, sizeof filename3);
-
-    /* create tmp directory and get current working directory path */
-    if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL))
-        TEST_ERROR
-
-     /* 
-      * set up name for external linked target file: 
-      *   Linux: "/CWD/tmp/extlinks7" 
-      *	  Windows: "<cur drive>:/CWD/tmp/extlinks7"
-      */
-    HDstrcpy(tmpname, cwdpath);
-    HDstrcat(tmpname, "/");
-    HDstrcat(tmpname, FILENAME[25]);
-    h5_fixname(tmpname, fapl, filename2, sizeof filename2);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file from main file's current working directory */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in current working directory.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_abstar_cur() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_reltar: test 8
- *
- * Purpose:     1. target link: Linux:"tmp/extlinks8"
- *		2. main file: "extlinks0"
- *		3. target file: "tmp/extlinks8"
- *		Should be able to access the target file via the main file's CWD+ target's relative path
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              Feb. 20, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_reltar(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via main file's CWD + target's relative path(w/new group format)")
-    else
-        TESTING("external links via main file's CWD + target's relative path")
-
-    /* set up name for main file: "extlinks0" */
-    h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
-
-    /* create tmp directory */
-    if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
-        TEST_ERROR
-
-    /* set up name for target file name: "tmp/extlinks8" */
-    /* set up name for external linked target file: "tmp/extlinks8" */
-    h5_fixname(FILENAME[26], fapl, filename2, sizeof filename2);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* 
-     * Should be able to find the target file from:
-     * main file's current working directory + pathname of external linked targetfile 
-     */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in tmp directory.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_reltar() */
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_chdir: test 9
- *
- * Purpose:     
- *		1. target link: "extlinks9"
- *		2. main file: "extlinks0"
- *		3. target file" "tmp/extlinks9"
- *		3. chdir "tmp"
- *		Should be able to access the target file in current working directory
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              Feb. 20, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_chdir(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via chdir and found in current working directory (w/new group format)")
-    else
-        TESTING("external links via chdir and found in current working directory")
-
-    /* set up name for main file: "extlinks0" */
-    h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
-    /* set up name for external linked target file ("extlinks9") */
-    h5_fixname(FILENAME[27], fapl, filename2, sizeof filename2);
-
-    /* create tmp directory */
-    if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
-        TEST_ERROR
-
-    /* set up name for target file name ("tmp/extlinks9") */
-    h5_fixname(FILENAME[28], fapl, filename3, sizeof filename3);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-
-    if (HDchdir(TMPDIR) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    if (HDchdir("..") < 0) TEST_ERROR
-    
-    /* 
-     * Should be able to find the target file from:
-     * main file's current working directory + pathname of external linked targetfile
-     */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in tmp directory.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_chdir() */
-
-
-
-#ifdef H5_HAVE_WINDOW_PATH
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_win1
- *
- * Purpose:     
- *   		1. target link: "/CWD/tmp/extlinks10"
- *		2. main file: "extlinks0"
- *		3. target file: "extlinks10"
- *		Should be able to find the target file via main file's CWD
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              April 15, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_win1(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE],
-		tmpname[NAME_BUF_SIZE],
-                cwdpath[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via main file's CWD (windows)(w/new group format)")
-    else
-        TESTING("external links via main file's CWD (windows)")
-
-    /* set up name for main file: "extlinks0" */
-    h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
-
-    if (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL)
-        TEST_ERROR 
-    
-    /* set up name for target link: "/CWD/tmp/extlinks10" */
-    HDstrcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it rel drive but absolute path */
-    HDstrcat(tmpname, "/");
-    HDstrcat(tmpname, FILENAME[30]);
-    h5_fixname(tmpname, fapl, filename2, sizeof filename2);
-
-    /* set up name for target file: "extlinks10" */
-    h5_fixname(FILENAME[29], fapl, filename3, sizeof filename3);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file via main file's CWD*/
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in CWD.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_win2() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_win2
- *
- * Purpose:     
- *   		1. target link: "/CWD/tmp/extlinks11"
- *		2. main file: "extlinks0"
- *		3. target file: "tmp/extlinks11"
- *		Should be able to access the target file directly
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              April 15, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_win2(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE],
-		tmpname[NAME_BUF_SIZE],
-                cwdpath[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via target's rel drive/abs path (windows)(w/new group format)")
-    else
-        TESTING("external links via target's rel drive/abs path (windows)")
-
-    /* set up name for main file: "extlinks0" */
-    h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
-
-     /* create tmp directory and get current working directory path */
-    if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL))
-        TEST_ERROR 
-    
-    /* set up name for target link: "/CWD/tmp/extlinks11" */
-    HDstrcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it relative drive but absolute path */
-    HDstrcat(tmpname, "/");
-    HDstrcat(tmpname, FILENAME[31]);
-    h5_fixname(tmpname, fapl, filename2, sizeof filename2);
-
-    /* set up name for target file: "tmp/extlinks11" */
-    h5_fixname(FILENAME[31], fapl, filename3, sizeof filename3);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file directly */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in tmp.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_win2() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_win3
- *
- * Purpose:     
- *   		1. target link: "<cur drive>:tmp/extlinks12"
- *		2. main file: "extlinks0"
- *		3. target file: "tmp/extlinks12"
- *		Should be able to access the target file directly
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              April i15 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_win3(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    int		drive=0;
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE],
-		tmpname[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via target's abs drive/rel path (windows)(w/new group format)")
-    else
-        TESTING("external links via target's abs drive/rel path (windows)")
-
-    /* set up name for main file: "extlinks0" */
-    h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
-
-    /* create tmp directory */
-    if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
-        TEST_ERROR
-
-    /* set up name for target link: "<drive-letter>:tmp/extlinks12" */
-    drive = HDgetdrive();
-    sprintf(tmpname, "%c:%s", (drive+'A'-1), FILENAME[32]);
-    h5_fixname(tmpname, fapl, filename2, sizeof filename2);
-
-    /* set up name for target file: "tmp/extlinks12" */
-    h5_fixname(FILENAME[32], fapl, filename3, sizeof filename3);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file directly */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in tmp.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_win3() */
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_win4
- *
- * Purpose:     
- *   		1. target link: "<cur drive>:tmp/extlinks13"
- *		2. main file: "<cur-drive>:extlinks0"
- *		3. target file: extlinks13
- *		Should be able to access the target file via main file's CWD
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              April 15, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_win4(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    int		drive=0;
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE],
-		tmpname[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via main file's abs drive/rel path (windows)(w/new group format)")
-    else
-        TESTING("external links via main file's abs drive/rel path (windows)")
-
-    /* set up name for main file: "<drive-letter>:extlinks0" */
-    drive = HDgetdrive();
-    sprintf(tmpname, "%c:%s", (drive+'A'-1), FILENAME[12]);
-    h5_fixname(tmpname, fapl, filename1, sizeof filename1);
-
-    /* set up name for target link: "<drive-letter>:tmp/extlinks13" */
-    sprintf(tmpname, "%c:%s", (drive+'A'-1), FILENAME[34]);
-    h5_fixname(tmpname, fapl, filename2, sizeof filename2);
-
-    /* set up name for target file: "extlinks13" */
-    h5_fixname(FILENAME[33], fapl, filename3, sizeof filename3);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file via main file's absolute drive/relative path */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in CWD.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_win4() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_win5
- *
- * Purpose:     
- *   		1. target link: "<cur drive>:tmp/extlinks14"
- *		2. main file: "/CWD/extlinks0"
- *		3. target file: "extlinks14"
- *		Should be able to access the target file via main file's relative drive/absolute path
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              April 15, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_win5(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    int		drive=0;
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE],
-		tmpname[NAME_BUF_SIZE],
-                cwdpath[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via main file's rel drive/abs path (windows)(w/new group format)")
-    else
-        TESTING("external links via main file's rel drive/abs path (windows)")
-
-    if (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL)
-        TEST_ERROR 
-    drive = HDgetdrive();
-
-    /* set up name for main file: "/CWD/extlinks0" */
-    HDstrcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it rel drive but absolute path */
-    HDstrcat(tmpname, "/");
-    HDstrcat(tmpname, FILENAME[12]);
-    h5_fixname(tmpname, fapl, filename1, sizeof filename1);
-
-    /* set up name for target link: "<drive-letter>:tmp/extlinks14" */
-    sprintf(tmpname, "%c:%s", (drive+'A'-1), FILENAME[36]);
-    h5_fixname(tmpname, fapl, filename2, sizeof filename2);
-
-    /* set up name for target file: "extlinks14" */
-    h5_fixname(FILENAME[35], fapl, filename3, sizeof filename3);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file via main file's rel drive/abs path */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in CWD.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_win5() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    external_link_win6
- *
- * Purpose:     
- *   		1. target link: "<cur drive+1>:tmp/extlinks15"
- *		2. main file: "extlinks0"
- *		3. target file: "tmp/extlinks15"
- *		Should be able to access the target file via target's rel path in the current drive
- *
- * Return:      Success:        0
- *              Failure:        -1
- *
- * Programmer:  Vailin Choi
- *              April 15, 2008
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static int
-external_link_win6(hid_t fapl, hbool_t new_format)
-{
-    hid_t	fid = (-1);     		/* File ID */
-    hid_t	gid = (-1);	                /* Group IDs */
-    int		drive=0;
-    char	filename1[NAME_BUF_SIZE],
-    		filename2[NAME_BUF_SIZE],
-    		filename3[NAME_BUF_SIZE],
-		tmpname[NAME_BUF_SIZE];
-
-    if(new_format)
-        TESTING("external links via target's rel path in current drive(windows)(w/new group format)")
-    else
-        TESTING("external links via target's rel path in current drive(windows)")
-
-    /* create tmp directory */
-    if (HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST)
-        TEST_ERROR
-    drive = HDgetdrive();
-
-    /* set up name for main file: "extlinks0" */
-    h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
-
-    /* set up name for target link: "<drive-letter+1>:tmp/extlinks15" */
-    sprintf(tmpname, "%c:%s", ((drive+1)+'A'-1), FILENAME[37]);
-    h5_fixname(tmpname, fapl, filename2, sizeof filename2);
-
-    /* set up name for target file: "tmp/extlinks15" */
-    h5_fixname(FILENAME[37], fapl, filename3, sizeof filename3);
-
-    /* Create the target file */
-    if((fid=H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-    if((gid=H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-    /* closing for target file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-
-    /* Create the main file */
-    if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create external link to target file */
-    if(H5Lcreate_external(filename2, "/A", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-
-    /* Open object through external link */
-    H5E_BEGIN_TRY {
-        gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
-    } H5E_END_TRY;
-
-    /* should be able to find the target file via target file's rel path in current drive */
-    if (gid < 0) {
-	H5_FAILED();
-	puts("    Should have found the file in tmp.");
-	goto error;
-    }
-
-    /* closing for main file */
-    if(H5Gclose(gid) < 0) TEST_ERROR
-    if(H5Fclose(fid) < 0) TEST_ERROR
-
-    PASSED();
-    return 0;
-
- error:
-    H5E_BEGIN_TRY {
-	H5Gclose (gid);
-	H5Fclose (fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end external_link_win6() */
-
-#endif /* H5_HAVE_WINDOW_PATH */
-
 
 /*-------------------------------------------------------------------------
  * Function:    external_link_recursive
@@ -6727,7 +5284,7 @@ linkinfo(hid_t fapl, hbool_t new_format)
  *-------------------------------------------------------------------------
  */
 static int
-check_all_closed(hid_t fapl, hbool_t new_format, int stopat)
+check_all_closed(hid_t fapl, hbool_t new_format)
 {
     hid_t fid=-1;
     char filename[NAME_BUF_SIZE];
@@ -6743,7 +5300,7 @@ check_all_closed(hid_t fapl, hbool_t new_format, int stopat)
      * To check this, try to create every file used in this test.  If
      * a file is already open, creating it will fail.
      */
-    for(x=0; FILENAME[x] != NULL && x < stopat; x++)
+    for(x=0; FILENAME[x] != NULL; x++)
     {
         h5_fixname(FILENAME[x], fapl, filename, sizeof filename);
 
@@ -11668,8 +10225,6 @@ main(void)
                 my_fapl = fapl;
 
             /* General tests... (on both old & new format groups */
-
-
             nerrors += mklinks(my_fapl, new_format) < 0 ? 1 : 0;
             nerrors += cklinks(my_fapl, new_format) < 0 ? 1 : 0;
             nerrors += new_links(my_fapl, new_format) < 0 ? 1 : 0;
@@ -11708,26 +10263,6 @@ main(void)
             nerrors += external_link_endian(my_fapl, new_format) < 0 ? 1 : 0;
             nerrors += external_link_strong(my_fapl, new_format) < 0 ? 1 : 0;
 
-	    /* tests for external link */
-            nerrors += external_link_env(my_fapl, new_format) < 0 ? 1 : 0;
-            nerrors += external_link_prefix(my_fapl, new_format) < 0 ? 1 : 0;
-            nerrors += external_link_abs_mainpath(my_fapl, new_format) < 0 ? 1 : 0;
-            nerrors += external_link_rel_mainpath(my_fapl, new_format) < 0 ? 1 : 0;
-            nerrors += external_link_cwd(my_fapl, new_format) < 0 ? 1 : 0;
-            nerrors += external_link_abstar(my_fapl, new_format) < 0 ? 1 : 0;
-            nerrors += external_link_abstar_cur(my_fapl, new_format) < 0 ? 1 : 0;
-            nerrors += external_link_reltar(my_fapl, new_format) < 0 ? 1 : 0;
-            nerrors += external_link_chdir(my_fapl, new_format) < 0 ? 1 : 0;
-
-#ifdef H5_HAVE_WINDOW_PATH
-            nerrors += external_link_win1(my_fapl, new_format) < 0 ? 1 : 0;
-            nerrors += external_link_win2(my_fapl, new_format) < 0 ? 1 : 0;
-            nerrors += external_link_win3(my_fapl, new_format) < 0 ? 1 : 0;
-           // nerrors += external_link_win4(my_fapl, new_format) < 0 ? 1 : 0;
-           // nerrors += external_link_win5(my_fapl, new_format) < 0 ? 1 : 0;
-            nerrors += external_link_win6(my_fapl, new_format) < 0 ? 1 : 0;
-#endif
-
             /* These tests assume that external links are a form of UD links,
              * so assume that everything that passed for external links
              * above has already been tested for UD links.
@@ -11749,8 +10284,7 @@ main(void)
             nerrors += obj_visit_by_name(my_fapl, new_format) < 0 ? 1 : 0;
 
             /* Keep this test last, it's testing files that are used above */
-	    /* do not do this for files used by external link tests */
-            nerrors += check_all_closed(my_fapl, new_format, EXTSTOP) < 0 ? 1 : 0;
+            nerrors += check_all_closed(my_fapl, new_format) < 0 ? 1 : 0;
         } /* end for */
 
         /* New group revision feature tests */
@@ -11790,8 +10324,6 @@ main(void)
 	}
 	printf("All link tests passed.\n");
 	h5_cleanup(FILENAME, fapl);
-	/* clean up tmp directory created by external link tests */
-	HDrmdir(TMPDIR);
     }
     else
         puts("All link tests skipped - Incompatible with current Virtual File Driver");
diff --git a/test/objcopy.c b/test/objcopy.c
index 2196794..5fdbdba 100755
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -273,7 +273,7 @@ error:
         H5Sclose(sid_ref);
         H5Dclose(did1);
         H5Dclose(did2);
-        H5Aclose(aid);
+        H5Pclose(aid);
     } H5E_END_TRY;
 
     return(-1);
diff --git a/test/tattr.c b/test/tattr.c
index 12350c3..d448397 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -3303,10 +3303,6 @@ test_attr_deprec(hid_t fcpl, hid_t fapl)
     CHECK(dataset, FAIL, "H5Dopen2");
 
 
-    /* Get number of attributes with bad ID */
-    ret = H5Aget_num_attrs(-1);
-    VERIFY(ret, FAIL, "H5Aget_num_attrs");
-
     /* Get number of attributes */
     ret = H5Aget_num_attrs(dataset);
     VERIFY(ret, 1, "H5Aget_num_attrs");
diff --git a/test/tcoords.c b/test/tcoords.c
index 998a598..ab921d8 100644
--- a/test/tcoords.c
+++ b/test/tcoords.c
@@ -29,31 +29,21 @@
 
 #define FILENAME   "coord.h5"
 
-#define SINGLE_END_DSET	                "single_end_dset"
-#define MULTI_ENDS_SEL_HYPER_DSET	"multiple_ends_dset"
-
-#define NAME_LEN        128
-
-/* Data written to the dataset for single block test.  Global variable
- * for convenience. */
-int da_buffer[2][3][6][2];
-
 /***********************************************************
 **
-** test_singleEnd_selElements(): Test element selection of only 
+** test_single_end(): Test full hyperslab selection of only 
 ** one block.
 ** 
 *************************************************************/
-static void test_singleEnd_selElements(hid_t file, hbool_t is_chunked)
+static void test_single_end(hid_t file)
 {
     hid_t sid, plid, did, msid;
-    char dset_name[NAME_LEN];        /* Dataset name */
-    size_t elmts_numb;
     herr_t ret;                 /* Generic error return */
     int i, j, k;
     hsize_t da_dims[4] = { 2, 3, 6, 2 };
     hsize_t da_chunksize[4] = { 1, 3, 3, 2 };
-    
+    int da_buffer[2][3][6][2];
+
     /* For testing the full selection in the fastest-growing end */
     int mem1_buffer[1][1][6][2];
     hsize_t mem1_dims[4] = { 1, 1, 6, 2 };
@@ -83,24 +73,10 @@ static void test_singleEnd_selElements(hid_t file, hbool_t is_chunked)
     /* For testing the full selection in the middle dimensions */
     int mem3_buffer[1][3][6][1];
     hsize_t mem3_dims[4] = { 1, 3, 6, 1 };
-    hsize_t da_elmts3[18][4] = { {0, 0, 0, 0},
-                                 {0, 0, 1, 0},
-                                 {0, 0, 2, 0},
-                                 {0, 0, 3, 0},
-                                 {0, 0, 4, 0},
-                                 {0, 0, 5, 0},
-                                 {0, 1, 0, 0},
-                                 {0, 1, 1, 0},
-                                 {0, 1, 2, 0},
-                                 {0, 1, 3, 0},
-                                 {0, 1, 4, 0},
-                                 {0, 1, 5, 0},
-                                 {0, 2, 0, 0},
-                                 {0, 2, 1, 0},
-                                 {0, 2, 2, 0},
-                                 {0, 2, 3, 0},
-                                 {0, 2, 4, 0},
-                                 {0, 2, 5, 0} };
+    hsize_t mem3_start[4] = { 0, 0, 0, 0 };
+    hsize_t mem3_count[4] = { 1, 1, 1, 1 };
+    hsize_t mem3_stride[4] = { 1, 1, 1, 1 };
+    hsize_t mem3_block[4] = { 1, 3, 6, 1 };
 
     /* Create and write the dataset */
     sid = H5Screate_simple(4, da_dims, da_dims);
@@ -109,26 +85,17 @@ static void test_singleEnd_selElements(hid_t file, hbool_t is_chunked)
     plid = H5Pcreate(H5P_DATASET_CREATE);
     CHECK(plid, FAIL, "H5Pcreate");
 
-    if(is_chunked) {
-        ret = H5Pset_chunk(plid, 4, da_chunksize);
-        CHECK(ret, FAIL, "H5Pset_chunk");
-    }
-
-    /* Construct dataset's name */
-    memset(dset_name, 0, (size_t)NAME_LEN);
-    strcat(dset_name, SINGLE_END_DSET);
-    if(is_chunked)
-        strcat(dset_name, "_chunked");
+    ret = H5Pset_chunk(plid, 4, da_chunksize);
+    CHECK(ret, FAIL, "H5Pset_chunk");
 
-    did = H5Dcreate2(file, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, plid, H5P_DEFAULT);
+    did = H5Dcreate2(file, "single_end", H5T_NATIVE_INT, sid, H5P_DEFAULT, plid, H5P_DEFAULT);
     CHECK(did, FAIL, "H5Dcreate2");
 
-    /* Initialize the data to be written to file */
     for(i=0; i<2; i++) {
         for(j=0; j<3; j++) {
             for(k=0; k<6; k++) {
                 da_buffer[i][j][k][0] = i*100 + j*10 + k;
-                da_buffer[i][j][k][1] = i*100 + j*10 + k + 1;
+                da_buffer[i][j][k][0] = i*100 + j*10 + k + 1;
             }
         }
     }
@@ -142,16 +109,13 @@ static void test_singleEnd_selElements(hid_t file, hbool_t is_chunked)
   
     /* ****** Case 1: ******
      * Testing the full selection in the fastest-growing end */
-    did = H5Dopen2(file, dset_name, H5P_DEFAULT);
+    did = H5Dopen2(file, "single_end", H5P_DEFAULT);
     CHECK(did, FAIL, "H5Dopen");
 
     /* Select the elements in the dataset */
-    elmts_numb = 12;
-
-    ret = H5Sselect_elements(sid, H5S_SELECT_SET, elmts_numb, (const hsize_t *)da_elmts1);
+    ret = H5Sselect_elements(sid, H5S_SELECT_SET, 12, da_elmts1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
-    /* Dataspace for memory buffer */
     msid = H5Screate_simple(4, mem1_dims, mem1_dims);
     CHECK(msid, FAIL, "H5Screate_simple");
 
@@ -170,21 +134,18 @@ static void test_singleEnd_selElements(hid_t file, hbool_t is_chunked)
     for(i=0; i<6; i++)
         for(j=0; j<2; j++)
             if(da_buffer[0][0][i][j] != mem1_buffer[0][0][i][j]) {
-                TestErrPrintf("%u: Read different values than written at index 0,0,%d,%d\n", __LINE__, i, j);
+                TestErrPrintf("Read different values than written at index 0,0,%d,%d\n", i, j);
             }
 
     /* ****** Case 2: ******
      * Testing the full selection in the slowest-growing end */
-    did = H5Dopen2(file, dset_name, H5P_DEFAULT);
+    did = H5Dopen2(file, "single_end", H5P_DEFAULT);
     CHECK(did, FAIL, "H5Dopen");
 
     /* Select the elements in the dataset */
-    elmts_numb = 6;
-
-    ret = H5Sselect_elements(sid, H5S_SELECT_SET, elmts_numb, (const hsize_t *)da_elmts2);
+    ret = H5Sselect_elements(sid, H5S_SELECT_SET, 6, da_elmts2);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
-    /* Dataspace for memory buffer */
     msid = H5Screate_simple(4, mem2_dims, mem2_dims);
     CHECK(msid, FAIL, "H5Screate_simple");
 
@@ -203,21 +164,18 @@ static void test_singleEnd_selElements(hid_t file, hbool_t is_chunked)
     for(i=0; i<2; i++)
         for(j=0; j<3; j++)
             if(da_buffer[i][j][0][0] != mem2_buffer[i][j][0][0]) {
-                TestErrPrintf("%u: Read different values than written at index %d,%d,0,0, da_buffer = %d, mem2_buffer = %d\n", __LINE__, i, j, da_buffer[i][j][0][0], mem2_buffer[i][j][0][0]);
+                TestErrPrintf("Read different values than written at index %d,%d,0,0\n", i, j);
             }
 
     /* ****** Case 3: ******
      * Testing the full selection in the middle dimensions */
-    did = H5Dopen2(file, dset_name, H5P_DEFAULT);
+    did = H5Dopen2(file, "single_end", H5P_DEFAULT);
     CHECK(did, FAIL, "H5Dopen");
 
     /* Select the elements in the dataset */
-    elmts_numb = 18;
-
-    ret = H5Sselect_elements(sid, H5S_SELECT_SET, elmts_numb, (const hsize_t *)da_elmts3);
-    CHECK(ret, FAIL, "H5Sselect_elements");
+    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, mem3_start, mem3_stride, mem3_count, mem3_block);
+    CHECK(ret, FAIL, "H5Sselect_hyperslab");
 
-    /* Dataspace for memory buffer */
     msid = H5Screate_simple(4, mem3_dims, mem3_dims);
     CHECK(msid, FAIL, "H5Screate_simple");
 
@@ -236,7 +194,7 @@ static void test_singleEnd_selElements(hid_t file, hbool_t is_chunked)
     for(i=0; i<3; i++)
         for(j=0; j<6; j++)
             if(da_buffer[0][i][j][0] != mem3_buffer[0][i][j][0]) {
-                TestErrPrintf("%u: Read different values than written at index 0,%d,%d,0\n", __LINE__, i, j);
+                TestErrPrintf("Read different values than written at index 0,%d,%d,0\n", i, j);
             }
 
 
@@ -247,153 +205,6 @@ static void test_singleEnd_selElements(hid_t file, hbool_t is_chunked)
     CHECK(ret, FAIL, "H5Pclose");
 }
 
-/***********************************************************
-**
-** test_singleEnd_selHyperslab(): Test full hyperslab selection
-** of only one block.
-** 
-*************************************************************/
-static void test_singleEnd_selHyperslab(hid_t file, hbool_t is_chunked)
-{
-    hid_t sid, did, msid;
-    char dset_name[NAME_LEN];        /* Dataset name */
-    herr_t ret;                 /* Generic error return */
-    int i, j;
-    hsize_t da_dims[4] = { 2, 3, 6, 2 };
-
-    /* For testing the full selection in the fastest-growing end */
-    int mem1_buffer[1][1][6][2];
-    hsize_t mem1_dims[4] = { 1, 1, 6, 2 };
-    hsize_t mem1_start[4] = { 0, 0, 0, 0 };
-    hsize_t mem1_count[4] = { 1, 1, 1, 1 };
-    hsize_t mem1_stride[4] = { 1, 1, 1, 1 };
-    hsize_t mem1_block[4] = { 1, 1, 6, 2 };
-
-    /* For testing the full selection in the slowest-growing end */
-    int mem2_buffer[2][3][1][1];
-    hsize_t mem2_dims[4] = { 2, 3, 1, 1 };
-    hsize_t mem2_start[4] = { 0, 0, 0, 0 };
-    hsize_t mem2_count[4] = { 1, 1, 1, 1 };
-    hsize_t mem2_stride[4] = { 1, 1, 1, 1 };
-    hsize_t mem2_block[4] = { 2, 3, 1, 1 };
-
-    /* For testing the full selection in the middle dimensions */
-    int mem3_buffer[1][3][6][1];
-    hsize_t mem3_dims[4] = { 1, 3, 6, 1 };
-    hsize_t mem3_start[4] = { 0, 0, 0, 0 };
-    hsize_t mem3_count[4] = { 1, 1, 1, 1 };
-    hsize_t mem3_stride[4] = { 1, 1, 1, 1 };
-    hsize_t mem3_block[4] = { 1, 3, 6, 1 };
-
-    /* Construct dataset's name */
-    memset(dset_name, 0, NAME_LEN);
-    strcat(dset_name, SINGLE_END_DSET);
-    if(is_chunked)
-        strcat(dset_name, "_chunked");
-
-    /* Dataspace for the dataset in file */
-    sid = H5Screate_simple(4, da_dims, da_dims);
-    CHECK(sid, FAIL, "H5Screate_simple");
-
-    /* ****** Case 1: ******
-     * Testing the full selection in the fastest-growing end */
-    did = H5Dopen2(file, dset_name, H5P_DEFAULT);
-    CHECK(did, FAIL, "H5Dopen");
-
-    /* Select the elements in the dataset */
-    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, mem1_start, mem1_stride, mem1_count, mem1_block);
-    CHECK(ret, FAIL, "H5Sselect_hyperslab");
-
-    /* Dataspace for memory buffer */
-    msid = H5Screate_simple(4, mem1_dims, mem1_dims);
-    CHECK(msid, FAIL, "H5Screate_simple");
-
-    ret = H5Sselect_all(msid);
-    CHECK(ret, FAIL, "H5Sselect_all");
-
-    ret = H5Dread(did, H5T_NATIVE_INT, msid, sid, H5P_DEFAULT, mem1_buffer);
-    CHECK(ret, FAIL, "H5Dread");
-
-    ret = H5Dclose(did);
-    CHECK(ret, FAIL, "H5Dclose");
-
-    ret = H5Sclose(msid);
-    CHECK(ret, FAIL, "H5Sclose");
-
-    for(i=0; i<6; i++)
-        for(j=0; j<2; j++)
-            if(da_buffer[0][0][i][j] != mem1_buffer[0][0][i][j]) {
-                TestErrPrintf("%u: Read different values than written at index 0,0,%d,%d\n", __LINE__, i, j);
-            }
-
-    /* ****** Case 2: ******
-     * Testing the full selection in the slowest-growing end */
-    did = H5Dopen2(file, dset_name, H5P_DEFAULT);
-    CHECK(did, FAIL, "H5Dopen");
-
-    /* Select the elements in the dataset */
-    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, mem2_start, mem2_stride, mem2_count, mem2_block);
-    CHECK(ret, FAIL, "H5Sselect_hyperslab");
-
-    /* Dataspace for memory buffer */
-    msid = H5Screate_simple(4, mem2_dims, mem2_dims);
-    CHECK(msid, FAIL, "H5Screate_simple");
-
-    ret = H5Sselect_all(msid);
-    CHECK(ret, FAIL, "H5Sselect_all");
-
-    ret = H5Dread(did, H5T_NATIVE_INT, msid, sid, H5P_DEFAULT, mem2_buffer);
-    CHECK(ret, FAIL, "H5Dread");
-
-    ret = H5Dclose(did);
-    CHECK(ret, FAIL, "H5Dclose");
-
-    ret = H5Sclose(msid);
-    CHECK(ret, FAIL, "H5Sclose");
-
-    for(i=0; i<2; i++)
-        for(j=0; j<3; j++)
-            if(da_buffer[i][j][0][0] != mem2_buffer[i][j][0][0]) {
-                TestErrPrintf("%u: Read different values than written at index %d,%d,0,0\n", __LINE__, i, j);
-            }
-
-    /* ****** Case 3: ******
-     * Testing the full selection in the middle dimensions */
-    did = H5Dopen2(file, dset_name, H5P_DEFAULT);
-    CHECK(did, FAIL, "H5Dopen");
-
-    /* Select the elements in the dataset */
-    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, mem3_start, mem3_stride, mem3_count, mem3_block);
-    CHECK(ret, FAIL, "H5Sselect_hyperslab");
-
-    /* Dataspace for memory buffer */
-    msid = H5Screate_simple(4, mem3_dims, mem3_dims);
-    CHECK(msid, FAIL, "H5Screate_simple");
-
-    ret = H5Sselect_all(msid);
-    CHECK(ret, FAIL, "H5Sselect_all");
-
-    ret = H5Dread(did, H5T_NATIVE_INT, msid, sid, H5P_DEFAULT, mem3_buffer);
-    CHECK(ret, FAIL, "H5Dread");
-
-    ret = H5Dclose(did);
-    CHECK(ret, FAIL, "H5Dclose");
-
-    ret = H5Sclose(msid);
-    CHECK(ret, FAIL, "H5Sclose");
-
-    for(i=0; i<3; i++)
-        for(j=0; j<6; j++)
-            if(da_buffer[0][i][j][0] != mem3_buffer[0][i][j][0]) {
-                TestErrPrintf("%u: Read different values than written at index 0,%d,%d,0\n", __LINE__, i, j);
-            }
-
-
-    ret = H5Sclose(sid);
-    CHECK(ret, FAIL, "H5Sclose");
-}
-
-
 
 /***********************************************************
 **
@@ -401,15 +212,14 @@ static void test_singleEnd_selHyperslab(hid_t file, hbool_t is_chunked)
 ** multiple blocks.
 ** 
 *************************************************************/
-static void test_multiple_ends(hid_t file, hbool_t is_chunked)
+static void test_multiple_ends(hid_t file)
 {
     hid_t sid, plid, did, msid;
-    char dset_name[NAME_LEN];        /* Dataset name */
     herr_t ret;                 /* Generic error return */
     int i, j, k, l, m, n, p;
     hsize_t da_dims[8] = { 4, 5, 3, 4, 2, 3, 6, 2 };
     hsize_t da_chunksize[8] = { 1, 5, 3, 2, 2, 3, 3, 2 };
-    int data_buf[4][5][3][4][2][3][6][2];
+    int da_buffer[4][5][3][4][2][3][6][2];
 
     /* For testing the full selections in the fastest-growing end and in the middle dimensions */
     int mem1_buffer[1][1][1][4][2][1][6][2];
@@ -459,18 +269,10 @@ static void test_multiple_ends(hid_t file, hbool_t is_chunked)
     plid = H5Pcreate(H5P_DATASET_CREATE);
     CHECK(plid, FAIL, "H5Pcreate");
 
-    if(is_chunked) {
-        ret = H5Pset_chunk(plid, 8, da_chunksize);
-        CHECK(ret, FAIL, "H5Pset_chunk");
-    }
+    ret = H5Pset_chunk(plid, 8, da_chunksize);
+    CHECK(ret, FAIL, "H5Pset_chunk");
 
-    /* Construct dataset's name */
-    memset(dset_name, 0, NAME_LEN);
-    strcat(dset_name, MULTI_ENDS_SEL_HYPER_DSET);
-    if(is_chunked)
-        strcat(dset_name, "_chunked");
-
-    did = H5Dcreate2(file, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, plid, H5P_DEFAULT);
+    did = H5Dcreate2(file, "multiple_ends", H5T_NATIVE_INT, sid, H5P_DEFAULT, plid, H5P_DEFAULT);
     CHECK(did, FAIL, "H5Dcreate2");
 
     for(i=0; i<4; i++)
@@ -480,11 +282,11 @@ static void test_multiple_ends(hid_t file, hbool_t is_chunked)
                     for(m=0; m<2; m++)
                         for(n=0; n<3; n++)
                             for(p=0; p<6; p++) {                
-                                data_buf[i][j][k][l][m][n][p][0] = i*1000000 + j*100000 + k*10000 + l*1000 + m*100 + n*10 + p;
-                                data_buf[i][j][k][l][m][n][p][1] = i*1000000 + j*100000 + k*10000 + l*1000 + m*100 + n*10 + p + 1;
+                                da_buffer[i][j][k][l][m][n][p][0] = i*1000000 + j*100000 + k*10000 + l*1000 + m*100 + n*10 + p;
+                                da_buffer[i][j][k][l][m][n][p][1] = i*1000000 + j*100000 + k*10000 + l*1000 + m*100 + n*10 + p + 1;
                             }
 
-    ret = H5Dwrite(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data_buf);
+    ret = H5Dwrite(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, da_buffer);
     CHECK(ret, FAIL, "H5Dwrite");
 
     ret = H5Dclose(did);
@@ -492,7 +294,7 @@ static void test_multiple_ends(hid_t file, hbool_t is_chunked)
 
     /* ****** Case 1: ******
      * Testing the full selections in the fastest-growing end and in the middle dimensions*/
-    did = H5Dopen2(file, dset_name, H5P_DEFAULT);
+    did = H5Dopen2(file, "multiple_ends", H5P_DEFAULT);
     CHECK(did, FAIL, "H5Dopen");
 
     /* Select the elements in the dataset */
@@ -518,13 +320,13 @@ static void test_multiple_ends(hid_t file, hbool_t is_chunked)
         for(j=0; j<2; j++)
             for(k=0; k<6; k++)
                 for(l=0; l<2; l++)
-                    if(data_buf[0][0][0][i][j][0][k][l] != mem1_buffer[0][0][0][i][j][0][k][l]) {
-                        TestErrPrintf("%u: Read different values than written at index 0,0,0,%d,%d,0,%d,%d\n", __LINE__, i, j, k, l);
+                    if(da_buffer[0][0][0][i][j][0][k][l] != mem1_buffer[0][0][0][i][j][0][k][l]) {
+                        TestErrPrintf("Read different values than written at index 0,0,0,%d,%d,0,%d,%d\n", i, j, k, l);
                     }
 
     /* ****** Case 2: ******
      * Testing the full selections in the slowest-growing end and in the middle dimensions*/
-    did = H5Dopen2(file, dset_name, H5P_DEFAULT);
+    did = H5Dopen2(file, "multiple_ends", H5P_DEFAULT);
     CHECK(did, FAIL, "H5Dopen");
 
     /* Select the elements in the dataset */
@@ -550,13 +352,13 @@ static void test_multiple_ends(hid_t file, hbool_t is_chunked)
         for(j=0; j<5; j++)
             for(k=0; k<4; k++)
                 for(l=0; l<2; l++)
-                    if(data_buf[i][j][0][k][l][0][0][0] != mem2_buffer[i][j][0][k][l][0][0][0]) {
-                        TestErrPrintf("%u: Read different values than written at index %d,%d,0,%d,%d,0,0,0\n", __LINE__, i, j, k, l);
+                    if(da_buffer[i][j][0][k][l][0][0][0] != mem2_buffer[i][j][0][k][l][0][0][0]) {
+                        TestErrPrintf("Read different values than written at index %d,%d,0,%d,%d,0,0,0\n", i, j, k, l);
                     }
 
     /* ****** Case 3: ******
      * Testing two unadjacent full selections in the middle dimensions */
-    did = H5Dopen2(file, dset_name, H5P_DEFAULT);
+    did = H5Dopen2(file, "multiple_ends", H5P_DEFAULT);
     CHECK(did, FAIL, "H5Dopen");
 
     /* Select the elements in the dataset */
@@ -582,13 +384,13 @@ static void test_multiple_ends(hid_t file, hbool_t is_chunked)
         for(j=0; j<3; j++)
             for(k=0; k<3; k++)
                 for(l=0; l<6; l++)
-                    if(data_buf[0][i][j][0][0][k][l][0] != mem3_buffer[0][i][j][0][0][k][l][0]) {
-                        TestErrPrintf("%u: Read different values than written at index 0,%d,%d,0,0,%d,%d,0\n", __LINE__, i, j, k, l);
+                    if(da_buffer[0][i][j][0][0][k][l][0] != mem3_buffer[0][i][j][0][0][k][l][0]) {
+                        TestErrPrintf("Read different values than written at index 0,%d,%d,0,0,%d,%d,0\n", i, j, k, l);
                     }
 
     /* ****** Case 4: ******
      * Testing the full selections in the fastest-growing end and the slowest-growing end */
-    did = H5Dopen2(file, dset_name, H5P_DEFAULT);
+    did = H5Dopen2(file, "multiple_ends", H5P_DEFAULT);
     CHECK(did, FAIL, "H5Dopen");
 
     /* Select the elements in the dataset */
@@ -614,15 +416,15 @@ static void test_multiple_ends(hid_t file, hbool_t is_chunked)
         for(j=0; j<5; j++)
             for(k=0; k<6; k++)
                 for(l=0; l<2; l++)
-                    if(data_buf[i][j][0][0][0][0][k][l] != mem4_buffer[i][j][0][0][0][0][k][l]) {
-                        TestErrPrintf("%u: Read different values than written at index %d,%d,0,0,0,0,%d,%d\n", __LINE__, i, j, k, l);
+                    if(da_buffer[i][j][0][0][0][0][k][l] != mem4_buffer[i][j][0][0][0][0][k][l]) {
+                        TestErrPrintf("Read different values than written at index %d,%d,0,0,0,0,%d,%d\n", i, j, k, l);
                     }
 
 
     /* ****** Case 5: ******
      * Testing the full selections in the fastest-growing end and the slowest-growing end, 
      * and also in the middle dimensions */
-    did = H5Dopen2(file, dset_name, H5P_DEFAULT);
+    did = H5Dopen2(file, "multiple_ends", H5P_DEFAULT);
     CHECK(did, FAIL, "H5Dopen");
 
     /* Select the elements in the dataset */
@@ -650,8 +452,8 @@ static void test_multiple_ends(hid_t file, hbool_t is_chunked)
                 for(l=0; l<2; l++)
                     for(m=0; m<6; m++)
                         for(n=0; n<2; n++)
-                            if(data_buf[i][j][0][k][l][0][m][n] != mem5_buffer[i][j][0][k][l][0][m][n]) {
-                                TestErrPrintf("%u: Read different values than written at index %d,%d,0,%d,%d,0,%d,%d\n", __LINE__, i, j, k, l, m, n);
+                            if(da_buffer[i][j][0][k][l][0][m][n] != mem5_buffer[i][j][0][k][l][0][m][n]) {
+                                TestErrPrintf("Read different values than written at index %d,%d,0,%d,%d,0,%d,%d\n", i, j, k, l, m, n);
                             }
 
 
@@ -670,24 +472,14 @@ static void test_multiple_ends(hid_t file, hbool_t is_chunked)
 ****************************************************************/
 void test_coords(void)
 {
-    hid_t   fid;
-    int     i;
-    hbool_t is_chunk;
-    herr_t  ret;                 /* Generic error return */
+    hid_t fid;
+    herr_t ret;                 /* Generic error return */
 
     fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(fid, FAIL, "H5Fcreate");
 
-    for(i=0, is_chunk=FALSE; i<2; i++, is_chunk++) {
-        /* Test H5Sselect_elements with selection of one block of data */
-        test_singleEnd_selElements(fid, is_chunk);
-
-        /* Test H5Sselect_hyperslab with selection of one block of data */
-        test_singleEnd_selHyperslab(fid, is_chunk);
-
-        /* Test H5Sselect_hyperslab with selection of multiple blocks of data */
-        test_multiple_ends(fid, is_chunk);
-    }
+    test_single_end(fid);
+    test_multiple_ends(fid);
 
     ret = H5Fclose(fid);
     CHECK(ret, FAIL, "H5Fclose");
diff --git a/test/th5s.c b/test/th5s.c
index 5bf7845..983838e 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -378,7 +378,7 @@ test_h5s_null(void)
         hsize_t	coord[1][1]; /* Coordinates for point selection */
 
         coord[0][0]=0;
-	ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, (const hsize_t *)coord);
+	ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, coord);
     } H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Sselect_elements");
 
@@ -1055,8 +1055,8 @@ test_h5s_chunk(void)
     for(i=0; i<50000; i++) {
         for(j=0; j<3; j++) {
             /* Check if the two values are within 0.001% range. */
-            if(!DBL_REL_EQUAL(chunk_data_dbl[i][j], chunk_data_flt[i][j], 0.00001))
-                TestErrPrintf("%u: chunk_data_dbl[%d][%d]=%e, chunk_data_flt[%d][%d]=%e\n", (unsigned)__LINE__, i, j, chunk_data_dbl[i][j], i, j, chunk_data_flt[i][j]);
+            if(!DBL_REL_EQUAL(chunk_data_dbl[i][j],chunk_data_flt[i][j], 0.00001))
+                TestErrPrintf("chunk_data_dbl[%d][%d]=%f, chunk_data_flt[%d][%d]=%f\n",i,j,chunk_data_dbl[i][j],i,j,chunk_data_flt[i][j]);
         } /* end for */
     } /* end for */
 } /* test_h5s_chunk() */
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index 2fd6fa6..735dc0f 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -254,6 +254,7 @@ int test_basic(const char *fname1,
     */
     {
 
+#if 1
         float data15[6];
         float data16[6];
 
@@ -273,9 +274,48 @@ int test_basic(const char *fname1,
 
         write_dset(gid1,1,dims1,"fp15",H5T_NATIVE_FLOAT,data15);
         write_dset(gid1,1,dims1,"fp16",H5T_NATIVE_FLOAT,data16);
+#else
+
+#define NU_ELMTS 1000000
+
+        hsize_t i;
+
+        hsize_t dims2[1] = { NU_ELMTS };
+
+        float *data15 = malloc (NU_ELMTS * sizeof(float) );
+        float *data16 = malloc (NU_ELMTS * sizeof(float) );
+
+        data15[0] = (float) sqrt( (double)-1 );
+        data15[1] = 1;
+        data15[2] = (float) sqrt( (double)-1 );
+        data15[3] = 1;
+        data15[4] = 1;
+        data15[5] = 1;
+
+        data16[0] = (float) sqrt( (double)-1 );
+        data16[1] = (float) sqrt( (double)-1 );
+        data16[2] = 1;
+        data16[3] = 1;
+        data16[4] = 1;
+        data16[5] = 1;
+
+        for ( i = 6; i < NU_ELMTS; i++ )
+        {
+            data15[i] = /*data15[0];*/ 2;
+            data16[i] = 1;
+        }
+
+        write_dset(gid1,1,dims2,"fp15",H5T_NATIVE_FLOAT,data15);
+        write_dset(gid1,1,dims2,"fp16",H5T_NATIVE_FLOAT,data16);
+
+        free( data15 );
+        free( data16 );
+#endif
 
     }
+
        
+        
    /*-------------------------------------------------------------------------
     * NaNs in H5T_NATIVE_DOUBLE
     *-------------------------------------------------------------------------
@@ -303,7 +343,9 @@ int test_basic(const char *fname1,
         write_dset(gid1,1,dims1,"fp18",H5T_NATIVE_DOUBLE,data18);
 
     }
- 
+        
+
+  
     
    /*-------------------------------------------------------------------------
     * close
@@ -402,7 +444,7 @@ int test_types(const char *fname)
     */
     H5Lcreate_external("filename", "objname", fid1, "ext_link", H5P_DEFAULT, H5P_DEFAULT);
     H5Lregister(UD_link_class);
-    H5Lcreate_ud(fid1, "ud_link", MY_LINKCLASS, NULL, (size_t)0, H5P_DEFAULT, H5P_DEFAULT);
+    H5Lcreate_ud(fid1, "ud_link", MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
     * Close
@@ -730,13 +772,13 @@ int test_datasets(const char *file,
 
     write_dset_in(gid,"/dset",fid,make_diffs);
 
-    /* close */
+    /* Close */
     status = H5Dclose(did);
     assert(status >= 0);
     status = H5Gclose(gid);
     assert(status >= 0);
 
-    /* close file */
+    /* Close file */
     status = H5Fclose(fid);
     assert(status >= 0);
     return status;
@@ -772,13 +814,12 @@ void write_attr_in(hid_t loc_id,
  hid_t   sid;
  hid_t   tid;
  herr_t  status;
- int     val, i, j, k, l, n;
+ int     val, i, j, k, n;
  float   f;
 
  /* create 1D attributes with dimension [2], 2 elements */
  hsize_t    dims[1]={2};
- char       buf1[2][STR_SIZE]= {"ab","de"};        /* string */
- char       *buf1a[2];                             /* VL string */
+ char       buf1[2][2]= {"ab","de"};        /* string */
  char       buf2[2]= {1,2};                 /* bitfield, opaque */
  s_t        buf3[2]= {{1,2},{3,4}};         /* compound */
  hobj_ref_t buf4[2];                        /* reference */
@@ -791,8 +832,7 @@ void write_attr_in(hid_t loc_id,
 
  /* create 2D attributes with dimension [3][2], 6 elements */
  hsize_t    dims2[2]={3,2};
- char       buf12[3][2][STR_SIZE]= {{"ab","cd"},{"ef","gh"},{"ij","kl"}};     /* string */
- char       *buf12a[3][2];                                               /* VL string */
+ char       buf12[6][2]= {"ab","cd","ef","gh","ij","kl"};         /* string */
  char       buf22[3][2]= {{1,2},{3,4},{5,6}};                     /* bitfield, opaque */
  s_t        buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};   /* compound */
  hobj_ref_t buf42[3][2];                                          /* reference */
@@ -804,11 +844,9 @@ void write_attr_in(hid_t loc_id,
 
  /* create 3D attributes with dimension [4][3][2], 24 elements */
  hsize_t    dims3[3]={4,3,2};
- char       buf13[4][3][2][STR_SIZE]= {{{"ab","cd"},{"ef","gh"},{"ij","kl"}},
-                {{"mn","pq"},{"rs","tu"},{"vw","xz"}},
-                {{"AB","CD"},{"EF","GH"},{"IJ","KL"}},
-                {{"MN","PQ"},{"RS","TU"},{"VW","XZ"}}};  /* string */
- char       *buf13a[4][3][2];   /* VL string */
+ char       buf13[24][2]= {"ab","cd","ef","gh","ij","kl","mn","pq",
+ "rs","tu","vw","xz","AB","CD","EF","GH",
+ "IJ","KL","MN","PQ","RS","TU","VW","XZ"};  /* string */
  char       buf23[4][3][2];    /* bitfield, opaque */
  s_t        buf33[4][3][2];    /* compound */
  hobj_ref_t buf43[4][3][2];    /* reference */
@@ -833,7 +871,9 @@ void write_attr_in(hid_t loc_id,
  {
   for (i=0; i<2; i++)
    for (j=0; j<2; j++)
+   {
     buf1[i][j]='z';
+   }
  }
  /*
  buf1[2][2]= {"ab","de"};
@@ -848,17 +888,10 @@ void write_attr_in(hid_t loc_id,
 [ 1 ]          e                z
  */
  tid = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(tid, (size_t)STR_SIZE);
+ status  = H5Tset_size(tid, 2);
  write_attr(loc_id,1,dims,"string",tid,buf1);
  status = H5Tclose(tid);
 
- for (i=0; i<2; i++)
-  buf1a[i]=buf1[i];
- tid = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(tid, H5T_VARIABLE);
- write_attr(loc_id,1,dims,"VLstring",tid,buf1a);
- status = H5Tclose(tid);
-
 /*-------------------------------------------------------------------------
  * H5T_BITFIELD
  *-------------------------------------------------------------------------
@@ -902,7 +935,7 @@ void write_attr_in(hid_t loc_id,
 [ 1 ]          2               0               2
 */
 
- tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+ tid = H5Tcreate(H5T_OPAQUE, 1);
  status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
  write_attr(loc_id,1,dims,"opaque",tid,buf2);
  status = H5Tclose(tid);
@@ -1093,10 +1126,7 @@ position        array of </g1>  array of </g1>  difference
  */
  if (make_diffs)
  {
-  for (i=0; i<3; i++)
-   for (j=0; j<2; j++)
-    for (k=0; k<2; k++)
-     buf12[i][j][k]='z';
+  memset(buf12, 'z', sizeof buf12);
  }
 
  /*
@@ -1120,18 +1150,10 @@ position        array of </g1>  array of </g1>  difference
  */
 
  tid = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(tid, (size_t)STR_SIZE);
+ status  = H5Tset_size(tid, 2);
  write_attr(loc_id,2,dims2,"string2D",tid,buf12);
  status = H5Tclose(tid);
 
- for (i=0; i<3; i++)
-  for (j=0; j<2; j++)
-   buf12a[i][j]=buf12[i][j];
- tid = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(tid, H5T_VARIABLE);
- write_attr(loc_id,2,dims2,"VLstring2D",tid,buf12a);
- status = H5Tclose(tid);
-
 /*-------------------------------------------------------------------------
  * H5T_BITFIELD
  *-------------------------------------------------------------------------
@@ -1179,7 +1201,7 @@ position        array of </g1>  array of </g1>  difference
 [ 2 0 ]          5               0               5
 [ 2 1 ]          6               0               6
  */
- tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+ tid = H5Tcreate(H5T_OPAQUE, 1);
  status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
  write_attr(loc_id,2,dims2,"opaque2D",tid,buf22);
  status = H5Tclose(tid);
@@ -1266,6 +1288,7 @@ position        enum2D of </g1> enum2D of </g1> difference
  n=0;
  for (i = 0; i < 3; i++) {
   for (j = 0; j < 2; j++) {
+    int l;
     buf52[i][j].p = malloc((i + 1) * sizeof(int));
     buf52[i][j].len = i + 1;
     for (l = 0; l < i + 1; l++)
@@ -1388,11 +1411,7 @@ position        float2D of </g1> float2D of </g1> difference
 
  if (make_diffs)
  {
-  for (i=0; i<4; i++)
-   for (j=0; j<3; j++)
-    for (k=0; k<2; k++)
-     for (l=0; l<2; l++)
-      buf13[i][j][k][l]='z';
+  memset(buf13,'z',sizeof buf13);
  }
 
  /*
@@ -1453,19 +1472,10 @@ position        string3D of </g1> string3D of </g1> difference
  */
 
  tid = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(tid, (size_t)STR_SIZE);
+ status  = H5Tset_size(tid, 2);
  write_attr(loc_id,3,dims3,"string3D",tid,buf13);
  status = H5Tclose(tid);
 
- for (i=0; i<4; i++)
-  for (j=0; j<3; j++)
-   for (k=0; k<2; k++)
-    buf13a[i][j][k]=buf13[i][j][k];
- tid = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(tid, H5T_VARIABLE);
- write_attr(loc_id,3,dims3,"VLstring3D",tid,buf13a);
- status = H5Tclose(tid);
-
 /*-------------------------------------------------------------------------
  * H5T_BITFIELD
  *-------------------------------------------------------------------------
@@ -1518,7 +1528,7 @@ position        bitfield3D of </g1> bitfield3D of </g1> difference
  * H5T_OPAQUE
  *-------------------------------------------------------------------------
  */
- tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+ tid = H5Tcreate(H5T_OPAQUE, 1);
  status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
  write_attr(loc_id,3,dims3,"opaque3D",tid,buf23);
  status = H5Tclose(tid);
@@ -1676,6 +1686,7 @@ position        enum3D of </g1> enum3D of </g1> difference
  for (i = 0; i < 4; i++) {
   for (j = 0; j < 3; j++) {
    for (k = 0; k < 2; k++) {
+    int l;
     buf53[i][j][k].p = malloc((i + 1) * sizeof(int));
     buf53[i][j][k].len = i + 1;
     for (l = 0; l < i + 1; l++)
@@ -1810,14 +1821,13 @@ void write_dset_in(hid_t loc_id,
  hid_t   tid;
  hid_t   dcpl;
  herr_t  status;
- int     val, i, j, k, l, n;
+ int     val, i, j, k, n;
  float   f;
  int     fillvalue=2;
 
  /* create 1D attributes with dimension [2], 2 elements */
  hsize_t    dims[1]={2};
  char       buf1[2][STR_SIZE]= {"ab","de"}; /* string */
- char       *buf1a[2];                      /* VL string */
  char       buf2[2]= {1,2};                 /* bitfield, opaque */
  s_t        buf3[2]= {{1,2},{3,4}};         /* compound */
  hobj_ref_t buf4[2];                        /* reference */
@@ -1830,8 +1840,7 @@ void write_dset_in(hid_t loc_id,
 
  /* create 2D attributes with dimension [3][2], 6 elements */
  hsize_t    dims2[2]={3,2};
- char       buf12[3][2][STR_SIZE]= {{"ab","cd"},{"ef","gh"},{"ij","kl"}};     /* string */
- char       *buf12a[3][2];                                        /* VL string */
+ char       buf12[6][STR_SIZE]= {"ab","cd","ef","gh","ij","kl"};  /* string */
  char       buf22[3][2]= {{1,2},{3,4},{5,6}};                     /* bitfield, opaque */
  s_t        buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};   /* compound */
  hobj_ref_t buf42[3][2];                                          /* reference */
@@ -1842,11 +1851,9 @@ void write_dset_in(hid_t loc_id,
 
  /* create 3D attributes with dimension [4][3][2], 24 elements */
  hsize_t    dims3[3]={4,3,2};
- char       buf13[4][3][2][STR_SIZE]= {{{"ab","cd"},{"ef","gh"},{"ij","kl"}},
-                {{"mn","pq"},{"rs","tu"},{"vw","xz"}},
-                {{"AB","CD"},{"EF","GH"},{"IJ","KL"}},
-                {{"MN","PQ"},{"RS","TU"},{"VW","XZ"}}};  /* string */
- char       *buf13a[4][3][2];  /* VL string */
+ char       buf13[24][STR_SIZE]= {"ab","cd","ef","gh","ij","kl","mn","pq",
+ "rs","tu","vw","xz","AB","CD","EF","GH",
+ "IJ","KL","MN","PQ","RS","TU","VW","XZ"};  /* string */
  char       buf23[4][3][2];    /* bitfield, opaque */
  s_t        buf33[4][3][2];    /* compound */
  hobj_ref_t buf43[4][3][2];    /* reference */
@@ -1871,22 +1878,17 @@ void write_dset_in(hid_t loc_id,
  {
   for (i=0; i<2; i++)
    for (j=0; j<2; j++)
+   {
     buf1[i][j]='z';
+   }
  }
 
 
  tid = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(tid,(size_t)STR_SIZE);
+ status  = H5Tset_size(tid,STR_SIZE);
  write_dset(loc_id,1,dims,"string",tid,buf1);
  status = H5Tclose(tid);
 
- for (i=0; i<2; i++)
-  buf1a[i]=buf1[i];
- tid = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(tid, H5T_VARIABLE);
- write_dset(loc_id,1,dims,"VLstring",tid,buf1a);
- status = H5Tclose(tid);
-
 /*-------------------------------------------------------------------------
  * H5T_BITFIELD
  *-------------------------------------------------------------------------
@@ -1915,7 +1917,7 @@ void write_dset_in(hid_t loc_id,
   }
  }
 
- tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+ tid = H5Tcreate(H5T_OPAQUE, 1);
  status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
  write_dset(loc_id,1,dims,"opaque",tid,buf2);
  status = H5Tclose(tid);
@@ -2049,26 +2051,15 @@ void write_dset_in(hid_t loc_id,
 
  if (make_diffs)
  {
-  for (i=0; i<3; i++)
-   for (j=0; j<2; j++)
-    for (k=0; k<2; k++)
-     buf12[i][j][k]='z';
+  memset(buf12, 'z', sizeof buf12);
  }
 
 
  tid = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(tid,(size_t)STR_SIZE);
+ status  = H5Tset_size(tid,STR_SIZE);
  write_dset(loc_id,2,dims2,"string2D",tid,buf12);
  status = H5Tclose(tid);
 
- for (i=0; i<3; i++)
-  for (j=0; j<2; j++)
-   buf12a[i][j]=buf12[i][j];
- tid = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(tid, H5T_VARIABLE);
- write_dset(loc_id,2,dims2,"VLstring2D",tid,buf12a);
- status = H5Tclose(tid);
-
 /*-------------------------------------------------------------------------
  * H5T_BITFIELD
  *-------------------------------------------------------------------------
@@ -2088,7 +2079,7 @@ void write_dset_in(hid_t loc_id,
  * H5T_OPAQUE
  *-------------------------------------------------------------------------
  */
- tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+ tid = H5Tcreate(H5T_OPAQUE, 1);
  status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
  write_dset(loc_id,2,dims2,"opaque2D",tid,buf22);
  status = H5Tclose(tid);
@@ -2144,6 +2135,8 @@ void write_dset_in(hid_t loc_id,
  n = 0;
  for(i = 0; i < 3; i++)
   for(j = 0; j < 2; j++) {
+    int l;
+
     buf52[i][j].p = malloc((i + 1) * sizeof(int));
     buf52[i][j].len = i + 1;
     for(l = 0; l < i + 1; l++)
@@ -2220,27 +2213,14 @@ void write_dset_in(hid_t loc_id,
 
  if (make_diffs)
  {
-  for (i=0; i<4; i++)
-   for (j=0; j<3; j++)
-    for (k=0; k<2; k++)
-     for (l=0; l<2; l++)
-      buf13[i][j][k][l]='z';
+  memset(buf13,'z',sizeof buf13);
  }
 
  tid = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(tid,(size_t)STR_SIZE);
+ status  = H5Tset_size(tid,STR_SIZE);
  write_dset(loc_id,3,dims3,"string3D",tid,buf13);
  status = H5Tclose(tid);
 
- for (i=0; i<4; i++)
-  for (j=0; j<3; j++)
-   for (k=0; k<2; k++)
-    buf13a[i][j][k]=buf13[i][j][k];
- tid = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(tid, H5T_VARIABLE);
- write_dset(loc_id,3,dims3,"VLstring3D",tid,buf13a);
- status = H5Tclose(tid);
-
 /*-------------------------------------------------------------------------
  * H5T_BITFIELD
  *-------------------------------------------------------------------------
@@ -2266,7 +2246,7 @@ void write_dset_in(hid_t loc_id,
  * H5T_OPAQUE
  *-------------------------------------------------------------------------
  */
- tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+ tid = H5Tcreate(H5T_OPAQUE, 1);
  status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
  write_dset(loc_id,3,dims3,"opaque3D",tid,buf23);
  status = H5Tclose(tid);
@@ -2336,6 +2316,8 @@ void write_dset_in(hid_t loc_id,
  for(i = 0; i < 4; i++)
   for(j = 0; j < 3; j++)
    for(k = 0; k < 2; k++) {
+    int l;
+
     buf53[i][j][k].p = malloc((i + 1) * sizeof(int));
     buf53[i][j][k].len = i + 1;
     for(l = 0; l < i + 1; l++)
@@ -2428,7 +2410,7 @@ void gen_datareg(hid_t fid,
  int             i;
 
  /* allocate the buffer for write the references */
- rbuf = calloc((size_t)2, sizeof(hdset_reg_ref_t));
+ rbuf = calloc(2, sizeof(hdset_reg_ref_t));
 
  /* allocate the buffer for write the data dataset */
  buf = malloc(10 * 10 * sizeof(int));
@@ -2473,7 +2455,7 @@ void gen_datareg(hid_t fid,
   coord[3][0]=2; coord[3][1]=5;
   coord[4][0]=1; coord[4][1]=7;
  }
- H5Sselect_elements(sid1,H5S_SELECT_SET,(size_t)5,(const hsize_t *)coord);
+ H5Sselect_elements(sid1,H5S_SELECT_SET,5,coord);
  H5Sget_select_npoints(sid1);
 
  /* store second dataset region */
@@ -2542,7 +2524,7 @@ int test_hyperslab(const char *fname,
   goto out;
  
  /* create a evenly divided buffer from 0 to 127  */
- buf = (char *)HDmalloc((size_t)(nelmts * size));
+ buf = (char *)HDmalloc((unsigned)(nelmts * size));
  s = 1024 * 1024 / 127;
  for(i = 0, j = 0, c = 0; i < 1024 * 1024; j++, i++) {
   if(j == s) {
@@ -2613,35 +2595,31 @@ int write_attr(hid_t loc_id,
                hid_t tid,
                void *buf)
 {
-    hid_t   aid=-1;
-    hid_t   sid=-1;
-    
-    /* create a space  */
-    if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
-        goto out;
-    
-    /* create the attribute */
-    if((aid = H5Acreate2(loc_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-        goto out;
-    
-    /* write */
-    if(buf)
-    {
-        if(H5Awrite(aid, tid, buf) < 0)
-            goto out;
-    }
-        
-    /* close */
-    H5Aclose(aid);
-    H5Sclose(sid);
-        
-    return SUCCEED;
-        
+ hid_t   aid;
+ hid_t   sid;
+
+ /* create a space  */
+ if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
+     goto out;
+
+ /* create the attribute */
+ if((aid = H5Acreate2(loc_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+     goto out;
+
+ /* write */
+ if(buf)
+   if(H5Awrite(aid, tid, buf) < 0)
+      goto out;
+
+ /* close */
+ H5Aclose(aid);
+ H5Sclose(sid);
+
+ return SUCCEED;
+
 out:
-    
-    H5Aclose(aid);
-    H5Sclose(sid);
-    return FAIL;
+ 
+ return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -2659,8 +2637,8 @@ int write_dset( hid_t loc_id,
                 hid_t tid,
                 void *buf )
 {
-    hid_t   did=-1;
-    hid_t   sid=-1;
+    hid_t   did;
+    hid_t   sid;
 
     /* create a space  */
     if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
@@ -2672,10 +2650,8 @@ int write_dset( hid_t loc_id,
 
     /* write */
     if(buf)
-    {
         if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
             goto out;
-    }
 
     /* close */
     H5Dclose(did);
@@ -2684,9 +2660,6 @@ int write_dset( hid_t loc_id,
     return SUCCEED;
 
 out:
-
-    H5Dclose(did);
-    H5Sclose(sid);
     return FAIL;
 }
 
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 2389ef4..70d889f 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -2440,9 +2440,6 @@ static void dump_fill_value(hid_t dcpl,hid_t type_id, hid_t obj_id)
  *
  * Programmer:  pvn
  *
- * Modifications: pvn, March 28, 2008
- *   Add a COMPRESSION ratio information for cases when filters are present
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -2458,7 +2455,7 @@ dump_dcpl(hid_t dcpl_id,hid_t type_id, hid_t obj_id)
     unsigned         szip_pixels_per_block;
     hsize_t          chsize[64];     /* chunk size in elements */
     int              rank;           /* rank */
-    char             name[256];      /* external file name       */
+    char                name[256];          /* external file name       */
     off_t            offset;         /* offset of external file     */
     hsize_t          size;           /* size of external file   */
     H5D_fill_value_t fvstatus;
@@ -2470,12 +2467,11 @@ dump_dcpl(hid_t dcpl_id,hid_t type_id, hid_t obj_id)
     unsigned         j;
 
     storage_size=H5Dget_storage_size(obj_id);
-    nfilters = H5Pget_nfilters(dcpl_id);
     ioffset=H5Dget_offset(obj_id);
     next=H5Pget_external_count(dcpl_id);
     strcpy(f_name,"\0");
 
-   /*-------------------------------------------------------------------------
+    /*-------------------------------------------------------------------------
     * STORAGE_LAYOUT
     *-------------------------------------------------------------------------
     */
@@ -2494,72 +2490,7 @@ dump_dcpl(hid_t dcpl_id,hid_t type_id, hid_t obj_id)
             HDfprintf(stdout, ", %Hu", chsize[i]);
         printf(" %s\n", dump_header_format->dataspacedimend);
         indentation(indent + COL);
-
-
-        /* if there are filters, print a compression ratio */
-        if ( nfilters )
-        {
-
-            hid_t sid = H5Dget_space( obj_id );
-            hid_t tid = H5Dget_type( obj_id );
-            size_t datum_size = H5Tget_size( tid );
-            hsize_t dims[H5S_MAX_RANK];
-            int ndims = H5Sget_simple_extent_dims( sid, dims, NULL);  
-            hsize_t nelmts = 1;
-            hsize_t size;
-            double per = 0;
-            hssize_t a, b;
-            int ok = 0;
-
-            /* only print the compression ratio for these filters */
-            for ( i = 0; i < nfilters; i++) 
-            {
-                cd_nelmts = NELMTS(cd_values);
-                filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts,
-                    cd_values, sizeof(f_name), f_name, NULL);
-                
-                switch (filtn) 
-                {
-                case H5Z_FILTER_DEFLATE:
-                case H5Z_FILTER_SZIP:
-                case H5Z_FILTER_NBIT:
-                case H5Z_FILTER_SCALEOFFSET:
-                    ok = 1;
-                    break;
-                }
-            }
-            
-            if (ndims && ok )
-            {
-                
-                for (i = 0; i < ndims; i++)
-                {
-                    nelmts *= dims[i];
-                }
-                size = nelmts * datum_size;
-
-                a = size; b = storage_size;
-                if (a!=0)
-                    per = (double) (b-a)/a;
-                
-                per = -per;
-                per *=100;
-
-                HDfprintf(stdout, "SIZE %Hu (%.1f%%COMPRESSION)\n ", storage_size, per);
-                
-            }
-            else
-                HDfprintf(stdout, "SIZE %Hu\n ", storage_size);
-
-
-            H5Sclose(sid);
-            H5Tclose(tid);
-            
-        }
-        else
-        {
-            HDfprintf(stdout, "SIZE %Hu\n ", storage_size);
-        }
+        HDfprintf(stdout, "SIZE %Hu\n ", storage_size);
 
         /*end indent */
         indent -= COL;
@@ -2632,16 +2563,14 @@ dump_dcpl(hid_t dcpl_id,hid_t type_id, hid_t obj_id)
     * FILTERS
     *-------------------------------------------------------------------------
     */
-    
+    nfilters = H5Pget_nfilters(dcpl_id);
 
     indentation(indent + COL);
     printf("%s %s\n", FILTERS, BEGIN);
     indent += COL;
 
-    if (nfilters) 
-    {
-        for (i=0; i<nfilters; i++) 
-        {
+    if (nfilters) {
+        for (i=0; i<nfilters; i++) {
             cd_nelmts = NELMTS(cd_values);
             filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts,
                 cd_values, sizeof(f_name), f_name, NULL);
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 4070425..b21a020 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -5542,7 +5542,8 @@ error:
  *              Contains:
  *              1) an integer dataset
  *              2) a float dataset
- *              4) a double dataset
+ *              3) an array dataset
+ *              4) a large double dataset
  *
  *-------------------------------------------------------------------------
  */
@@ -5550,43 +5551,64 @@ static void
 gent_binary(void)
 {
  hid_t    fid, sid, did, tid;
- hsize_t  dims[1]  = {6};
+ hsize_t  dims[1] = {6};
+ hsize_t  dimarray[1] = {2};
+ hsize_t  dimsl[1] = {100000};
  int      ibuf[6]  = {1,2,3,4,5,6};
  float    fbuf[6]  = {1,2,3,4,5,6};
- double   dbuf[6]  = {1,2,3,4,5,6};
+ int      abuf[2][6] = {{1,2,3,4,5,6},{7,8,9,10,11,12}};  /* array */
+ double   *dbuf=NULL;
 
  fid = H5Fcreate(FILE55, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
- sid = H5Screate_simple(1, dims, NULL);
 
 
 /*-------------------------------------------------------------------------
  * integer
  *-------------------------------------------------------------------------
  */
- 
+ sid = H5Screate_simple(1, dims, NULL);
  did = H5Dcreate2(fid, "integer", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
  H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf);
  H5Dclose(did);
+ H5Sclose(sid);
 
 /*-------------------------------------------------------------------------
  * float
  *-------------------------------------------------------------------------
  */
+ sid = H5Screate_simple(1, dims, NULL);
  did = H5Dcreate2(fid, "float", H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
  H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, fbuf);
  H5Dclose(did);
+ H5Sclose(sid);
+
+/*-------------------------------------------------------------------------
+ * array
+ *-------------------------------------------------------------------------
+ */
+ tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dims);
+ sid = H5Screate_simple(1, dimarray, NULL);
+ did = H5Dcreate2(fid, "array", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, abuf);
+ H5Dclose(did);
+ H5Tclose(tid);
+ H5Sclose(sid);
 
 /*-------------------------------------------------------------------------
  * double
  *-------------------------------------------------------------------------
  */
+ sid = H5Screate_simple(1, dimsl, NULL);
  did = H5Dcreate2(fid, "double", H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
- H5Dwrite(did, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dbuf);
+ dbuf = calloc(100000, sizeof(double));
+ if(dbuf != NULL) {
+  H5Dwrite(did, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dbuf);
+  free(dbuf);
+ }
  H5Dclose(did);
- 
+ H5Sclose(sid);
 
  /* close */
- H5Sclose(sid);
  H5Fclose(fid);
 }
 
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index 1a8c18a..b7b8429 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -325,7 +325,8 @@ TOOLTEST tall-2B.ddl -A -r tall.h5
 TOOLTEST tall-4s.ddl --dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 tall.h5
 TOOLTEST tall-5s.ddl -d "/g1/g1.1/dset1.1.2[0;2;10;]" tall.h5
 TOOLTEST tdset-3s.ddl -d "/dset1[1,1;;;]" tdset.h5
-
+# block
+# TOOLTEST tdset2-1s.ddl -d "/dset1[;3,2;4,4;1,4]" tdset2.h5
 
 # test printing characters in ASCII instead of decimal
 TOOLTEST tchar1.ddl -r tchar.h5
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index d1b15bb..f8f518b 100755
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -45,6 +45,10 @@ int main(int argc, char *argv[])
    (void)HDsetvbuf(stderr, (char *) NULL, _IOLBF, 0);
    (void)HDsetvbuf(stdout, (char *) NULL, _IOLBF, 0);
 
+#if defined __MWERKS__
+    argc = ccommand(&argv);
+#endif
+
     if ( argv[1] && (strcmp("-V",argv[1])==0) )
     {
         print_version("h5import");
@@ -271,7 +275,7 @@ gtoken(char *s)
  * Programmer:  pkmat
  *
  * Modifications: pvn
- *  7/23/2007. Added support for STR type, extra parameter FILE_ID
+ *  7/23/2007. Added support for STR type
  *
  *-------------------------------------------------------------------------
  */
@@ -289,53 +293,12 @@ processDataFile(char *infile, struct Input *in, FILE **strm, hid_t file_id)
   const char *err10 = "Unrecognized input class type.\n";
   const char *err11 = "Error in reading string data.\n";
 
- /*-------------------------------------------------------------------------
-  * special case for opening binary classes in WIN32
-  * "FP" denotes a floating point binary file,
-  * "IN" denotes a signed integer binary file, 
-  * "UIN" denotes an unsigned integer binary file,
-  *-------------------------------------------------------------------------
-  */
-  if ( in->inputClass == 4 /* "IN" */ ||
-       in->inputClass == 3 /* "FP" */ ||
-       in->inputClass == 7 /* "UIN" */ 
-      
-      )
-  {
-
-#ifdef WIN32
-      
-      if ((*strm = fopen(infile, "rb")) == NULL)
-      {
-          (void) fprintf(stderr, err1, infile);
-          return(-1);
-      }
-#else
-
-      if ((*strm = fopen(infile, "r")) == NULL)
-      {
-          (void) fprintf(stderr, err1, infile);
-          return(-1);
-      }
-
-#endif
-
-  }
- /*-------------------------------------------------------------------------
-  * if the input class is not binary, just use "r"
-  *-------------------------------------------------------------------------
-  */
-  else
+  if ((*strm = fopen(infile, "r")) == NULL)
   {
-      if ((*strm = fopen(infile, "r")) == NULL)
-      {
-          (void) fprintf(stderr, err1, infile);
-          return(-1);
-      }
+      (void) fprintf(stderr, err1, infile);
+      return(-1);
   }
 
-
-
   switch(in->inputClass)
   {
     case 0: /*  TEXTIN */
@@ -409,7 +372,7 @@ readIntegerData(FILE **strm, struct Input *in)
   H5DT_INT8 *in08;
   H5DT_INT16 *in16, temp;
   H5DT_INT32 *in32;
-#ifndef WIN32
+#ifndef _WIN32
   H5DT_INT64 *in64;
   char buffer[256];
 #endif
diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c
index 9272632..2a8c827 100755
--- a/tools/h5import/h5importtest.c
+++ b/tools/h5import/h5importtest.c
@@ -21,378 +21,271 @@
  *      h5importtest
  *
  * Description:
- *      This program creates that can be
+ *      This program creates files  that can be
  *      used to test the h5import program.
  *
  */
+/*
+ * Define names for test files
+ */
 
 int
 main(void)
 {
-    int       nrow = 3, ncol = 4, npln = 5;
-    int       i, j, k;
-    FILE      *sp;
-    
+    int         nrow = 3, ncol = 4, npln = 5;
+    int         i, j, k;
+    FILE       *sp;
+
     float     b32r3[5][3][4];
     float     row4[3], col4[4], pln4[5];
     float     rowo4 = (float)11.0e0, colo4 = (float)21.0e0, plno4 = (float)51.0e0;
     float     rowi4 = (float)1.0e0, coli4 = (float)2.0e0, plni4 = (float)5.0e0;
-    
-    int       b32i3[5][3][4];
-    int       row4i[3], col4i[4], pln4i[5];
-    int       rowo4i = (int)11 , colo4i = (int)21 , plno4i = (int)51 ;
-    int       rowi4i = (int)1 , coli4i = (int)2 , plni4i = (int)5 ;
-    
-#ifndef WIN32
-    long_long b64i2[3][4], b64i3[5][3][4];
-    long_long row4i64[3], col4i64[4], pln4i64[5];
-    long_long rowo4i64 = (long_long)11 , colo4i64 = (long_long)21 , plno4i64 = (long_long)51 ;
-    long_long rowi4i64 = (long_long)1 , coli4i64 = (long_long)2 , plni4i64 = (long_long)5 ;
+
+    int     b32i3[5][3][4];
+    int     row4i[3], col4i[4], pln4i[5];
+    int     rowo4i = (int)11 , colo4i = (int)21 , plno4i = (int)51 ;
+    int     rowi4i = (int)1 , coli4i = (int)2 , plni4i = (int)5 ;
+
+#ifndef _WIN32
+    long_long     b64i2[3][4], b64i3[5][3][4];
+    long_long     row4i64[3], col4i64[4], pln4i64[5];
+    long_long     rowo4i64 = (long_long)11 , colo4i64 = (long_long)21 , plno4i64 = (long_long)51 ;
+    long_long     rowi4i64 = (long_long)1 , coli4i64 = (long_long)2 , plni4i64 = (long_long)5 ;
 #endif
-    
+
     short     b16i3[5][3][4];
     short     row4i16[3], col4i16[4], pln4i16[5];
     short     rowo4i16 = (short)11 , colo4i16 = (short)21 , plno4i16 = (short)51 ;
     short     rowi4i16 = (short)1 , coli4i16 = (short)2 , plni4i16 = (short)5 ;
-    
-    char      b8i3[5][3][4];
-    char      row4i8[3], col4i8[4], pln4i8[5];
-    char      rowo4i8 = (char)11 , colo4i8 = (char)21 , plno4i8 = (char)51 ;
-    char      rowi4i8 = (char)1 , coli4i8 = (char)2 , plni4i8 = (char)5 ;
-    
-    double    b64r3[5][3][4];
-    double    row8[3], col8[4], pln8[5];
-    double    rowo8 = 11.0e0, colo8 = 21.0e0, plno8 = 51.0e0;
-    double    rowi8 = 1.0e0, coli8 = 2.0e0, plni8 = 5.0e0;
-    
-    
+
+    char     b8i3[5][3][4];
+    char     row4i8[3], col4i8[4], pln4i8[5];
+    char     rowo4i8 = (char)11 , colo4i8 = (char)21 , plno4i8 = (char)51 ;
+    char     rowi4i8 = (char)1 , coli4i8 = (char)2 , plni4i8 = (char)5 ;
+
+    double     b64r3[5][3][4];
+    double     row8[3], col8[4], pln8[5];
+    double     rowo8 = 11.0e0, colo8 = 21.0e0, plno8 = 51.0e0;
+	double     rowi8 = 1.0e0, coli8 = 2.0e0, plni8 = 5.0e0;
+
+
     /*
-    * initialize the row, column, and plane vectors
-    *
-    * row values start at 11 and increment by 1 => 11, 12, 13
-    * column values start at 21 and increment by 2 => 21, 23, 25, 27
-    * plane values start at 51 and increment by 5 => 51, 56, 61, 66, 71
-    */
-    
-    
+     * initialize the row, column, and plane vectors
+     *
+     * row values start at 11 and increment by 1 => 11, 12, 13
+     * column values start at 21 and increment by 2 => 21, 23, 25, 27
+     * plane values start at 51 and increment by 5 => 51, 56, 61, 66, 71
+     */
+
+
     /*
-    * build array elements - rank 2
-    *
-    * element value = sum of row value and col values
-    */
-    
+     * build array elements - rank 2
+     *
+     * element value = sum of row value and col values
+     */
+
     row4[0] = rowo4;
     col4[0] = colo4;
     pln4[0] = plno4;
-    
+
     row8[0] = rowo8;
     col8[0] = colo8;
     pln8[0] = plno8;
-    
+
     row4i[0] = rowo4i;
     col4i[0] = colo4i;
     pln4i[0] = plno4i;
-    
-#ifndef WIN32
+
+#ifndef _WIN32
     row4i64[0] = rowo4i64;
     col4i64[0] = colo4i64;
     pln4i64[0] = plno4i64;
 #endif
-    
+
     row4i16[0] = rowo4i16;
     col4i16[0] = colo4i16;
     pln4i16[0] = plno4i16;
-    
+
     row4i8[0] = rowo4i8;
     col4i8[0] = colo4i8;
     pln4i8[0] = plno4i8;
-    
+
     for (i = 1; i < nrow; i++)
     {
         row4[i] = row4[i - 1] + rowi4;
         row8[i] = row8[i - 1] + rowi8;
         row4i[i] = row4i[i - 1] + rowi4i;
-#ifndef WIN32
-        row4i64[i] = row4i64[i - 1] + rowi4i64;
+#ifndef _WIN32
+	row4i64[i] = row4i64[i - 1] + rowi4i64;
 #endif
-        row4i16[i] = row4i16[i - 1] + rowi4i16;
-        row4i8[i] = row4i8[i - 1] + rowi4i8;
+	row4i16[i] = row4i16[i - 1] + rowi4i16;
+	row4i8[i] = row4i8[i - 1] + rowi4i8;
     }
 
     for (j = 1; j < ncol; j++)
     {
-        col4[j] = col4[j - 1] + coli4;
-        col8[j] = col8[j - 1] + coli8;
-        col4i[j] = col4i[j - 1] + coli4i;
-#ifndef WIN32
-        col4i64[j] = col4i64[j - 1] + coli4i64;
+          col4[j] = col4[j - 1] + coli4;
+          col8[j] = col8[j - 1] + coli8;
+	  col4i[j] = col4i[j - 1] + coli4i;
+#ifndef _WIN32
+          col4i64[j] = col4i64[j - 1] + coli4i64;
 #endif
-        col4i16[j] = col4i16[j - 1] + coli4i16;
-        col4i8[j] = col4i8[j - 1] + coli4i8;
+	  col4i16[j] = col4i16[j - 1] + coli4i16;
+	  col4i8[j] = col4i8[j - 1] + coli4i8;
     }
     for (k = 1; k < npln; k++)
     {
-        pln4[k] = pln4[k - 1] + plni4;
-        pln8[k] = pln8[k - 1] + plni8;
-        pln4i[k] = pln4i[k - 1] + plni4i;
-#ifndef WIN32
-        pln4i64[k] = pln4i64[k - 1] + plni4i64;
+          pln4[k] = pln4[k - 1] + plni4;
+          pln8[k] = pln8[k - 1] + plni8;
+	  pln4i[k] = pln4i[k - 1] + plni4i;
+#ifndef _WIN32
+    	  pln4i64[k] = pln4i64[k - 1] + plni4i64;
 #endif
-        pln4i16[k] = pln4i16[k - 1] + plni4i16;
-        pln4i8[k] = pln4i8[k - 1] + plni4i8;
-    }
-
-    for (i = 0; i < nrow; i++)
-    {
-        for (j = 0; j < ncol; j++)
-        {
-#ifndef WIN32
-            b64i2[i][j] = row4i64[i] + col4i64[j];
+	  pln4i16[k] = pln4i16[k - 1] + plni4i16;
+	  pln4i8[k] = pln4i8[k - 1] + plni4i8;
+   }
+
+   for (i = 0; i < nrow; i++)
+   {
+     for (j = 0; j < ncol; j++)
+     {
+#ifndef _WIN32
+  	b64i2[i][j] = row4i64[i] + col4i64[j];
 #endif
-        }
-    }
+     }
+   }
 
     /*
-    * build array elements - rank 3
-    *
-    * element value = sum of row value, col, and plane values
-    */
-    
+     * build array elements - rank 3
+     *
+     * element value = sum of row value, col, and plane values
+     */
+
     for (i = 0; i < nrow; i++)
-    {
-        for (j = 0; j < ncol; j++)
-        {
-            for (k = 0; k < npln; k++)
+      {
+          for (j = 0; j < ncol; j++)
             {
-                b32r3[k][i][j] = row4[i] + col4[j] + pln4[k];
-                b64r3[k][i][j] = row8[i] + col8[j] + pln8[k];
-                b32i3[k][i][j] = row4i[i] + col4i[j] + pln4i[k];
-#ifndef WIN32
-                b64i3[k][i][j] = row4i64[i] + col4i64[j] + pln4i64[k];
+                for (k = 0; k < npln; k++)
+                  {
+                      b32r3[k][i][j] = row4[i] + col4[j] + pln4[k];
+                      b64r3[k][i][j] = row8[i] + col8[j] + pln8[k];
+	              b32i3[k][i][j] = row4i[i] + col4i[j] + pln4i[k];
+#ifndef _WIN32
+	     	      b64i3[k][i][j] = row4i64[i] + col4i64[j] + pln4i64[k];
 #endif
-                b16i3[k][i][j] = row4i16[i] + col4i16[j] + pln4i16[k];
-                b8i3[k][i][j] = row4i8[i] + col4i8[j] + pln4i8[k];
+		      b16i3[k][i][j] = row4i16[i] + col4i16[j] + pln4i16[k];
+		      b8i3[k][i][j] = row4i8[i] + col4i8[j] + pln4i8[k];
+                  }
             }
-        }
-    }
+      }
 
-    
+    /*
+     * binary 32-bit file - rank 2 & 3
+     */
 
 #ifndef UNICOS
 
 
-
- /*-------------------------------------------------------------------------
-  * TOOLTEST txtin16.txt -c $srcdir/testfiles/txtin16.conf -o txtin16.h5
-  *-------------------------------------------------------------------------
-  */
-
-
-    sp = fopen("txtin16.txt", "w");
-    for (k = 0; k < npln; k++)
-    {
-        for (i = 0; i < nrow; i++)
+    	sp = fopen("txtin16", "w");
+	for (k = 0; k < npln; k++)
+    	for (i = 0; i < nrow; i++)
         {
-            for (j = 0; j < ncol; j++)
-                (void) fprintf(sp, "%10u", b16i3[k][i][j]);
-            (void) fprintf(sp, "\n");
+          for (j = 0; j < ncol; j++)
+              (void) fprintf(sp, "%10u", b16i3[k][i][j]);
+          (void) fprintf(sp, "\n");
         }
-    }
     (void) fclose(sp);
 
- /*-------------------------------------------------------------------------
-  * TOOLTEST txtin32.txt -c $srcdir/testfiles/textin32.conf -o textin32.h5
-  *-------------------------------------------------------------------------
-  */
-
-    sp = fopen("txtin32.txt", "w");
-    for (k = 0; k < npln; k++)
-    {
-        for (i = 0; i < nrow; i++)
+      sp = fopen("txtin32", "w");
+      for (k = 0; k < npln; k++)
+    	for (i = 0; i < nrow; i++)
         {
-            for (j = 0; j < ncol; j++)
-                (void) fprintf(sp, "%10d", b32i3[k][i][j]);
-            (void) fprintf(sp, "\n");
+          for (j = 0; j < ncol; j++)
+              (void) fprintf(sp, "%10d", b32i3[k][i][j]);
+          (void) fprintf(sp, "\n");
         }
-    }
-    (void) fclose(sp);
-
- /*-------------------------------------------------------------------------
-  * TOOLTEST binin32.bin -c $srcdir/testfiles/binin32.conf -o binin32.h5
-  *-------------------------------------------------------------------------
-  */
+      (void) fclose(sp);
 
-#ifdef WIN32        
-    sp = fopen("binin32.bin", "wb");
-#else
-    sp = fopen("binin32.bin", "w");
-#endif
+    sp = fopen("bin32", "w");
     for (k = 0; k < npln; k++)
-    {
-        for (i = 0; i < nrow; i++)
-        {
-            for (j = 0; j < ncol; j++)
-            {
-                (void) fwrite((char *) &b32i3[k][i][j], sizeof(int), 1, sp);
-            }
-        }
-    }
+    for (i = 0; i < nrow; i++)
+        for (j = 0; j < ncol; j++)
+            (void) fwrite((char *) &b32i3[k][i][j], sizeof(int), 1, sp);
     (void) fclose(sp);
 
- /*-------------------------------------------------------------------------
-  * TOOLTEST binuin32.bin -c $srcdir/testfiles/binuin32.conf -o binuin32.h5
-  *-------------------------------------------------------------------------
-  */
 
-#ifdef WIN32        
-    sp = fopen("binuin32.bin", "wb");
-#else
-    sp = fopen("binuin32.bin", "w");
-#endif
+    sp = fopen("buin32", "w");
     for (k = 0; k < npln; k++)
-    {
-        for (i = 0; i < nrow; i++)
-        {
-            for (j = 0; j < ncol; j++)
-            {
-                (void) fwrite((char *) &b32i3[k][i][j], sizeof(unsigned int), 1, sp);
-            }
-        }
-    }
+    for (i = 0; i < nrow; i++)
+        for (j = 0; j < ncol; j++)
+            (void) fwrite((char *) &b32i3[k][i][j], sizeof(unsigned int), 1, sp);
     (void) fclose(sp);
 
+#ifndef _WIN32
 
-
-
- /*-------------------------------------------------------------------------
-  * TOOLTEST binin16.bin -c $srcdir/testfiles/binin16.conf -o binin16.h5
-  *-------------------------------------------------------------------------
-  */
-
-#ifdef WIN32        
-    sp = fopen("binin16.bin", "wb");
-#else
-    sp = fopen("binin16.bin", "w");
-#endif
-    for (k = 0; k < npln; k++)
-    {
-        for (i = 0; i < nrow; i++)
-        {
-            for (j = 0; j < ncol; j++)
-            {
-                (void) fwrite((char *) &b16i3[k][i][j], sizeof(short), 1, sp);
-            }
-        }
-    }
+    sp = fopen("bin64-2", "w");
+    for (i = 0; i < nrow; i++)
+        for (j = 0; j < ncol; j++)
+            (void) fwrite((char *) &b64i2[i][j], sizeof(long_long), 1, sp);
     (void) fclose(sp);
-
- /*-------------------------------------------------------------------------
-  * TOOLTEST binuin16.bin -c $srcdir/testfiles/binuin16.conf -o binuin16.h5
-  *-------------------------------------------------------------------------
-  */
-#ifdef WIN32
-    sp = fopen("binuin16.bin", "wb");
-#else
-    sp = fopen("binuin16.bin", "w");
 #endif
+
+    sp = fopen("bfp32", "w");
     for (k = 0; k < npln; k++)
-    {
         for (i = 0; i < nrow; i++)
-        {
             for (j = 0; j < ncol; j++)
-            {
-                (void) fwrite((char *) &b16i3[k][i][j], sizeof(unsigned short), 1, sp);
-            }
-        }
-    }
+                (void) fwrite((char *) &b32r3[k][i][j],
+                              sizeof(float), 1, sp);
     (void) fclose(sp);
 
+        sp = fopen("bin16", "w");
+	for (k = 0; k < npln; k++)
+    	for (i = 0; i < nrow; i++)
+        for (j = 0; j < ncol; j++)
+            (void) fwrite((char *) &b16i3[k][i][j], sizeof(short), 1,
+                          sp);
+    (void) fclose(sp);
 
+        sp = fopen("buin16", "w");
+	for (k = 0; k < npln; k++)
+    	for (i = 0; i < nrow; i++)
+        for (j = 0; j < ncol; j++)
+            (void) fwrite((char *) &b16i3[k][i][j], sizeof(unsigned short), 1,
+                          sp);
+    (void) fclose(sp);
 
- /*-------------------------------------------------------------------------
-  * TOOLTEST binin8.bin -c $srcdir/testfiles/binin8.conf  -o binin8.h5
-  *-------------------------------------------------------------------------
-  */
+#ifndef _WIN32
 
-#ifdef WIN32
-    sp = fopen("binin8.bin", "wb");
-#else
-    sp = fopen("binin8.bin", "w");
+        sp = fopen("bin64-3", "w");
+	for (k = 0; k < npln; k++)
+    	for (i = 0; i < nrow; i++)
+        for (j = 0; j < ncol; j++)
+            (void) fwrite((char *) &b64i3[k][i][j], sizeof(long_long), 1,
+                          sp);
+    (void) fclose(sp);
 #endif
+
+    sp = fopen("bin8", "w");
     for (k = 0; k < npln; k++)
-    {
-        for (i = 0; i < nrow; i++)
-        {
-            for (j = 0; j < ncol; j++)
-            {
-                (void) fwrite((char *) &b8i3[k][i][j], sizeof(char), 1, sp);
-            }
-        }
-    }
+    	for (i = 0; i < nrow; i++)
+        for (j = 0; j < ncol; j++)
+            (void) fwrite((char *) &b8i3[k][i][j], sizeof(char), 1,
+                          sp);
     (void) fclose(sp);
 
-#endif /* UNICOS */
-
-
-
-
- /*-------------------------------------------------------------------------
-  * TOOLTEST binfp64.bin -c $srcdir/testfiles/binfp64.conf -o binfp64.h5
-  *-------------------------------------------------------------------------
-  */
+#endif
 
- /*
-  * binary 64-bit file - rank 2 & 3
-  */
+    /*
+     * binary 64-bit file - rank 2 & 3
+     */
 
-#ifdef WIN32
-    sp = fopen("binfp64.bin", "wb");
-#else
-    sp = fopen("binfp64.bin", "w");
-#endif
+    sp = fopen("bfp64", "w");
     for (k = 0; k < npln; k++)
-    {
         for (i = 0; i < nrow; i++)
-        {
             for (j = 0; j < ncol; j++)
-            {
-                (void) fwrite((char *) &b64r3[k][i][j], sizeof(double), 1, sp);
-            }
-        }
-    }
+                (void) fwrite((char *) &b64r3[k][i][j],
+                              sizeof(double), 1, sp);
     (void) fclose(sp);
-
-
-
- /*-------------------------------------------------------------------------
-  * TOOLTEST binin8w.bin -c $srcdir/testfiles/binin8w.conf -o binin8w.h5
-  *-------------------------------------------------------------------------
-  */
-
-    {
-        /* test CR+LF (13,10) and EOF (26) in windows */
-        char bin8w[4] = {13,10,26,0};
-        
-#ifdef WIN32
-        sp = fopen("binin8w.bin", "wb");
-#else
-        sp = fopen("binin8w.bin", "w");
-#endif
-        for (i = 0; i < 4; i++)
-        {
-            char c = bin8w[i];
-            if ( fwrite( &c, sizeof(char), 1, sp) != 1 )
-                printf("error writing file\n");
-        }
-        fclose(sp);
-        
-        
-    }
-
-
-
-
-
     return (0);
 }
 
diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh
index ff7dc35..0687871 100755
--- a/tools/h5import/h5importtestutil.sh
+++ b/tools/h5import/h5importtestutil.sh
@@ -60,72 +60,49 @@ cp $srcdir/testfiles/*.h5 tmp_testfiles/
 $RUNSERIAL ./h5importtest
 
 TESTING "ASCII I32 rank 3 - Output BE " ;
-#TOOLTEST txtin32 -c $srcdir/testfiles/textin32 -o test1.h5
-TOOLTEST $srcdir/testfiles/txtin16.txt -c $srcdir/testfiles/txtin32.conf -o txtin32.h5
+TOOLTEST txtin32 -c $srcdir/testfiles/textin32 -o test1.h5
 
 TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended" 
-#TOOLTEST txtin16 -c $srcdir/testfiles/textin16 -o test2.h5
-TOOLTEST $srcdir/testfiles/txtin16.txt -c $srcdir/testfiles/txtin16.conf -o txtin16.h5
-
+TOOLTEST txtin16 -c $srcdir/testfiles/textin16 -o test2.h5
 
 TESTING "ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed " 
-#TOOLTEST txtin16 -c $srcdir/testfiles/textin8  -o test3.h5
-TOOLTEST $srcdir/testfiles/txtin16.txt -c $srcdir/testfiles/txtin8.conf  -o txtin8.h5
+TOOLTEST txtin16 -c $srcdir/testfiles/textin8  -o test3.h5
 
 TESTING "ASCII UI32 - rank 3 - Output BE" 
-#TOOLTEST $srcdir/testfiles/in1 -c $srcdir/testfiles/textuin32 -o test4.h5
-TOOLTEST $srcdir/testfiles/txtuin32.txt -c $srcdir/testfiles/txtuin32.conf -o txtuin32.h5
+TOOLTEST $srcdir/testfiles/in1 -c $srcdir/testfiles/textuin32 -o test4.h5
 
 TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed " 
-#TOOLTEST $srcdir/testfiles/in1 -c $srcdir/testfiles/textuin16 -o test5.h5
-TOOLTEST $srcdir/testfiles/txtuin32.txt -c $srcdir/testfiles/txtuin16.conf -o txtuin16.h5
+TOOLTEST $srcdir/testfiles/in1 -c $srcdir/testfiles/textuin16 -o test5.h5
 
 TESTING "ASCII F32 - rank 3 - Output LE " 
-#TOOLTEST $srcdir/testfiles/fp1 -c $srcdir/testfiles/textfp32 -o test6.h5
-TOOLTEST $srcdir/testfiles/txtfp32.txt -c $srcdir/testfiles/txtfp32.conf -o txtfp32.h5
-
+TOOLTEST $srcdir/testfiles/fp1 -c $srcdir/testfiles/textfp32 -o test6.h5
 
 TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed " 
-#TOOLTEST $srcdir/testfiles/fp2 -c $srcdir/testfiles/textfp64 -o test7.h5
-TOOLTEST $srcdir/testfiles/txtfp64.txt -c $srcdir/testfiles/txtfp64.conf -o txtfp64.h5
+TOOLTEST $srcdir/testfiles/fp2 -c $srcdir/testfiles/textfp64 -o test7.h5
 
 TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
-#TOOLTEST bfp64 -c $srcdir/testfiles/conbfp64 -o test8.h5
-TOOLTEST binfp64.bin -c $srcdir/testfiles/binfp64.conf -o binfp64.h5
-
+TOOLTEST bfp64 -c $srcdir/testfiles/conbfp64 -o test8.h5
 
 TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " 
-#TOOLTEST bin16 -c $srcdir/testfiles/conbin16 -o test9.h5
-TOOLTEST binin16.bin -c $srcdir/testfiles/binin16.conf -o binin16.h5
-
+TOOLTEST bin16 -c $srcdir/testfiles/conbin16 -o test9.h5
 
 TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " 
-#TOOLTEST bin8 -c $srcdir/testfiles/conbin8  -o test10.h5
-TOOLTEST binin8.bin -c $srcdir/testfiles/binin8.conf  -o binin8.h5
-
+TOOLTEST bin8 -c $srcdir/testfiles/conbin8  -o test10.h5
 
 TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED " 
-#TOOLTEST bin32 -c $srcdir/testfiles/conbin32 -o test11.h5
-TOOLTEST binin32.bin -c $srcdir/testfiles/binin32.conf -o binin32.h5
-
+TOOLTEST bin32 -c $srcdir/testfiles/conbin32 -o test11.h5
 
 TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED " 
-#TOOLTEST buin16 -c $srcdir/testfiles/conbuin16 -o test12.h5
-TOOLTEST binuin16.bin -c $srcdir/testfiles/binuin16.conf -o binuin16.h5
+TOOLTEST buin16 -c $srcdir/testfiles/conbuin16 -o test12.h5
 
 TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED " 
-#TOOLTEST buin32 -c $srcdir/testfiles/conbuin32 -o test13.h5
-TOOLTEST binuin32.bin -c $srcdir/testfiles/binuin32.conf -o binuin32.h5
-
+TOOLTEST buin32 -c $srcdir/testfiles/conbuin32 -o test13.h5
 
 TESTING "STR" 
-TOOLTEST $srcdir/testfiles/txtstr.txt -c $srcdir/testfiles/txtstr.conf -o txtstr.h5
-
-TESTING "BINARY I8 CR LF EOF" 
-TOOLTEST binin8w.bin -c $srcdir/testfiles/binin8w.conf -o binin8w.h5
-
+TOOLTEST $srcdir/testfiles/txtstr -c $srcdir/testfiles/textstr -o teststr.h5
 
-rm -f  *.txt *.bin *.h5
+rm -f  tx* b* *.dat
+rm -f  test*.h5 
 rm -rf tmp_testfiles
 else
 	echo "** h5import or h5importtest not available ***"
diff --git a/tools/h5import/testfiles/binin8w.conf b/tools/h5import/testfiles/binin8w.conf
deleted file mode 100644
index fccb4ac..0000000
--- a/tools/h5import/testfiles/binin8w.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-
-INPUT-CLASS IN
-INPUT-SIZE  8
-RANK 1
-DIMENSION-SIZES 4
-OUTPUT-BYTE-ORDER LE
-OUTPUT-CLASS IN
-OUTPUT-SIZE 8
-OUTPUT-ARCHITECTURE STD
diff --git a/tools/h5import/testfiles/binin8w.h5 b/tools/h5import/testfiles/binin8w.h5
deleted file mode 100644
index 64acaed..0000000
--- a/tools/h5import/testfiles/binin8w.h5
+++ /dev/null
diff --git a/tools/h5import/testfiles/conbfp32 b/tools/h5import/testfiles/conbfp32
new file mode 100755
index 0000000..66e6b35
--- /dev/null
+++ b/tools/h5import/testfiles/conbfp32
@@ -0,0 +1,12 @@
+PATH /fpbin/32-bit
+INPUT-CLASS FP
+INPUT-SIZE	32
+RANK 3
+DIMENSION-SIZES 5 3 4
+OUTPUT-ARCHITECTURE IEEE
+OUTPUT-BYTE-ORDER BE
+CHUNKED-DIMENSION-SIZES 2 2 2 
+COMPRESSION-PARAM 2
+
+
+
diff --git a/tools/h5import/testfiles/binfp64.conf b/tools/h5import/testfiles/conbfp64
index 6b4c361..6b4c361 100755
--- a/tools/h5import/testfiles/binfp64.conf
+++ b/tools/h5import/testfiles/conbfp64
diff --git a/tools/h5import/testfiles/binin16.conf b/tools/h5import/testfiles/conbin16
index 06869cb..06869cb 100755
--- a/tools/h5import/testfiles/binin16.conf
+++ b/tools/h5import/testfiles/conbin16
diff --git a/tools/h5import/testfiles/binin32.conf b/tools/h5import/testfiles/conbin32
index 11996ef..11996ef 100755
--- a/tools/h5import/testfiles/binin32.conf
+++ b/tools/h5import/testfiles/conbin32
diff --git a/tools/h5import/testfiles/binin8.conf b/tools/h5import/testfiles/conbin8
index 1edd80a..1edd80a 100755
--- a/tools/h5import/testfiles/binin8.conf
+++ b/tools/h5import/testfiles/conbin8
diff --git a/tools/h5import/testfiles/binuin16.conf b/tools/h5import/testfiles/conbuin16
index a4603df..a4603df 100755
--- a/tools/h5import/testfiles/binuin16.conf
+++ b/tools/h5import/testfiles/conbuin16
diff --git a/tools/h5import/testfiles/binuin32.conf b/tools/h5import/testfiles/conbuin32
index a649e97..a649e97 100755
--- a/tools/h5import/testfiles/binuin32.conf
+++ b/tools/h5import/testfiles/conbuin32
diff --git a/tools/h5import/testfiles/txtfp32.txt b/tools/h5import/testfiles/fp1
index 142c94f..142c94f 100755
--- a/tools/h5import/testfiles/txtfp32.txt
+++ b/tools/h5import/testfiles/fp1
diff --git a/tools/h5import/testfiles/txtfp64.txt b/tools/h5import/testfiles/fp2
index 6c83dc3..6c83dc3 100755
--- a/tools/h5import/testfiles/txtfp64.txt
+++ b/tools/h5import/testfiles/fp2
diff --git a/tools/h5import/testfiles/txtuin32.txt b/tools/h5import/testfiles/in1
index 0688e9b..0688e9b 100755
--- a/tools/h5import/testfiles/txtuin32.txt
+++ b/tools/h5import/testfiles/in1
diff --git a/tools/h5import/testfiles/txtin32.h5 b/tools/h5import/testfiles/test1.h5
index 350333c..350333c 100644
--- a/tools/h5import/testfiles/txtin32.h5
+++ b/tools/h5import/testfiles/test1.h5
diff --git a/tools/h5import/testfiles/binin8.h5 b/tools/h5import/testfiles/test10.h5
index a1d1a37..a1d1a37 100644
--- a/tools/h5import/testfiles/binin8.h5
+++ b/tools/h5import/testfiles/test10.h5
diff --git a/tools/h5import/testfiles/binin32.h5 b/tools/h5import/testfiles/test11.h5
index fd8faa9..fd8faa9 100644
--- a/tools/h5import/testfiles/binin32.h5
+++ b/tools/h5import/testfiles/test11.h5
diff --git a/tools/h5import/testfiles/binuin16.h5 b/tools/h5import/testfiles/test12.h5
index c486c89..c486c89 100644
--- a/tools/h5import/testfiles/binuin16.h5
+++ b/tools/h5import/testfiles/test12.h5
diff --git a/tools/h5import/testfiles/binuin32.h5 b/tools/h5import/testfiles/test13.h5
index 41699d7..41699d7 100644
--- a/tools/h5import/testfiles/binuin32.h5
+++ b/tools/h5import/testfiles/test13.h5
diff --git a/tools/h5import/testfiles/txtin16.h5 b/tools/h5import/testfiles/test2.h5
index dc6c1ea..dc6c1ea 100644
--- a/tools/h5import/testfiles/txtin16.h5
+++ b/tools/h5import/testfiles/test2.h5
diff --git a/tools/h5import/testfiles/txtin8.h5 b/tools/h5import/testfiles/test3.h5
index 42e7727..42e7727 100644
--- a/tools/h5import/testfiles/txtin8.h5
+++ b/tools/h5import/testfiles/test3.h5
diff --git a/tools/h5import/testfiles/txtuin32.h5 b/tools/h5import/testfiles/test4.h5
index 1a4dda5..1a4dda5 100644
--- a/tools/h5import/testfiles/txtuin32.h5
+++ b/tools/h5import/testfiles/test4.h5
diff --git a/tools/h5import/testfiles/txtuin16.h5 b/tools/h5import/testfiles/test5.h5
index 9ee166a..9ee166a 100644
--- a/tools/h5import/testfiles/txtuin16.h5
+++ b/tools/h5import/testfiles/test5.h5
diff --git a/tools/h5import/testfiles/txtfp32.h5 b/tools/h5import/testfiles/test6.h5
index f74e003..f74e003 100644
--- a/tools/h5import/testfiles/txtfp32.h5
+++ b/tools/h5import/testfiles/test6.h5
diff --git a/tools/h5import/testfiles/txtfp64.h5 b/tools/h5import/testfiles/test7.h5
index b6ba4f5..b6ba4f5 100644
--- a/tools/h5import/testfiles/txtfp64.h5
+++ b/tools/h5import/testfiles/test7.h5
diff --git a/tools/h5import/testfiles/binfp64.h5 b/tools/h5import/testfiles/test8.h5
index 80e3a8a..80e3a8a 100644
--- a/tools/h5import/testfiles/binfp64.h5
+++ b/tools/h5import/testfiles/test8.h5
diff --git a/tools/h5import/testfiles/binin16.h5 b/tools/h5import/testfiles/test9.h5
index 0825bbc..0825bbc 100644
--- a/tools/h5import/testfiles/binin16.h5
+++ b/tools/h5import/testfiles/test9.h5
diff --git a/tools/h5import/testfiles/txtstr.h5 b/tools/h5import/testfiles/teststr.h5
index ceb0810..ceb0810 100644
--- a/tools/h5import/testfiles/txtstr.h5
+++ b/tools/h5import/testfiles/teststr.h5
diff --git a/tools/h5import/testfiles/txtfp32.conf b/tools/h5import/testfiles/textfp32
index 9696a7f..9696a7f 100755
--- a/tools/h5import/testfiles/txtfp32.conf
+++ b/tools/h5import/testfiles/textfp32
diff --git a/tools/h5import/testfiles/txtfp64.conf b/tools/h5import/testfiles/textfp64
index fbab6a6..fbab6a6 100755
--- a/tools/h5import/testfiles/txtfp64.conf
+++ b/tools/h5import/testfiles/textfp64
diff --git a/tools/h5import/testfiles/txtin16.conf b/tools/h5import/testfiles/textin16
index d2d11c3..d2d11c3 100755
--- a/tools/h5import/testfiles/txtin16.conf
+++ b/tools/h5import/testfiles/textin16
diff --git a/tools/h5import/testfiles/txtin32.conf b/tools/h5import/testfiles/textin32
index ca4802a..ca4802a 100755
--- a/tools/h5import/testfiles/txtin32.conf
+++ b/tools/h5import/testfiles/textin32
diff --git a/tools/h5import/testfiles/txtin8.conf b/tools/h5import/testfiles/textin8
index 4405338..4405338 100755
--- a/tools/h5import/testfiles/txtin8.conf
+++ b/tools/h5import/testfiles/textin8
diff --git a/tools/h5import/testfiles/txtstr.conf b/tools/h5import/testfiles/textstr
index 85079e0..85079e0 100644
--- a/tools/h5import/testfiles/txtstr.conf
+++ b/tools/h5import/testfiles/textstr
diff --git a/tools/h5import/testfiles/txtuin16.conf b/tools/h5import/testfiles/textuin16
index 753e6e8..753e6e8 100755
--- a/tools/h5import/testfiles/txtuin16.conf
+++ b/tools/h5import/testfiles/textuin16
diff --git a/tools/h5import/testfiles/txtuin32.conf b/tools/h5import/testfiles/textuin32
index d61e1a1..d61e1a1 100755
--- a/tools/h5import/testfiles/txtuin32.conf
+++ b/tools/h5import/testfiles/textuin32
diff --git a/tools/h5import/testfiles/txtin16.txt b/tools/h5import/testfiles/txtin16.txt
deleted file mode 100644
index 0688e9b..0000000
--- a/tools/h5import/testfiles/txtin16.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-        83        85        87        89
-        84        86        88        90
-        85        87        89        91
-        88        90        92        94
-        89        91        93        95
-        90        92        94        96
-        93        95        97        99
-        94        96        98       100
-        95        97        99       101
-        98       100       102       104
-        99       101       103       105
-       100       102       104       106
-       103       105       107       109
-       104       106       108       110
-       105       107       109       111
diff --git a/tools/h5import/testfiles/txtin32.txt b/tools/h5import/testfiles/txtin32.txt
deleted file mode 100644
index 0688e9b..0000000
--- a/tools/h5import/testfiles/txtin32.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-        83        85        87        89
-        84        86        88        90
-        85        87        89        91
-        88        90        92        94
-        89        91        93        95
-        90        92        94        96
-        93        95        97        99
-        94        96        98       100
-        95        97        99       101
-        98       100       102       104
-        99       101       103       105
-       100       102       104       106
-       103       105       107       109
-       104       106       108       110
-       105       107       109       111
diff --git a/tools/h5import/testfiles/txtstr.txt b/tools/h5import/testfiles/txtstr
index 25be0a6..25be0a6 100644
--- a/tools/h5import/testfiles/txtstr.txt
+++ b/tools/h5import/testfiles/txtstr
diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index febf7d7..954f3e7 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -45,7 +45,7 @@ static int have_request(pack_opt_t *options);
  * Purpose: locate all high-level HDF5 objects in the file
  *  and compress/chunk them using options
  *
- * Algorithm: 2 traversals are made to the file; the 1st builds a list of
+ * Algorythm: 2 traversals are made to the file; the 1st builds a list of
  *  the objects, the 2nd makes a copy of them, using the options;
  *  the reason for the 1st traversal is to check for invalid
  *  object name requests
diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h
index 80fb1b0..baa888e 100644
--- a/tools/h5repack/h5repack.h
+++ b/tools/h5repack/h5repack.h
@@ -19,12 +19,17 @@
 
 #include "hdf5.h"
 #include "h5trav.h"
+#include "H5Zprivate.h"	/* H5Z_COMMON_CD_VALUES */	
+
+
 
 #define H5FOPENERROR "unable to open file"
-#define PFORMAT  "%-7s %-7s %-7s\n"   /* chunk info, compression info, name*/
-#define PFORMAT1 "%-7s %-7s %-7s"     /* chunk info, compression info, name*/
-#define MAX_NC_NAME 256               /* max length of a name */
-#define MAX_VAR_DIMS 32               /* max per variable dimensions */
+
+#define PFORMAT  "%-7s %-7s %-7s\n" /*chunk info, compression info, name*/
+#define PFORMAT1 "%-7s %-7s %-7s"     /*chunk info, compression info, name*/
+
+#define MAX_NC_NAME 256 /* max length of a name */
+#define MAX_VAR_DIMS 32 /* max per variable dimensions */
 
 /*-------------------------------------------------------------------------
  * data structures for command line options
@@ -48,6 +53,7 @@ typedef struct {
  H5Z_FILTER_SCALEOFFSET 6 , scaleoffset compression
 */
 
+/* #define CD_VALUES H5Z_COMMON_CD_VALUES */
 #define CD_VALUES 20
 
 typedef struct {
diff --git a/tools/h5stat/h5stat_gentest.c b/tools/h5stat/h5stat_gentest.c
index ef644d8..28d20ce 100644
--- a/tools/h5stat/h5stat_gentest.c
+++ b/tools/h5stat/h5stat_gentest.c
@@ -29,7 +29,7 @@
 #define DATASET_NAME	"DATASET_NAME"
 #define GROUP_NAME	"GROUP"
 #define ATTR_NAME	"ATTR"
-#define NUM_GRPS 	35000
+#define NUM_GRPS 	350
 #define NUM_ATTRS	100
 
 /* 
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.ddl b/tools/h5stat/testfiles/h5stat_newgrat.ddl
index d704f00..6881ca9 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat.ddl
@@ -3,20 +3,20 @@ Expected output for 'h5stat h5stat_newgrat.h5'
 #############################
 Filename: h5stat_newgrat.h5
 File information
-	# of unique groups: 35001
+	# of unique groups: 351
 	# of unique datasets: 1
 	# of unique named dataypes: 0
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
-	Max. # of objects in group: 35001
+	Max. # of objects in group: 351
 Object header size: (total/unused)
-	Groups: 5145147/3220092
+	Groups: 51597/32292
 	Datasets: 414/312
 Storage information:
 	Groups:
-		B-tree/List: 470054
-		Heap: 739128
+		B-tree/List: 5158
+		Heap: 7643
 	Attributes:
 		B-tree/List: 2598
 		Heap: 4442
@@ -28,12 +28,12 @@ Storage information:
 		Heap: 0
 	Superblock extension: 0
 Small groups:
-	# of groups of size 0: 35000
-	Total # of small groups: 35000
+	# of groups of size 0: 350
+	Total # of small groups: 350
 Group bins:
-	# of groups of size 0: 35000
-	# of groups of size 10000 - 99999: 1
-	Total # of groups: 35001
+	# of groups of size 0: 350
+	# of groups of size 100 - 999: 1
+	Total # of groups: 351
 Dataset dimension information:
 	Max. rank of datasets: 0
 	Dataset ranks:
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.h5 b/tools/h5stat/testfiles/h5stat_newgrat.h5
index 8083122..cab98bb 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat.h5
+++ b/tools/h5stat/testfiles/h5stat_newgrat.h5
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 9d64e44..4f4074f 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -47,7 +47,7 @@
 int
 print_objname (diff_opt_t * options, hsize_t nfound)
 {
-    return ((options->m_verbose || nfound) && !options->m_quiet) ? 1 : 0;
+ return ((options->m_verbose || nfound) && !options->m_quiet) ? 1 : 0;
 }
 
 /*-------------------------------------------------------------------------
@@ -186,17 +186,15 @@ hsize_t h5diff(const char *fname1,
                const char *objname2,
                diff_opt_t *options)
 {
-    trav_info_t  *info1=NULL;
-    trav_info_t  *info2=NULL;
-    hid_t        file1_id = (-1);
-    hid_t        file2_id = (-1);
+    trav_info_t  *info1;
+    trav_info_t  *info2;
+    hid_t        file1_id = (-1), file2_id = (-1);
     char         filenames[2][1024];
     hsize_t      nfound = 0;
 
     HDmemset(filenames, 0, 1024 * 2);
 
-    if(options->m_quiet && (options->m_verbose || options->m_report)) 
-    {
+    if(options->m_quiet && (options->m_verbose || options->m_report)) {
         printf("Error: -q (quiet mode) cannot be added to verbose or report modes\n");
         options->err_stat=1;
         return 0;
@@ -208,11 +206,9 @@ hsize_t h5diff(const char *fname1,
     */
 
     /* disable error reporting */
-    H5E_BEGIN_TRY 
-    {
-        /* open the files */
-        if((file1_id = H5Fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) 
-        {
+    H5E_BEGIN_TRY {
+        /* Open the files */
+        if((file1_id = H5Fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
             printf("h5diff: <%s>: unable to open file\n", fname1);
             options->err_stat = 1;
 
@@ -223,8 +219,7 @@ hsize_t h5diff(const char *fname1,
 #endif
             goto out;
         } /* end if */
-        if((file2_id = H5Fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) 
-        {
+        if((file2_id = H5Fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
             printf("h5diff: <%s>: unable to open file\n", fname2);
             options->err_stat = 1;
 
@@ -260,12 +255,11 @@ hsize_t h5diff(const char *fname1,
         goto out;
     } /* end if */
 
-   /*-------------------------------------------------------------------------
+    /*-------------------------------------------------------------------------
     * object name was supplied
     *-------------------------------------------------------------------------
     */
-    if( objname1 ) 
-    {
+    if(objname1) {
 #ifdef H5_HAVE_PARALLEL
         if(g_Parallel)
             /* Let tasks know that they won't be needed */
@@ -273,31 +267,22 @@ hsize_t h5diff(const char *fname1,
 #endif
         assert(objname2);
         options->cmn_objs = 1; /* eliminate warning */
-        nfound = diff_compare(file1_id, 
-                              fname1, 
-                              objname1, 
-                              info1,
-                              file2_id, 
-                              fname2, 
-                              objname2, 
-                              info2,
+        nfound = diff_compare(file1_id, fname1, objname1, info1,
+                              file2_id, fname2, objname2, info2,
                               options);
     } /* end if */
 
-   /*-------------------------------------------------------------------------
+    /*-------------------------------------------------------------------------
     * compare all
     *-------------------------------------------------------------------------
     */
 
-    else 
-    {
+    else {
 #ifdef H5_HAVE_PARALLEL
-        if(g_Parallel) 
-        {
+        if(g_Parallel) {
             int i;
 
-            if((HDstrlen(fname1) > 1024) || (HDstrlen(fname2) > 1024)) 
-            {
+            if((HDstrlen(fname1) > 1024) || (HDstrlen(fname2) > 1024)) {
                 fprintf(stderr, "The parallel diff only supports path names up to 1024 characters\n");
                 MPI_Abort(MPI_COMM_WORLD, 0);
             } /* end if */
@@ -310,12 +295,7 @@ hsize_t h5diff(const char *fname1,
                 MPI_Send(filenames, (1024 * 2), MPI_CHAR, i, MPI_TAG_PARALLEL, MPI_COMM_WORLD);
         } /* end if */
 #endif
-
-        nfound = diff_match(file1_id, 
-                            info1, 
-                            file2_id, 
-                            info2, 
-                            options);
+        nfound = diff_match(file1_id, info1, file2_id, info2, options);
     } /* end else */
 
     trav_info_free(info1);
@@ -323,8 +303,7 @@ hsize_t h5diff(const char *fname1,
 
 out:
     /* close */
-    H5E_BEGIN_TRY 
-    {
+    H5E_BEGIN_TRY {
         H5Fclose(file1_id);
         H5Fclose(file2_id);
     } H5E_END_TRY;
@@ -353,23 +332,22 @@ out:
  *-------------------------------------------------------------------------
  */
 hsize_t diff_match(hid_t file1_id,
-                   trav_info_t *info1,
-                   hid_t file2_id,
-                   trav_info_t *info2,
-                   diff_opt_t *options)
+                    trav_info_t * info1,
+                    hid_t file2_id,
+                    trav_info_t * info2,
+                    diff_opt_t * options)
 {
     trav_table_t *table = NULL;
-    size_t       curr1;
-    size_t       curr2;
-    unsigned     infile[2];
-    hsize_t      nfound = 0;
-    unsigned     i;
+    size_t curr1, curr2;
+    unsigned infile[2];
+    hsize_t nfound = 0;
+    unsigned i;
 
     /*-------------------------------------------------------------------------
     * build the list
     *-------------------------------------------------------------------------
     */
-    trav_table_init( &table );
+    trav_table_init(&table);
 
     curr1 = 0;
     curr2 = 0;
@@ -415,12 +393,11 @@ hsize_t diff_match(hid_t file1_id,
         curr2++;
     } /* end while */
 
-   /*-------------------------------------------------------------------------
+    /*-------------------------------------------------------------------------
     * print the list
     *-------------------------------------------------------------------------
     */
-    if(options->m_verbose) 
-    {
+    if(options->m_verbose) {
         printf("\n");
         printf("file1     file2\n");
         printf("---------------------------------------\n");
@@ -725,64 +702,59 @@ hsize_t diff_match(hid_t file1_id,
  *-------------------------------------------------------------------------
  */
 
-hsize_t diff_compare(hid_t file1_id,
-                     const char *file1_name,
-                     const char *obj1_name,
-                     trav_info_t *info1,
-                     hid_t file2_id,
-                     const char *file2_name,
-                     const char *obj2_name,
-                     trav_info_t *info2,
-                     diff_opt_t *options)
+hsize_t diff_compare (hid_t file1_id,
+                      const char *file1_name,
+                      const char *obj1_name,
+                      trav_info_t * info1,
+                      hid_t file2_id,
+                      const char *file2_name,
+                      const char *obj2_name,
+                      trav_info_t * info2,
+                      diff_opt_t * options)
 {
-    int     f1 = 0;
-    int     f2 = 0;
-    hsize_t nfound = 0;
-    
-    ssize_t i = h5trav_getindex (info1, obj1_name);
-    ssize_t j = h5trav_getindex (info2, obj2_name);
-    
-    if (i == -1)
-    {
-        parallel_print ("Object <%s> could not be found in <%s>\n", obj1_name,
-            file1_name);
-        f1 = 1;
-    }
-    if (j == -1)
-    {
-        parallel_print ("Object <%s> could not be found in <%s>\n", obj2_name,
-            file2_name);
-        f2 = 1;
-    }
-    if (f1 || f2)
-    {
-        options->err_stat = 1;
-        return 0;
-    }
-    
-    /* use the name with "/" first, as obtained by iterator function */
-    obj1_name = info1->paths[i].path;
-    obj2_name = info2->paths[j].path;
-    
-    /* objects are not the same type */
-    if (info1->paths[i].type != info2->paths[j].type)
-    {
-        if (options->m_verbose)
-            parallel_print("Comparison not possible: <%s> is of type %s and <%s> is of type %s\n",
-            obj1_name, get_type(info1->paths[i].type), obj2_name,
-            get_type(info2->paths[j].type));
-        options->not_cmp=1;
-        return 0;
-    }
-    
-    nfound = diff(file1_id, 
-                  obj1_name, 
-                  file2_id, 
-                  obj2_name, 
-                  options, 
-                  info1->paths[i].type);
-    
-    return nfound;
+ int f1 = 0, f2 = 0;
+ hsize_t nfound = 0;
+
+ ssize_t i = h5trav_getindex (info1, obj1_name);
+ ssize_t j = h5trav_getindex (info2, obj2_name);
+
+ if (i == -1)
+ {
+  parallel_print ("Object <%s> could not be found in <%s>\n", obj1_name,
+   file1_name);
+  f1 = 1;
+ }
+ if (j == -1)
+ {
+  parallel_print ("Object <%s> could not be found in <%s>\n", obj2_name,
+   file2_name);
+  f2 = 1;
+ }
+ if (f1 || f2)
+ {
+  options->err_stat = 1;
+  return 0;
+ }
+
+ /* use the name with "/" first, as obtained by iterator function */
+ obj1_name = info1->paths[i].path;
+ obj2_name = info2->paths[j].path;
+
+ /* objects are not the same type */
+ if (info1->paths[i].type != info2->paths[j].type)
+ {
+  if (options->m_verbose)
+   parallel_print("Comparison not possible: <%s> is of type %s and <%s> is of type %s\n",
+     obj1_name, get_type(info1->paths[i].type), obj2_name,
+     get_type(info2->paths[j].type));
+  options->not_cmp=1;
+  return 0;
+ }
+
+ nfound =
+  diff (file1_id, obj1_name, file2_id, obj2_name, options, info1->paths[i].type);
+
+ return nfound;
 }
 
 
@@ -812,15 +784,14 @@ hsize_t diff(hid_t file1_id,
               diff_opt_t * options, 
               h5trav_type_t type)
 {
-    hid_t   type1_id = (-1);
-    hid_t   type2_id = (-1);
-    hid_t   grp1_id = (-1);
-    hid_t   grp2_id = (-1);
-    int     ret;
+    hid_t       type1_id = (-1);
+    hid_t       type2_id = (-1);
+    hid_t       grp1_id = (-1);
+    hid_t       grp2_id = (-1);
+    int ret;
     hsize_t nfound = 0;
     
-    switch(type) 
-    {
+    switch(type) {
        /*-------------------------------------------------------------------------
         * H5TRAV_TYPE_DATASET
         *-------------------------------------------------------------------------
@@ -830,8 +801,7 @@ hsize_t diff(hid_t file1_id,
             * verbose, always print name
             *-------------------------------------------------------------------------
             */
-            if(options->m_verbose) 
-            {
+            if(options->m_verbose) {
                 if(print_objname(options, (hsize_t)1))
                     do_print_objname("dataset", path1, path2);
                 nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
@@ -843,18 +813,15 @@ hsize_t diff(hid_t file1_id,
             * disabling quiet mode
             *-------------------------------------------------------------------------
             */
-            else 
-            {
-                if(options->m_quiet == 0) 
-                {
+            else {
+                if(options->m_quiet == 0) {
                     /* shut up temporarily */
                     options->m_quiet = 1;
                     nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
 
                     /* print again */
                     options->m_quiet = 0;
-                    if(nfound) 
-                    {
+                    if(nfound) {
                         if(print_objname(options,nfound))
                             do_print_objname("dataset", path1, path2);
                         nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index c5646ed..008b6b9 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -119,7 +119,7 @@ static int   not_comparable;
     is_zero=1;                                       \
 }
 
-#define PDIFF(a,b)      ( (b>a) ? (b-a) : (a-b))
+#   define PDIFF(a,b)		( (b>a) ? (b-a) : (a-b))
 
 /*-------------------------------------------------------------------------
  * local prototypes
@@ -127,12 +127,11 @@ static int   not_comparable;
  */
 static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id,hid_t region1_id, hid_t region2_id, diff_opt_t *options);
 static hbool_t all_zero(const void *_mem, size_t size);
+static int     ull2float(unsigned long_long ull_value, float *f_value);
 static hsize_t character_compare(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
 static hsize_t character_compare_opt(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
 static hbool_t equal_float(float value, float expected);
 static hbool_t equal_double(double value, double expected);
-static int     ull2float(unsigned long_long ull_value, float *f_value);
-
 
 /*-------------------------------------------------------------------------
  * NaN detection
@@ -267,6 +266,8 @@ hsize_t diff_array( void *_mem1,
     size_t        size;              /* size of datum */
     unsigned char *mem1 = (unsigned char*)_mem1;
     unsigned char *mem2 = (unsigned char*)_mem2;
+    unsigned char *tmp1;
+    unsigned char *tmp2;
     hsize_t       acc[32];    /* accumulator position */
     hsize_t       pos[32];    /* matrix position */
     int           ph=1;       /* print header  */
@@ -287,26 +288,23 @@ hsize_t diff_array( void *_mem1,
     
     if(H5Tis_variable_str(m_type))
     {
-        for ( i = 0; i < nelmts; i++)
-        {
-            nfound+=diff_datum(
-                ((unsigned char**)mem1)[(size_t)i],
-                ((unsigned char**)mem2)[(size_t)i],
-                m_type,
-                i,
-                rank,
-                dims,
-                acc,
-                pos,
-                options,
-                name1,
-                name2,
-                container1_id,
-                container2_id,
-                &ph);
-            if (options->n && nfound>=options->count)
-                return nfound;
-        } /* i */
+        tmp1 = ((unsigned char**)mem1)[0];
+        tmp2 = ((unsigned char**)mem2)[0];
+        nfound+=diff_datum(
+            tmp1,
+            tmp2,
+            m_type,
+            (hsize_t)0,
+            rank,
+            dims,
+            acc,
+            pos,
+            options,
+            name1,
+            name2,
+            container1_id,
+            container2_id,
+            &ph);
     }
     
     else
@@ -517,35 +515,42 @@ hsize_t diff_datum(void       *_mem1,
     case H5T_STRING:
 
         {
+            
             H5T_str_t pad;
             char      *s;
             
-            /* Get pointer to first string to compare */
-            s = (char *)mem1;
-
-            /* check for NULL pointer for string */
-            if(s!=NULL)
+            if(H5Tis_variable_str(m_type))
             {
-                if(H5Tis_variable_str(m_type))
+               /* mem1 is the pointer into the struct where a `char*' is stored. So we have
+                * to dereference the pointer to get the `char*' to pass to HDstrlen(). */
+                s = *(char**)mem1;
+                if(s!=NULL)
                     size = HDstrlen(s);
-                else
-                    size = H5Tget_size(m_type);
-                
-                pad = H5Tget_strpad(m_type);
+            }
+            else
+            {
+                s = (char *)mem1;
+                size = H5Tget_size(m_type);
+            }
+            
+            pad = H5Tget_strpad(m_type);
             
+            /* check for NULL pointer for string */
+            if(s!=NULL)
+            {
                 for (u=0; u<size && (s[u] || pad!=H5T_STR_NULLTERM); u++)
                     nfound+=character_compare(
-                        mem1 + u,
-                        mem2 + u, /* offset */
-                        i,        /* index position */
-                        rank,
-                        dims,
-                        acc,
-                        pos,
-                        options,
-                        obj1,
-                        obj2,
-                        ph);
+                    mem1 + u,
+                    mem2 + u, /* offset */
+                    i,        /* index position */
+                    rank,
+                    dims,
+                    acc,
+                    pos,
+                    options,
+                    obj1,
+                    obj2,
+                    ph);
             }
                 
         }
@@ -692,6 +697,7 @@ hsize_t diff_datum(void       *_mem1,
             H5Tclose(memb_type);
         }
         break;
+        
    
         
    /*-------------------------------------------------------------------------
@@ -2861,6 +2867,7 @@ hsize_t diff_float(unsigned char *mem1,
 }
 
 
+
 /*-------------------------------------------------------------------------
  * Function: diff_double
  *
@@ -2890,111 +2897,80 @@ hsize_t diff_double(unsigned char *mem1,
     hsize_t     i;
     double      per;
     int         both_zero;
-    int         isnan1;
-    int         isnan2;
     
-
- /*-------------------------------------------------------------------------
-  * -d and !-p 
-  *-------------------------------------------------------------------------
-  */
- 
+    
+    /* -d and !-p */
     if (options->d && !options->p)
     {
+        
         for ( i = 0; i < nelmts; i++)
         {
             memcpy(&temp1_double, mem1, sizeof(double));
             memcpy(&temp2_double, mem2, sizeof(double));
-
-           /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
-            isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
-
-            if ( !isnan1 && !isnan2)
-            {             
-                if (ABS(temp1_double-temp2_double) > options->delta)
+            
+            if (ABS(temp1_double-temp2_double) > options->delta)
+            {
+                if ( print_data(options) )
                 {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
-                    }
-                    nfound++;
+                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
                 }
-            } /* NaN */
+                nfound++;
+            }
             mem1+=sizeof(double);
             mem2+=sizeof(double);
             if (options->n && nfound>=options->count)
                 return nfound;
-        } /* i */
+        }
     }
-
- /*-------------------------------------------------------------------------
-  * !-d and -p 
-  *-------------------------------------------------------------------------
-  */
+    
+    /* !-d and -p */
     else if (!options->d && options->p)
     {
+        
         for ( i = 0; i < nelmts; i++)
         {
             memcpy(&temp1_double, mem1, sizeof(double));
             memcpy(&temp2_double, mem2, sizeof(double));
             
-           /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
-            isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+            PER(temp1_double,temp2_double);
             
-            if ( !isnan1 && !isnan2)
-            {        
-                
-                PER(temp1_double,temp2_double);
+            if (not_comparable && !both_zero) /* not comparable */
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                        ABS(temp1_double-temp2_double));
+                }
+                options->not_cmp=1;
+                nfound++;
+            }
+            
+            else
                 
-                if (not_comparable && !both_zero) /* not comparable */
+                if ( per > options->percent )
                 {
                     if ( print_data(options) )
                     {
                         print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                            ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT_P,temp1_double,temp2_double,
+                            ABS(temp1_double-temp2_double),
+                            ABS(1-temp2_double/temp1_double));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
-                
-                else
-                    
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P,temp1_double,temp2_double,
-                                ABS(temp1_double-temp2_double),
-                                ABS(1-temp2_double/temp1_double));
-                        }
-                        nfound++;
-                    }
-            } /* NaN */
-            mem1+=sizeof(double);
-            mem2+=sizeof(double);
-            if (options->n && nfound>=options->count)
-                return nfound;
-        } /* i */
+                mem1+=sizeof(double);
+                mem2+=sizeof(double);
+                if (options->n && nfound>=options->count)
+                    return nfound;
+        }
     }
     
- /*-------------------------------------------------------------------------
-  * -d and -p 
-  *-------------------------------------------------------------------------
-  */
+    /* -d and -p */
     else if ( options->d && options->p)
     {
         
@@ -3003,58 +2979,41 @@ hsize_t diff_double(unsigned char *mem1,
             memcpy(&temp1_double, mem1, sizeof(double));
             memcpy(&temp2_double, mem2, sizeof(double));
             
-            /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
-            isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+            PER(temp1_double,temp2_double);
             
-            if ( !isnan1 && !isnan2)
-            {        
-                
-                PER(temp1_double,temp2_double);
+            if (not_comparable && !both_zero) /* not comparable */
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                        ABS(temp1_double-temp2_double));
+                }
+                options->not_cmp=1;
+                nfound++;
+            }
+            
+            else
                 
-                if (not_comparable && !both_zero) /* not comparable */
+                if ( per > options->percent && ABS(temp1_double-temp2_double) > options->delta )
                 {
                     if ( print_data(options) )
                     {
                         print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                            ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT_P,temp1_double,temp2_double,
+                            ABS(temp1_double-temp2_double),
+                            ABS(1-temp2_double/temp1_double));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
-                
-                else
-                    
-                    if ( per > options->percent && ABS(temp1_double-temp2_double) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P,temp1_double,temp2_double,
-                                ABS(temp1_double-temp2_double),
-                                ABS(1-temp2_double/temp1_double));
-                        }
-                        nfound++;
-                    }
-                    
-            } /* NaN */
-            mem1+=sizeof(double);
-            mem2+=sizeof(double);
-            if (options->n && nfound>=options->count)
-                return nfound;
-        } /* i */
+                mem1+=sizeof(double);
+                mem2+=sizeof(double);
+                if (options->n && nfound>=options->count)
+                    return nfound;
+        }
     }
-
- /*-------------------------------------------------------------------------
-  * no -d and -p 
-  *-------------------------------------------------------------------------
-  */
     else
     {
         
@@ -3085,9 +3044,6 @@ hsize_t diff_double(unsigned char *mem1,
     return nfound;
 }
 
-
-
-
 /*-------------------------------------------------------------------------
  * Function: diff_schar
  *
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index 3f4e6a3..ea833db 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -19,6 +19,33 @@
 #include "h5tools.h"
 
 /*-------------------------------------------------------------------------
+ * Function: print_size
+ *
+ * Purpose: print dimensions 
+ *
+ *-------------------------------------------------------------------------
+ */
+#if defined (H5DIFF_DEBUG)
+static void
+print_size (int rank, hsize_t *dims)
+{
+    int i;
+
+    parallel_print("[" );
+    for ( i = 0; i < rank-1; i++)
+    {
+        parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[i]);
+        parallel_print("x");
+    }
+    parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[rank-1]);
+    parallel_print("]\n" );
+    
+}
+#endif /* H5DIFF_DEBUG */
+
+
+
+/*-------------------------------------------------------------------------
  * Function: diff_dataset
  *
  * Purpose: check for comparable datasets and read into a compatible
@@ -38,85 +65,79 @@ hsize_t diff_dataset( hid_t file1_id,
                       const char *obj2_name,
                       diff_opt_t *options)
 {
-    hid_t   did1 = -1;
-    hid_t   did2 = -1;
-    hid_t   dcpl1 = -1;
-    hid_t   dcpl2 = -1;
-    hsize_t nfound = 0;
-    
-   /*-------------------------------------------------------------------------
-    * open the handles
-    *-------------------------------------------------------------------------
-    */
-    /* disable error reporting */
-    H5E_BEGIN_TRY 
-    {
-        /* open the datasets */
-        if((did1 = H5Dopen2(file1_id, obj1_name, H5P_DEFAULT)) < 0) 
-        {
-            printf("Cannot open dataset <%s>\n", obj1_name);
-            goto error;
-        }
-        
-        if((did2 = H5Dopen2(file2_id, obj2_name, H5P_DEFAULT)) < 0) 
-        {
-            printf("Cannot open dataset <%s>\n", obj2_name);
-            goto error;
-        }
-        /* enable error reporting */
-    } H5E_END_TRY;
-    
-    
-    if ((dcpl1 = H5Dget_create_plist(did1)) < 0)
-        goto error;
-    if ((dcpl2 = H5Dget_create_plist(did2)) < 0)
-        goto error;
-    
-   /*-------------------------------------------------------------------------
-    * check if the dataset creation property list has filters that
-    * are not registered in the current configuration
-    * 1) the external filters GZIP and SZIP might not be available
-    * 2) the internal filters might be turned off
-    *-------------------------------------------------------------------------
-    */
-    if ((h5tools_canreadf((options->m_verbose?obj1_name:NULL),dcpl1)==1) &&
-        (h5tools_canreadf((options->m_verbose?obj2_name:NULL),dcpl2)==1))
-    {
-        nfound=diff_datasetid(did1,
-            did2,
-            obj1_name,
-            obj2_name,
-            options);
-    }
-   /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-    /* disable error reporting */
-    H5E_BEGIN_TRY 
-    {
-        H5Pclose(dcpl1);
-        H5Pclose(dcpl2);
-        H5Dclose(did1);
-        H5Dclose(did2);
-        /* enable error reporting */
-    } H5E_END_TRY;
-    
-    return nfound;
-    
+ hid_t   did1 = -1;
+ hid_t   did2 = -1;
+ hid_t   dcpl1 = -1;
+ hid_t   dcpl2 = -1;
+ hsize_t nfound = 0;
+
+/*-------------------------------------------------------------------------
+ * open the handles
+ *-------------------------------------------------------------------------
+ */
+ /* disable error reporting */
+ H5E_BEGIN_TRY {
+ /* Open the datasets */
+ if((did1 = H5Dopen2(file1_id, obj1_name, H5P_DEFAULT)) < 0) {
+  printf("Cannot open dataset <%s>\n", obj1_name);
+  goto error;
+ }
+ if((did2 = H5Dopen2(file2_id, obj2_name, H5P_DEFAULT)) < 0) {
+  printf("Cannot open dataset <%s>\n", obj2_name);
+  goto error;
+ }
+ /* enable error reporting */
+ } H5E_END_TRY;
+
+
+ if((dcpl1 = H5Dget_create_plist(did1)) < 0)
+  goto error;
+ if((dcpl2 = H5Dget_create_plist(did2)) < 0)
+  goto error;
+
+/*-------------------------------------------------------------------------
+ * check if the dataset creation property list has filters that
+ * are not registered in the current configuration
+ * 1) the external filters GZIP and SZIP might not be available
+ * 2) the internal filters might be turned off
+ *-------------------------------------------------------------------------
+ */
+ if ((h5tools_canreadf((options->m_verbose?obj1_name:NULL),dcpl1)==1) &&
+     (h5tools_canreadf((options->m_verbose?obj2_name:NULL),dcpl2)==1))
+ {
+  nfound=diff_datasetid(did1,
+                        did2,
+                        obj1_name,
+                        obj2_name,
+                        options);
+ }
+/*-------------------------------------------------------------------------
+ * close
+ *-------------------------------------------------------------------------
+ */
+ /* disable error reporting */
+ H5E_BEGIN_TRY {
+  H5Pclose(dcpl1);
+  H5Pclose(dcpl2);
+  H5Dclose(did1);
+  H5Dclose(did2);
+   /* enable error reporting */
+ } H5E_END_TRY;
+
+ return nfound;
+
 error:
-    options->err_stat=1;
-    /* disable error reporting */
-    H5E_BEGIN_TRY 
-    {
-        H5Pclose(dcpl1);
-        H5Pclose(dcpl2);
-        H5Dclose(did1);
-        H5Dclose(did2);
-        /* enable error reporting */
-    } H5E_END_TRY;
-    
-    return nfound;
+ options->err_stat=1;
+ /* disable error reporting */
+ H5E_BEGIN_TRY {
+  H5Pclose(dcpl1);
+  H5Pclose(dcpl2);
+  H5Dclose(did1);
+  H5Dclose(did2);
+   /* enable error reporting */
+ } H5E_END_TRY;
+
+ return nfound;
 }
 
 /*-------------------------------------------------------------------------
@@ -133,6 +154,7 @@ error:
  *
  * Modifications: 
  *
+ *
  * October 2006:  Read by hyperslabs for big datasets.
  *
  *  A threshold of H5TOOLS_MALLOCSIZE (128 MB) is the limit upon which I/O hyperslab is done
@@ -182,456 +204,448 @@ hsize_t diff_datasetid( hid_t did1,
                         const char *obj2_name,
                         diff_opt_t *options)
 {
-    hid_t      sid1=-1;
-    hid_t      sid2=-1;
-    hid_t      f_tid1=-1;
-    hid_t      f_tid2=-1;                
-    hid_t      m_tid1=-1;
-    hid_t      m_tid2=-1;                
-    size_t     m_size1;
-    size_t     m_size2;               
-    H5T_sign_t sign1;
-    H5T_sign_t sign2;                 
-    int        rank1;
-    int        rank2;
-    hsize_t    nelmts1;
-    hsize_t    nelmts2;
-    hsize_t    dims1[H5S_MAX_RANK];
-    hsize_t    dims2[H5S_MAX_RANK];
-    hsize_t    maxdim1[H5S_MAX_RANK];
-    hsize_t    maxdim2[H5S_MAX_RANK];
-    const char *name1=NULL;            /* relative names */
-    const char *name2=NULL;
-    hsize_t    storage_size1;
-    hsize_t    storage_size2;
-    hsize_t    nfound=0;               /* number of differences found */
-    int        cmp=1;                  /* do diff or not */
-    void       *buf1=NULL;                  
-    void       *buf2=NULL; 
-    void       *sm_buf1=NULL;                
-    void       *sm_buf2=NULL;
-    size_t     need;                   /* bytes needed for malloc */
-    int        i;
-    
-    /* get the dataspace handle */
-    if ( (sid1 = H5Dget_space(did1)) < 0 )
-        goto error;
-    
-    /* get rank */
-    if ( (rank1 = H5Sget_simple_extent_ndims(sid1)) < 0 )
-        goto error;
-    
-    /* get the dataspace handle */
-    if ( (sid2 = H5Dget_space(did2)) < 0 )
-        goto error;
-    
-    /* get rank */
-    if ( (rank2 = H5Sget_simple_extent_ndims(sid2)) < 0 )
-        goto error;
-    
-    /* get dimensions */
-    if ( H5Sget_simple_extent_dims(sid1,dims1,maxdim1) < 0 )
-        goto error;
-    
-    /* get dimensions */
-    if ( H5Sget_simple_extent_dims(sid2,dims2,maxdim2) < 0 )
-        goto error;
-    
-    /*-------------------------------------------------------------------------
-     * get the file data type
-     *-------------------------------------------------------------------------
-     */
-    
-    /* get the data type */
-    if ( (f_tid1 = H5Dget_type(did1)) < 0 )
-        goto error;
-    
-    /* get the data type */
-    if ( (f_tid2 = H5Dget_type(did2)) < 0 )
-        goto error;
-    
-    /*-------------------------------------------------------------------------
-     * check for empty datasets
-     *-------------------------------------------------------------------------
-     */
-    
-    storage_size1=H5Dget_storage_size(did1);
-    storage_size2=H5Dget_storage_size(did2);
-    if (storage_size1<0 || storage_size2<0)
-        goto error;
-    
-    if (storage_size1==0 || storage_size2==0)
-    {
-        if (options->m_verbose && obj1_name && obj2_name)
-            parallel_print("<%s> or <%s> are empty datasets\n", obj1_name, obj2_name);
-        cmp=0;
-        options->not_cmp=1;
-    }
-    
-   /*-------------------------------------------------------------------------
-    * check for comparable TYPE and SPACE
-    *-------------------------------------------------------------------------
-    */
-    
-    if (diff_can_type(f_tid1,
-        f_tid2,
-        rank1,
-        rank2,
-        dims1,
-        dims2,
-        maxdim1,
-        maxdim2,
-        obj1_name,
-        obj2_name,
-        options)!=1)
-    {
-        cmp=0;
-        options->not_cmp=1;
-    }
-    
-   /*-------------------------------------------------------------------------
-    * memory type and sizes
-    *-------------------------------------------------------------------------
-    */
-    if ((m_tid1=h5tools_get_native_type(f_tid1)) < 0)
-        goto error;
-    
-    if ((m_tid2=h5tools_get_native_type(f_tid2)) < 0)
-        goto error;
-    
-    m_size1 = H5Tget_size( m_tid1 );
-    m_size2 = H5Tget_size( m_tid2 );
-    
-   /*-------------------------------------------------------------------------
-    * check for different signed/unsigned types
-    *-------------------------------------------------------------------------
-    */
-    
-    sign1=H5Tget_sign(m_tid1);
-    sign2=H5Tget_sign(m_tid2);
-    if ( sign1 != sign2 )
-    {
-        if (options->m_verbose && obj1_name) 
-        {
-            parallel_print("Comparison not supported: <%s> has sign %s ", obj1_name, get_sign(sign1));
-            parallel_print("and <%s> has sign %s\n", obj2_name, get_sign(sign2));
-        }
-        
-        cmp=0;
-        options->not_cmp=1;
-    }
-    
-   /*-------------------------------------------------------------------------
-    * only attempt to compare if possible
-    *-------------------------------------------------------------------------
-    */
-    if (cmp)
-    {
-        
-       /*-------------------------------------------------------------------------
-        * get number of elements
-        *-------------------------------------------------------------------------
-        */
-        nelmts1 = 1;
-        for (i = 0; i < rank1; i++)
-        {
-            nelmts1 *= dims1[i];
-        }
-        
-        nelmts2 = 1;
-        for (i = 0; i < rank2; i++)
-        {
-            nelmts2 *= dims2[i];
-        }
-        
-        assert(nelmts1==nelmts2);
-        
-       /*-------------------------------------------------------------------------
-        * "upgrade" the smaller memory size
-        *-------------------------------------------------------------------------
-        */
-        
-        if ( m_size1 != m_size2 )
-        {
-            if ( m_size1 < m_size2 )
-            {
-                H5Tclose(m_tid1);
-                
-                if ((m_tid1=h5tools_get_native_type(f_tid2)) < 0)
-                    goto error;
-                
-                m_size1 = H5Tget_size( m_tid1 );
-            }
-            else
-            {
-                H5Tclose(m_tid2);
-                
-                if ((m_tid2=h5tools_get_native_type(f_tid1)) < 0)
-                    goto error;
-                
-                m_size2 = H5Tget_size( m_tid2 );
-            }
-        }
-        assert(m_size1==m_size2);
-        
-        /* print names */
-        if (obj1_name) {
-            name1=diff_basename(obj1_name);
-        }
-        if (obj2_name) {
-            name2=diff_basename(obj2_name);
-        }
-        
-        
-       /*-------------------------------------------------------------------------
-        * read/compare
-        *-------------------------------------------------------------------------
-        */
-        
-        need = (size_t)(nelmts1*m_size1);  /* bytes needed */
-        if ( need < H5TOOLS_MALLOCSIZE)
-        {
-            buf1 = HDmalloc(need);
-            buf2 = HDmalloc(need);
-        }
-        
-        if ( buf1!=NULL && buf2!=NULL)
-        {
-            if ( H5Dread(did1,m_tid1,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf1) < 0 )
-                goto error;
-            if ( H5Dread(did2,m_tid2,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf2) < 0 )
-                goto error;
-            
-            /* array diff */
-            nfound = diff_array(buf1,
-                buf2,
-                nelmts1,
-                (hsize_t)0,
-                rank1,
-                dims1,
-                options,
-                name1,
-                name2,
-                m_tid1,
-                did1,
-                did2);
-        }
-        
-        else /* possibly not enough memory, read/compare by hyperslabs */
-            
-        {
-            size_t        p_type_nbytes = m_size1; /*size of memory type */
-            hsize_t       p_nelmts = nelmts1;      /*total selected elmts */
-            hsize_t       elmtno;                  /*counter  */
-            int           carry;                   /*counter carry value */
-            unsigned int  vl_data = 0;             /*contains VL datatypes */
-            
-            /* stripmine info */
-            hsize_t       sm_size[H5S_MAX_RANK];   /*stripmine size */
-            hsize_t       sm_nbytes;               /*bytes per stripmine */
-            hsize_t       sm_nelmts;               /*elements per stripmine*/
-            hid_t         sm_space;                /*stripmine data space */
-            
-            /* hyperslab info */
-            hsize_t       hs_offset[H5S_MAX_RANK]; /*starting offset */
-            hsize_t       hs_size[H5S_MAX_RANK];   /*size this pass */
-            hsize_t       hs_nelmts;               /*elements in request */
-            hsize_t       zero[8];                 /*vector of zeros */
-            
-            /* check if we have VL data in the dataset's datatype */
-            if (H5Tdetect_class(m_tid1, H5T_VLEN) == TRUE)
-                vl_data = TRUE;
-            
-            /*
-             * determine the strip mine size and allocate a buffer. The strip mine is
-             * a hyperslab whose size is manageable.
-             */
-            sm_nbytes = p_type_nbytes;
-            
-            for (i = rank1; i > 0; --i) 
-            {
-                sm_size[i - 1] = MIN(dims1[i - 1], H5TOOLS_BUFSIZE / sm_nbytes);
-                sm_nbytes *= sm_size[i - 1];
-                assert(sm_nbytes > 0);
-            }
-            
-            sm_buf1 = malloc((size_t)sm_nbytes);
-            sm_buf2 = malloc((size_t)sm_nbytes);
-            
-            sm_nelmts = sm_nbytes / p_type_nbytes;
-            sm_space = H5Screate_simple(1, &sm_nelmts, NULL);
-            
-            /* the stripmine loop */
-            memset(hs_offset, 0, sizeof hs_offset);
-            memset(zero, 0, sizeof zero);
-            
-            for (elmtno = 0; elmtno < p_nelmts; elmtno += hs_nelmts) 
-            {
-                /* calculate the hyperslab size */
-                if (rank1 > 0) 
-                {
-                    for (i = 0, hs_nelmts = 1; i < rank1; i++) 
-                    {
-                        hs_size[i] = MIN(dims1[i] - hs_offset[i], sm_size[i]);
-                        hs_nelmts *= hs_size[i];
-                    }
-                    if (H5Sselect_hyperslab(sid1, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL) < 0)
-                        goto error;
-                    if (H5Sselect_hyperslab(sid2, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL) < 0)
-                        goto error;
-                    if (H5Sselect_hyperslab(sm_space, H5S_SELECT_SET, zero, NULL, &hs_nelmts, NULL) < 0)
-                        goto error;
-                } 
-                else 
-                {
-                    H5Sselect_all(sid1);
-                    H5Sselect_all(sid2);
-                    H5Sselect_all(sm_space);
-                    hs_nelmts = 1;
-                } /* rank */
-                
-                if ( H5Dread(did1,m_tid1,sm_space,sid1,H5P_DEFAULT,sm_buf1) < 0 )
-                    goto error;
-                if ( H5Dread(did2,m_tid2,sm_space,sid2,H5P_DEFAULT,sm_buf2) < 0 )
-                    goto error;
-                
-                /* get array differences. in the case of hyperslab read, increment the 
-                   number of differences found in each hyperslab and pass the 
-                   position at the beggining for printing
-                 */
-                nfound += diff_array(sm_buf1,
-                    sm_buf2,
-                    hs_nelmts,
-                    elmtno,
-                    rank1,
-                    dims1,
-                    options,
-                    name1,
-                    name2,
-                    m_tid1,
-                    did1,
-                    did2);
-                
-                /* reclaim any VL memory, if necessary */
-                if(vl_data)
-                {
-                    H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
-                    H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf2);
-                }
-                
-                /* calculate the next hyperslab offset */
-                for (i = rank1, carry = 1; i > 0 && carry; --i) 
-                {
-                    hs_offset[i - 1] += hs_size[i - 1];
-                    if (hs_offset[i - 1] == dims1[i - 1])
-                        hs_offset[i - 1] = 0;
-                    else
-                        carry = 0;
-                } /* i */
-            } /* elmtno */
-            
-            H5Sclose(sm_space);
-            /* free */
-            if (sm_buf1!=NULL)
-            {
-                free(sm_buf1);
-                sm_buf1=NULL;
-            }
-            if (sm_buf2!=NULL)
-            {
-                free(sm_buf2);
-                sm_buf2=NULL;
-            }
-            
-  } /* hyperslab read */
- }/*cmp*/
- 
- /*-------------------------------------------------------------------------
-  * compare attributes
-  * the if condition refers to cases when the dataset is a referenced object
-  *-------------------------------------------------------------------------
-  */
-  
-  if (obj1_name)
-      nfound += diff_attr(did1,did2,obj1_name,obj2_name,options);
-  
- /*-------------------------------------------------------------------------
-  * close
-  *-------------------------------------------------------------------------
-  */
-  
-  /* free */
-  if (buf1!=NULL)
-  {
-      free(buf1);
-      buf1=NULL;
-  }
-  if (buf2!=NULL)
-  {
-      free(buf2);
-      buf2=NULL;
+ hid_t      sid1=-1;
+ hid_t      sid2=-1;
+ hid_t      f_tid1=-1;
+ hid_t      f_tid2=-1;                
+ hid_t      m_tid1=-1;
+ hid_t      m_tid2=-1;                
+ size_t     m_size1;
+ size_t     m_size2;               
+ H5T_sign_t sign1;
+ H5T_sign_t sign2;                 
+ int        rank1;
+ int        rank2;
+ hsize_t    nelmts1;
+ hsize_t    nelmts2;
+ hsize_t    dims1[H5S_MAX_RANK];
+ hsize_t    dims2[H5S_MAX_RANK];
+ hsize_t    maxdim1[H5S_MAX_RANK];
+ hsize_t    maxdim2[H5S_MAX_RANK];
+ const char *name1=NULL;            /* relative names */
+ const char *name2=NULL;
+ hsize_t    storage_size1;
+ hsize_t    storage_size2;
+ hsize_t    nfound=0;               /* number of differences found */
+ int        cmp=1;                  /* do diff or not */
+ void       *buf1=NULL;                  
+ void       *buf2=NULL; 
+ void       *sm_buf1=NULL;                
+ void       *sm_buf2=NULL;
+ size_t     need;                   /* bytes needed for malloc */
+ int        i;
+
+  /* Get the dataspace handle */
+ if ( (sid1 = H5Dget_space(did1)) < 0 )
+  goto error;
+
+ /* Get rank */
+ if ( (rank1 = H5Sget_simple_extent_ndims(sid1)) < 0 )
+  goto error;
+
+ /* Get the dataspace handle */
+ if ( (sid2 = H5Dget_space(did2)) < 0 )
+  goto error;
+
+ /* Get rank */
+ if ( (rank2 = H5Sget_simple_extent_ndims(sid2)) < 0 )
+  goto error;
+
+ /* Get dimensions */
+ if ( H5Sget_simple_extent_dims(sid1,dims1,maxdim1) < 0 )
+  goto error;
+
+ /* Get dimensions */
+ if ( H5Sget_simple_extent_dims(sid2,dims2,maxdim2) < 0 )
+  goto error;
+
+/*-------------------------------------------------------------------------
+ * Get the file data type
+ *-------------------------------------------------------------------------
+ */
+
+ /* Get the data type */
+ if ( (f_tid1 = H5Dget_type(did1)) < 0 )
+  goto error;
+
+ /* Get the data type */
+ if ( (f_tid2 = H5Dget_type(did2)) < 0 )
+  goto error;
+
+/*-------------------------------------------------------------------------
+ * check for empty datasets
+ *-------------------------------------------------------------------------
+ */
+
+ storage_size1=H5Dget_storage_size(did1);
+ storage_size2=H5Dget_storage_size(did2);
+
+ if (storage_size1==0 || storage_size2==0)
+ {
+  if (options->m_verbose && obj1_name && obj2_name)
+   parallel_print("<%s> or <%s> are empty datasets\n", obj1_name, obj2_name);
+  cmp=0;
+  options->not_cmp=1;
+ }
+
+/*-------------------------------------------------------------------------
+ * check for comparable TYPE and SPACE
+ *-------------------------------------------------------------------------
+ */
+
+ if (diff_can_type(f_tid1,
+                   f_tid2,
+                   rank1,
+                   rank2,
+                   dims1,
+                   dims2,
+                   maxdim1,
+                   maxdim2,
+                   obj1_name,
+                   obj2_name,
+                   options)!=1)
+ {
+  cmp=0;
+  options->not_cmp=1;
+ }
+
+/*-------------------------------------------------------------------------
+ * memory type and sizes
+ *-------------------------------------------------------------------------
+ */
+ if ((m_tid1=h5tools_get_native_type(f_tid1)) < 0)
+  goto error;
+
+ if ((m_tid2=h5tools_get_native_type(f_tid2)) < 0)
+  goto error;
+
+ m_size1 = H5Tget_size( m_tid1 );
+ m_size2 = H5Tget_size( m_tid2 );
+
+/*-------------------------------------------------------------------------
+ * check for different signed/unsigned types
+ *-------------------------------------------------------------------------
+ */
+
+ sign1=H5Tget_sign(m_tid1);
+ sign2=H5Tget_sign(m_tid2);
+ if ( sign1 != sign2 )
+ {
+  if (options->m_verbose && obj1_name) {
+   parallel_print("Comparison not supported: <%s> has sign %s ", obj1_name, get_sign(sign1));
+   parallel_print("and <%s> has sign %s\n", obj2_name, get_sign(sign2));
   }
-  if (sm_buf1!=NULL)
+
+  cmp=0;
+  options->not_cmp=1;
+ }
+
+/*-------------------------------------------------------------------------
+ * only attempt to compare if possible
+ *-------------------------------------------------------------------------
+ */
+ if (cmp)
+ {
+
+/*-------------------------------------------------------------------------
+ * get number of elements
+ *-------------------------------------------------------------------------
+ */
+ nelmts1 = 1;
+ for (i = 0; i < rank1; i++)
+ {
+  nelmts1 *= dims1[i];
+ }
+
+ nelmts2 = 1;
+ for (i = 0; i < rank2; i++)
+ {
+  nelmts2 *= dims2[i];
+ }
+
+ assert(nelmts1==nelmts2);
+
+/*-------------------------------------------------------------------------
+ * "upgrade" the smaller memory size
+ *-------------------------------------------------------------------------
+ */
+
+ if ( m_size1 != m_size2 )
+ {
+  if ( m_size1 < m_size2 )
   {
-      free(sm_buf1);
-      sm_buf1=NULL;
+   H5Tclose(m_tid1);
+
+   if ((m_tid1=h5tools_get_native_type(f_tid2)) < 0)
+    goto error;
+
+   m_size1 = H5Tget_size( m_tid1 );
   }
-  if (sm_buf2!=NULL)
+  else
   {
-      free(sm_buf2);
-      sm_buf2=NULL;
+   H5Tclose(m_tid2);
+
+   if ((m_tid2=h5tools_get_native_type(f_tid1)) < 0)
+    goto error;
+
+   m_size2 = H5Tget_size( m_tid2 );
   }
+ }
+ assert(m_size1==m_size2);
+
+ /* print names */
+ if (obj1_name) {
+  name1=diff_basename(obj1_name);
+ }
+ if (obj2_name) {
+  name2=diff_basename(obj2_name);
+ }
+
+ 
+/*-------------------------------------------------------------------------
+ * read/compare
+ *-------------------------------------------------------------------------
+ */
+
+ need = (size_t)(nelmts1*m_size1);  /* bytes needed */
+ if ( need < H5TOOLS_MALLOCSIZE)
+ {
+  buf1 = HDmalloc(need);
+  buf2 = HDmalloc(need);
+ }
+
+ if ( buf1!=NULL && buf2!=NULL)
+ {
+  if ( H5Dread(did1,m_tid1,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf1) < 0 )
+   goto error;
+  if ( H5Dread(did2,m_tid2,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf2) < 0 )
+   goto error;
+
+  /* array diff */
+  nfound = diff_array(buf1,
+                      buf2,
+                      nelmts1,
+                      (hsize_t)0,
+                      rank1,
+                      dims1,
+                      options,
+                      name1,
+                      name2,
+                      m_tid1,
+                      did1,
+                      did2);
+ }
+ 
+ else /* possibly not enough memory, read/compare by hyperslabs */
   
-  H5E_BEGIN_TRY 
-  {
-      H5Sclose(sid1);
-      H5Sclose(sid2);
-      H5Tclose(f_tid1);
-      H5Tclose(f_tid2);
-      H5Tclose(m_tid1);
-      H5Tclose(m_tid2);
-  } H5E_END_TRY;
+ {
+  size_t        p_type_nbytes = m_size1; /*size of memory type */
+  hsize_t       p_nelmts = nelmts1;      /*total selected elmts */
+  hsize_t       elmtno;                  /*counter  */
+  int           carry;                   /*counter carry value */
+  unsigned int  vl_data = 0;             /*contains VL datatypes */
   
-  return nfound;
+  /* stripmine info */
+  hsize_t       sm_size[H5S_MAX_RANK];   /*stripmine size */
+  hsize_t       sm_nbytes;               /*bytes per stripmine */
+  hsize_t       sm_nelmts;               /*elements per stripmine*/
+  hid_t         sm_space;                /*stripmine data space */
   
-error:
-  options->err_stat=1;
+  /* hyperslab info */
+  hsize_t       hs_offset[H5S_MAX_RANK]; /*starting offset */
+  hsize_t       hs_size[H5S_MAX_RANK];   /*size this pass */
+  hsize_t       hs_nelmts;               /*elements in request */
+  hsize_t       zero[8];                 /*vector of zeros */
   
-  /* free */
-  if (buf1!=NULL)
-  {
-      free(buf1);
-      buf1=NULL;
+  /* check if we have VL data in the dataset's datatype */
+  if (H5Tdetect_class(m_tid1, H5T_VLEN) == TRUE)
+   vl_data = TRUE;
+  
+  /*
+   * determine the strip mine size and allocate a buffer. The strip mine is
+   * a hyperslab whose size is manageable.
+   */
+  sm_nbytes = p_type_nbytes;
+  
+  for (i = rank1; i > 0; --i) {
+   sm_size[i - 1] = MIN(dims1[i - 1], H5TOOLS_BUFSIZE / sm_nbytes);
+   sm_nbytes *= sm_size[i - 1];
+   assert(sm_nbytes > 0);
   }
-  if (buf2!=NULL)
+  
+  sm_buf1 = malloc((size_t)sm_nbytes);
+  sm_buf2 = malloc((size_t)sm_nbytes);
+  
+  sm_nelmts = sm_nbytes / p_type_nbytes;
+  sm_space = H5Screate_simple(1, &sm_nelmts, NULL);
+  
+  /* the stripmine loop */
+  memset(hs_offset, 0, sizeof hs_offset);
+  memset(zero, 0, sizeof zero);
+
+  for (elmtno = 0; elmtno < p_nelmts; elmtno += hs_nelmts) 
   {
-      free(buf2);
-      buf2=NULL;
-  }
+   /* calculate the hyperslab size */
+   if (rank1 > 0) 
+   {
+    for (i = 0, hs_nelmts = 1; i < rank1; i++) 
+    {
+     hs_size[i] = MIN(dims1[i] - hs_offset[i], sm_size[i]);
+     hs_nelmts *= hs_size[i];
+    }
+    if (H5Sselect_hyperslab(sid1, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL) < 0)
+     goto error;
+    if (H5Sselect_hyperslab(sid2, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL) < 0)
+     goto error;
+    if (H5Sselect_hyperslab(sm_space, H5S_SELECT_SET, zero, NULL, &hs_nelmts, NULL) < 0)
+     goto error;
+   } 
+   else 
+   {
+    H5Sselect_all(sid1);
+    H5Sselect_all(sid2);
+    H5Sselect_all(sm_space);
+    hs_nelmts = 1;
+   } /* rank */
+ 
+   if ( H5Dread(did1,m_tid1,sm_space,sid1,H5P_DEFAULT,sm_buf1) < 0 )
+    goto error;
+   if ( H5Dread(did2,m_tid2,sm_space,sid2,H5P_DEFAULT,sm_buf2) < 0 )
+    goto error;
+   
+   /* get array differences. in the case of hyperslab read, increment the number of differences 
+      found in each hyperslab and pass the position at the beggining for printing */
+   nfound += diff_array(sm_buf1,
+                        sm_buf2,
+                        hs_nelmts,
+                        elmtno,
+                        rank1,
+                        dims1,
+                        options,
+                        name1,
+                        name2,
+                        m_tid1,
+                        did1,
+                        did2);
+
+   /* reclaim any VL memory, if necessary */
+   if(vl_data)
+   {
+    H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
+    H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf2);
+   }
+   
+   /* calculate the next hyperslab offset */
+   for (i = rank1, carry = 1; i > 0 && carry; --i) 
+   {
+    hs_offset[i - 1] += hs_size[i - 1];
+    if (hs_offset[i - 1] == dims1[i - 1])
+     hs_offset[i - 1] = 0;
+    else
+     carry = 0;
+   } /* i */
+  } /* elmtno */
+  
+  H5Sclose(sm_space);
+  /* free */
   if (sm_buf1!=NULL)
   {
-      free(sm_buf1);
-      sm_buf1=NULL;
+   free(sm_buf1);
+   sm_buf1=NULL;
   }
   if (sm_buf2!=NULL)
   {
-      free(sm_buf2);
-      sm_buf2=NULL;
+   free(sm_buf2);
+   sm_buf2=NULL;
   }
   
-  /* disable error reporting */
-  H5E_BEGIN_TRY 
-  {
-      H5Sclose(sid1);
-      H5Sclose(sid2);
-      H5Tclose(f_tid1);
-      H5Tclose(f_tid2);
-      H5Tclose(m_tid1);
-      H5Tclose(m_tid2);
-      /* enable error reporting */
-  } H5E_END_TRY;
-  
-  return nfound;
+ } /* hyperslab read */
+ }/*cmp*/
+ 
+/*-------------------------------------------------------------------------
+ * compare attributes
+ * the if condition refers to cases when the dataset is a referenced object
+ *-------------------------------------------------------------------------
+ */
+
+ if (obj1_name)
+  nfound += diff_attr(did1,did2,obj1_name,obj2_name,options);
+
+/*-------------------------------------------------------------------------
+ * close
+ *-------------------------------------------------------------------------
+ */
+ 
+ /* free */
+ if (buf1!=NULL)
+ {
+  free(buf1);
+  buf1=NULL;
+ }
+ if (buf2!=NULL)
+ {
+  free(buf2);
+  buf2=NULL;
+ }
+ if (sm_buf1!=NULL)
+ {
+  free(sm_buf1);
+  sm_buf1=NULL;
+ }
+ if (sm_buf2!=NULL)
+ {
+  free(sm_buf2);
+  sm_buf2=NULL;
+ }
+
+ H5E_BEGIN_TRY {
+  H5Sclose(sid1);
+  H5Sclose(sid2);
+  H5Tclose(f_tid1);
+  H5Tclose(f_tid2);
+  H5Tclose(m_tid1);
+  H5Tclose(m_tid2);
+ } H5E_END_TRY;
+
+ return nfound;
+
+error:
+ options->err_stat=1;
+ 
+ /* free */
+ if (buf1!=NULL)
+ {
+  free(buf1);
+  buf1=NULL;
+ }
+ if (buf2!=NULL)
+ {
+  free(buf2);
+  buf2=NULL;
+ }
+ if (sm_buf1!=NULL)
+ {
+  free(sm_buf1);
+  sm_buf1=NULL;
+ }
+ if (sm_buf2!=NULL)
+ {
+  free(sm_buf2);
+  sm_buf2=NULL;
+ }
+
+ /* disable error reporting */
+ H5E_BEGIN_TRY {
+  H5Sclose(sid1);
+  H5Sclose(sid2);
+  H5Tclose(f_tid1);
+  H5Tclose(f_tid2);
+  H5Tclose(m_tid1);
+  H5Tclose(m_tid2);
+   /* enable error reporting */
+ } H5E_END_TRY;
+
+ return nfound;
 }
 
 /*-------------------------------------------------------------------------
@@ -663,164 +677,163 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
                    const char  *obj2_name,
                    diff_opt_t  *options )
 {
-    H5T_class_t  tclass1;
-    H5T_class_t  tclass2;
-    int          maxdim_diff=0;          /* maximum dimensions are different */
-    int          dim_diff=0;             /* current dimensions are different */
-    int          i;
-    
-   /*-------------------------------------------------------------------------
-    * check for the same class
-    *-------------------------------------------------------------------------
-    */
-    
-    if ((tclass1=H5Tget_class(f_tid1)) < 0)
-        return -1;
-    
-    if ((tclass2=H5Tget_class(f_tid2)) < 0)
-        return -1;
-    
-    if ( tclass1 != tclass2 )
-    {
-        if (options->m_verbose && obj1_name) 
-        {
-            printf("Comparison not possible: <%s> is of class %s and <%s> is of class %s\n",
-                obj1_name, get_class(tclass1),
-                obj2_name, get_class(tclass2) );
-        }
-        return 0;
-    }
-    
-   /*-------------------------------------------------------------------------
-    * check for non supported classes
-    *-------------------------------------------------------------------------
-    */
-    
-    assert(tclass1==tclass2);
-    switch (tclass1)
-    {
-    case H5T_INTEGER:
-    case H5T_FLOAT:
-    case H5T_COMPOUND:
-    case H5T_STRING:
-    case H5T_ARRAY:
-    case H5T_BITFIELD:
-    case H5T_OPAQUE:
-    case H5T_ENUM:
-    case H5T_VLEN:
-    case H5T_REFERENCE:
-        
-        break;
-        
-    default: /*H5T_TIME */
-        if (options->m_verbose && obj1_name )
-            printf("Comparison not supported: <%s> and <%s> are of class %s\n",
-            obj1_name,obj2_name,get_class(tclass2) );
-        return 0;
-    }
-    
-   /*-------------------------------------------------------------------------
-    * check for equal file datatype; warning only
-    *-------------------------------------------------------------------------
-    */
-    
-    if ( (H5Tequal(f_tid1, f_tid2)==0) && options->m_verbose && obj1_name)
-    {
-        printf("Warning: different storage datatype\n");
-        printf("<%s> has file datatype ", obj1_name);
-        print_type(f_tid1);
-        printf("\n");
-        printf("<%s> has file datatype ", obj2_name);
-        print_type(f_tid2);
-        printf("\n");
-    }
-    
-   /*-------------------------------------------------------------------------
-    * check for the same rank
-    *-------------------------------------------------------------------------
-    */
-    
-    if ( rank1 != rank2 )
-    {
-        if (options->m_verbose && obj1_name) 
-        {
-            printf("Comparison not supported: <%s> has rank %d, dimensions ", obj1_name, rank1);
-            print_dimensions(rank1,dims1);
-            printf(", max dimensions ");
-            print_dimensions(rank1,maxdim1);
-            printf("\n" );
-            printf("<%s> has rank %d, dimensions ", obj2_name, rank2);
-            print_dimensions(rank2,dims2);
-            printf(", max dimensions ");
-            print_dimensions(rank2,maxdim2);
-        }
-        return 0;
-    }
-    
-   /*-------------------------------------------------------------------------
-    * check for different dimensions
-    *-------------------------------------------------------------------------
-    */
-    
-    assert(rank1==rank2);
-    for ( i=0; i<rank1; i++)
-    {
-        if (maxdim1 && maxdim2)
-        {
-            if ( maxdim1[i] != maxdim2[i] )
-                maxdim_diff=1;
-        }
-        if ( dims1[i] != dims2[i] )
-            dim_diff=1;
-    }
-    
-   /*-------------------------------------------------------------------------
-    * current dimensions
-    *-------------------------------------------------------------------------
-    */
-    
-    if (dim_diff==1)
-    {
-        if (options->m_verbose && obj1_name) 
-        {
-            printf("Comparison not supported: <%s> has rank %d, dimensions ", obj1_name, rank1);
-            print_dimensions(rank1,dims1);
-            if (maxdim1 && maxdim2) 
-            {
-                printf(", max dimensions ");
-                print_dimensions(rank1,maxdim1);
-                printf("\n" );
-                printf("<%s> has rank %d, dimensions ", obj2_name, rank2);
-                print_dimensions(rank2,dims2);
-                printf(", max dimensions ");
-                print_dimensions(rank2,maxdim2);
-            }
-        }
-        return 0;
-    }
-    
-   /*-------------------------------------------------------------------------
-    * maximum dimensions; just give a warning
-    *-------------------------------------------------------------------------
-    */
-    if (maxdim1 && maxdim2 && maxdim_diff==1 && obj1_name )
-    {
-        if (options->m_verbose) 
-        {
-            printf( "Warning: different maximum dimensions\n");
-            printf("<%s> has max dimensions ", obj1_name);
-            print_dimensions(rank1,maxdim1);
-            printf("\n");
-            printf("<%s> has max dimensions ", obj2_name);
-            print_dimensions(rank2,maxdim2);
-            printf("\n");
-        }
-    }
-    
-    return 1;
+
+
+ H5T_class_t  tclass1;
+ H5T_class_t  tclass2;
+ int          maxdim_diff=0;          /* maximum dimensions are different */
+ int          dim_diff=0;             /* current dimensions are different */
+ int          i;
+
+/*-------------------------------------------------------------------------
+ * check for the same class
+ *-------------------------------------------------------------------------
+ */
+
+ if ((tclass1=H5Tget_class(f_tid1)) < 0)
+  return -1;
+
+ if ((tclass2=H5Tget_class(f_tid2)) < 0)
+  return -1;
+
+ if ( tclass1 != tclass2 )
+ {
+  if (options->m_verbose && obj1_name) {
+   printf("Comparison not possible: <%s> is of class %s and <%s> is of class %s\n",
+    obj1_name, get_class(tclass1),
+    obj2_name, get_class(tclass2) );
+  }
+  return 0;
+ }
+
+/*-------------------------------------------------------------------------
+ * check for non supported classes
+ *-------------------------------------------------------------------------
+ */
+
+ assert(tclass1==tclass2);
+ switch (tclass1)
+ {
+ case H5T_INTEGER:
+ case H5T_FLOAT:
+ case H5T_COMPOUND:
+ case H5T_STRING:
+ case H5T_ARRAY:
+ case H5T_BITFIELD:
+ case H5T_OPAQUE:
+ case H5T_ENUM:
+ case H5T_VLEN:
+ case H5T_REFERENCE:
+
+  break;
+
+ default: /*H5T_TIME */
+  if (options->m_verbose && obj1_name )
+   printf("Comparison not supported: <%s> and <%s> are of class %s\n",
+    obj1_name,obj2_name,get_class(tclass2) );
+  return 0;
+ }
+
+/*-------------------------------------------------------------------------
+ * check for equal file datatype; warning only
+ *-------------------------------------------------------------------------
+ */
+
+ if ( (H5Tequal(f_tid1, f_tid2)==0) && options->m_verbose && obj1_name)
+ {
+  printf("Warning: different storage datatype\n");
+  printf("<%s> has file datatype ", obj1_name);
+  print_type(f_tid1);
+  printf("\n");
+  printf("<%s> has file datatype ", obj2_name);
+  print_type(f_tid2);
+  printf("\n");
+ }
+
+/*-------------------------------------------------------------------------
+ * check for the same rank
+ *-------------------------------------------------------------------------
+ */
+
+ if ( rank1 != rank2 )
+ {
+  if (options->m_verbose && obj1_name) {
+   printf("Comparison not supported: <%s> has rank %d, dimensions ", obj1_name, rank1);
+   print_dimensions(rank1,dims1);
+   printf(", max dimensions ");
+   print_dimensions(rank1,maxdim1);
+   printf("\n" );
+   printf("<%s> has rank %d, dimensions ", obj2_name, rank2);
+   print_dimensions(rank2,dims2);
+   printf(", max dimensions ");
+   print_dimensions(rank2,maxdim2);
+  }
+  return 0;
+ }
+
+/*-------------------------------------------------------------------------
+ * check for different dimensions
+ *-------------------------------------------------------------------------
+ */
+
+ assert(rank1==rank2);
+ for ( i=0; i<rank1; i++)
+ {
+  if (maxdim1 && maxdim2)
+  {
+   if ( maxdim1[i] != maxdim2[i] )
+    maxdim_diff=1;
+  }
+  if ( dims1[i] != dims2[i] )
+   dim_diff=1;
+ }
+
+/*-------------------------------------------------------------------------
+ * current dimensions
+ *-------------------------------------------------------------------------
+ */
+
+ if (dim_diff==1)
+ {
+  if (options->m_verbose && obj1_name) {
+   printf("Comparison not supported: <%s> has rank %d, dimensions ", obj1_name, rank1);
+   print_dimensions(rank1,dims1);
+   if (maxdim1 && maxdim2) {
+    printf(", max dimensions ");
+    print_dimensions(rank1,maxdim1);
+    printf("\n" );
+    printf("<%s> has rank %d, dimensions ", obj2_name, rank2);
+    print_dimensions(rank2,dims2);
+    printf(", max dimensions ");
+    print_dimensions(rank2,maxdim2);
+   }
+  }
+  return 0;
+ }
+
+/*-------------------------------------------------------------------------
+ * maximum dimensions; just give a warning
+ *-------------------------------------------------------------------------
+ */
+ if (maxdim1 && maxdim2 && maxdim_diff==1 && obj1_name )
+ {
+  if (options->m_verbose) {
+   printf( "Warning: different maximum dimensions\n");
+   printf("<%s> has max dimensions ", obj1_name);
+   print_dimensions(rank1,maxdim1);
+   printf("\n");
+   printf("<%s> has max dimensions ", obj2_name);
+   print_dimensions(rank2,maxdim2);
+   printf("\n");
+  }
+ }
+
+ return 1;
 }
 
 
+
+
 /*-------------------------------------------------------------------------
  * Function: print_sizes
  *
@@ -874,29 +887,3 @@ void print_sizes( const char *obj1,
  printf("\n");
 }
 #endif /* H5DIFF_DEBUG */
-
-/*-------------------------------------------------------------------------
- * Function: print_size
- *
- * Purpose: print dimensions 
- *
- *-------------------------------------------------------------------------
- */
-#if defined (H5DIFF_DEBUG)
-static void
-print_size (int rank, hsize_t *dims)
-{
-    int i;
-
-    parallel_print("[" );
-    for ( i = 0; i < rank-1; i++)
-    {
-        parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[i]);
-        parallel_print("x");
-    }
-    parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[rank-1]);
-    parallel_print("]\n" );
-    
-}
-#endif /* H5DIFF_DEBUG */
-
diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c
index 4cddbfb..9e9c556 100644
--- a/tools/lib/h5diff_util.c
+++ b/tools/lib/h5diff_util.c
@@ -131,91 +131,91 @@ print_dimensions (int rank, hsize_t *dims)
  */
 void print_type(hid_t type)
 {
-    switch (H5Tget_class(type))
-    {
-    default:
-        return;
-    case H5T_INTEGER:
-        if (H5Tequal(type, H5T_STD_I8BE)) {
-            printf("H5T_STD_I8BE");
-        } else if (H5Tequal(type, H5T_STD_I8LE)) {
-            printf("H5T_STD_I8LE");
-        } else if (H5Tequal(type, H5T_STD_I16BE)) {
-            printf("H5T_STD_I16BE");
-        } else if (H5Tequal(type, H5T_STD_I16LE)) {
-            printf("H5T_STD_I16LE");
-        } else if (H5Tequal(type, H5T_STD_I32BE)) {
-            printf("H5T_STD_I32BE");
-        } else if (H5Tequal(type, H5T_STD_I32LE)) {
-            printf("H5T_STD_I32LE");
-        } else if (H5Tequal(type, H5T_STD_I64BE)) {
-            printf("H5T_STD_I64BE");
-        } else if (H5Tequal(type, H5T_STD_I64LE)) {
-            printf("H5T_STD_I64LE");
-        } else if (H5Tequal(type, H5T_STD_U8BE)) {
-            printf("H5T_STD_U8BE");
-        } else if (H5Tequal(type, H5T_STD_U8LE)) {
-            printf("H5T_STD_U8LE");
-        } else if (H5Tequal(type, H5T_STD_U16BE)) {
-            printf("H5T_STD_U16BE");
-        } else if (H5Tequal(type, H5T_STD_U16LE)) {
-            printf("H5T_STD_U16LE");
-        } else if (H5Tequal(type, H5T_STD_U32BE)) {
-            printf("H5T_STD_U32BE");
-        } else if (H5Tequal(type, H5T_STD_U32LE)) {
-            printf("H5T_STD_U32LE");
-        } else if (H5Tequal(type, H5T_STD_U64BE)) {
-            printf("H5T_STD_U64BE");
-        } else if (H5Tequal(type, H5T_STD_U64LE)) {
-            printf("H5T_STD_U64LE");
-        } else if (H5Tequal(type, H5T_NATIVE_SCHAR)) {
-            printf("H5T_NATIVE_SCHAR");
-        } else if (H5Tequal(type, H5T_NATIVE_UCHAR)) {
-            printf("H5T_NATIVE_UCHAR");
-        } else if (H5Tequal(type, H5T_NATIVE_SHORT)) {
-            printf("H5T_NATIVE_SHORT");
-        } else if (H5Tequal(type, H5T_NATIVE_USHORT)) {
-            printf("H5T_NATIVE_USHORT");
-        } else if (H5Tequal(type, H5T_NATIVE_INT)) {
-            printf("H5T_NATIVE_INT");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT)) {
-            printf("H5T_NATIVE_UINT");
-        } else if (H5Tequal(type, H5T_NATIVE_LONG)) {
-            printf("H5T_NATIVE_LONG");
-        } else if (H5Tequal(type, H5T_NATIVE_ULONG)) {
-            printf("H5T_NATIVE_ULONG");
-        } else if (H5Tequal(type, H5T_NATIVE_LLONG)) {
-            printf("H5T_NATIVE_LLONG");
-        } else if (H5Tequal(type, H5T_NATIVE_ULLONG)) {
-            printf("H5T_NATIVE_ULLONG");
-        } else {
-            printf("undefined integer");
-        }
-        break;
-        
-    case H5T_FLOAT:
-        if (H5Tequal(type, H5T_IEEE_F32BE)) {
-            printf("H5T_IEEE_F32BE");
-        } else if (H5Tequal(type, H5T_IEEE_F32LE)) {
-            printf("H5T_IEEE_F32LE");
-        } else if (H5Tequal(type, H5T_IEEE_F64BE)) {
-            printf("H5T_IEEE_F64BE");
-        } else if (H5Tequal(type, H5T_IEEE_F64LE)) {
-            printf("H5T_IEEE_F64LE");
-        } else if (H5Tequal(type, H5T_NATIVE_FLOAT)) {
-            printf("H5T_NATIVE_FLOAT");
-        } else if (H5Tequal(type, H5T_NATIVE_DOUBLE)) {
-            printf("H5T_NATIVE_DOUBLE");
+ switch (H5Tget_class(type))
+ {
+ default:
+  return;
+ case H5T_INTEGER:
+  if (H5Tequal(type, H5T_STD_I8BE)) {
+   printf("H5T_STD_I8BE");
+  } else if (H5Tequal(type, H5T_STD_I8LE)) {
+   printf("H5T_STD_I8LE");
+  } else if (H5Tequal(type, H5T_STD_I16BE)) {
+   printf("H5T_STD_I16BE");
+  } else if (H5Tequal(type, H5T_STD_I16LE)) {
+   printf("H5T_STD_I16LE");
+  } else if (H5Tequal(type, H5T_STD_I32BE)) {
+   printf("H5T_STD_I32BE");
+  } else if (H5Tequal(type, H5T_STD_I32LE)) {
+   printf("H5T_STD_I32LE");
+  } else if (H5Tequal(type, H5T_STD_I64BE)) {
+   printf("H5T_STD_I64BE");
+  } else if (H5Tequal(type, H5T_STD_I64LE)) {
+   printf("H5T_STD_I64LE");
+  } else if (H5Tequal(type, H5T_STD_U8BE)) {
+   printf("H5T_STD_U8BE");
+  } else if (H5Tequal(type, H5T_STD_U8LE)) {
+   printf("H5T_STD_U8LE");
+  } else if (H5Tequal(type, H5T_STD_U16BE)) {
+   printf("H5T_STD_U16BE");
+  } else if (H5Tequal(type, H5T_STD_U16LE)) {
+   printf("H5T_STD_U16LE");
+  } else if (H5Tequal(type, H5T_STD_U32BE)) {
+   printf("H5T_STD_U32BE");
+  } else if (H5Tequal(type, H5T_STD_U32LE)) {
+   printf("H5T_STD_U32LE");
+  } else if (H5Tequal(type, H5T_STD_U64BE)) {
+   printf("H5T_STD_U64BE");
+  } else if (H5Tequal(type, H5T_STD_U64LE)) {
+   printf("H5T_STD_U64LE");
+  } else if (H5Tequal(type, H5T_NATIVE_SCHAR)) {
+   printf("H5T_NATIVE_SCHAR");
+  } else if (H5Tequal(type, H5T_NATIVE_UCHAR)) {
+   printf("H5T_NATIVE_UCHAR");
+  } else if (H5Tequal(type, H5T_NATIVE_SHORT)) {
+   printf("H5T_NATIVE_SHORT");
+  } else if (H5Tequal(type, H5T_NATIVE_USHORT)) {
+   printf("H5T_NATIVE_USHORT");
+  } else if (H5Tequal(type, H5T_NATIVE_INT)) {
+   printf("H5T_NATIVE_INT");
+  } else if (H5Tequal(type, H5T_NATIVE_UINT)) {
+   printf("H5T_NATIVE_UINT");
+  } else if (H5Tequal(type, H5T_NATIVE_LONG)) {
+   printf("H5T_NATIVE_LONG");
+  } else if (H5Tequal(type, H5T_NATIVE_ULONG)) {
+   printf("H5T_NATIVE_ULONG");
+  } else if (H5Tequal(type, H5T_NATIVE_LLONG)) {
+   printf("H5T_NATIVE_LLONG");
+  } else if (H5Tequal(type, H5T_NATIVE_ULLONG)) {
+   printf("H5T_NATIVE_ULLONG");
+  } else {
+   printf("undefined integer");
+  }
+  break;
+
+ case H5T_FLOAT:
+  if (H5Tequal(type, H5T_IEEE_F32BE)) {
+   printf("H5T_IEEE_F32BE");
+  } else if (H5Tequal(type, H5T_IEEE_F32LE)) {
+   printf("H5T_IEEE_F32LE");
+  } else if (H5Tequal(type, H5T_IEEE_F64BE)) {
+   printf("H5T_IEEE_F64BE");
+  } else if (H5Tequal(type, H5T_IEEE_F64LE)) {
+   printf("H5T_IEEE_F64LE");
+  } else if (H5Tequal(type, H5T_NATIVE_FLOAT)) {
+   printf("H5T_NATIVE_FLOAT");
+  } else if (H5Tequal(type, H5T_NATIVE_DOUBLE)) {
+   printf("H5T_NATIVE_DOUBLE");
 #if H5_SIZEOF_LONG_DOUBLE !=0
-        } else if (H5Tequal(type, H5T_NATIVE_LDOUBLE)) {
-            printf("H5T_NATIVE_LDOUBLE");
+  } else if (H5Tequal(type, H5T_NATIVE_LDOUBLE)) {
+   printf("H5T_NATIVE_LDOUBLE");
 #endif
-        } else {
-            printf("undefined float");
-        }
-        break;
-        
-    }/*switch*/
+  } else {
+   printf("undefined float");
+  }
+  break;
+
+ }/*switch*/
 }
 
 /*-------------------------------------------------------------------------
@@ -232,21 +232,21 @@ void print_type(hid_t type)
 const char*
 diff_basename(const char *name)
 {
-    size_t i;
-    
-    if (name==NULL)
-        return NULL;
-    
-    /* Find the end of the base name */
-    i = strlen(name);
-    while (i>0 && '/'==name[i-1])
-        --i;
-    
-    /* Skip backward over base name */
-    while (i>0 && '/'!=name[i-1])
-        --i;
-    
-    return(name+i);
+ size_t i;
+
+ if (name==NULL)
+  return NULL;
+
+ /* Find the end of the base name */
+ i = strlen(name);
+ while (i>0 && '/'==name[i-1])
+  --i;
+
+ /* Skip backward over base name */
+ while (i>0 && '/'!=name[i-1])
+  --i;
+
+ return(name+i);
 }
 
 /*-------------------------------------------------------------------------
@@ -295,15 +295,15 @@ get_type(h5trav_type_t type)
 const char*
 get_sign(H5T_sign_t sign)
 {
-    switch (sign)
-    {
-    default:
-        return("H5T_SGN_ERROR");
-    case H5T_SGN_NONE:
-        return("H5T_SGN_NONE");
-    case H5T_SGN_2:
-        return("H5T_SGN_2");
-    }
+ switch (sign)
+ {
+ default:
+  return("H5T_SGN_ERROR");
+ case H5T_SGN_NONE:
+  return("H5T_SGN_NONE");
+ case H5T_SGN_2:
+  return("H5T_SGN_2");
+ }
 }
 
 
@@ -321,33 +321,33 @@ get_sign(H5T_sign_t sign)
 const char*
 get_class(H5T_class_t tclass)
 {
-    switch (tclass)
-    {
-    default:
-        return("Invalid class");
-    case H5T_TIME:
-        return("H5T_TIME");
-    case H5T_INTEGER:
-        return("H5T_INTEGER");
-    case H5T_FLOAT:
-        return("H5T_FLOAT");
-    case H5T_STRING:
-        return("H5T_STRING");
-    case H5T_BITFIELD:
-        return("H5T_BITFIELD");
-    case H5T_OPAQUE:
-        return("H5T_OPAQUE");
-    case H5T_COMPOUND:
-        return("H5T_COMPOUND");
-    case H5T_REFERENCE:
-        return("H5T_REFERENCE");
-    case H5T_ENUM:
-        return("H5T_ENUM");
-    case H5T_VLEN:
-        return("H5T_VLEN");
-    case H5T_ARRAY:
-        return("H5T_ARRAY");
-    }
+ switch (tclass)
+ {
+ default:
+  return("Invalid class");
+ case H5T_TIME:
+  return("H5T_TIME");
+ case H5T_INTEGER:
+  return("H5T_INTEGER");
+ case H5T_FLOAT:
+  return("H5T_FLOAT");
+ case H5T_STRING:
+  return("H5T_STRING");
+ case H5T_BITFIELD:
+  return("H5T_BITFIELD");
+ case H5T_OPAQUE:
+  return("H5T_OPAQUE");
+ case H5T_COMPOUND:
+  return("H5T_COMPOUND");
+ case H5T_REFERENCE:
+  return("H5T_REFERENCE");
+ case H5T_ENUM:
+  return("H5T_ENUM");
+ case H5T_VLEN:
+  return("H5T_VLEN");
+ case H5T_ARRAY:
+  return("H5T_ARRAY");
+ }
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 120d433..6fc09d7 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -538,31 +538,29 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai
                          hsize_t nelmts, hid_t type, void *_mem)
 {
     unsigned char *mem = (unsigned char*)_mem;
-    hsize_t       i;          /*element counter  */
-    char          *s;
-    char          *section;   /*a section of output  */
-    int           secnum;     /*section sequence number */
-    size_t        size;       /*size of each datum  */
-    size_t        ncols = 80; /*available output width */
-    h5tools_str_t buffer;     /*string into which to render */
-    int           multiline;  /*datum was multiline  */
-    hsize_t       curr_pos;   /* total data element position   */
-    int           elmt_counter = 0;/*counts the # elements printed.
-                                    *I (ptl?) needed something that
-                                    *isn't going to get reset when a new
-                                    *line is formed. I'm going to use
-                                    *this var to count elements and
-                                    *break after we see a number equal
-                                    *to the ctx->size_last_dim.   */
+    hsize_t  i;  /*element counter  */
+    char  *s, *section; /*a section of output  */
+    int   secnum;  /*section sequence number */
+    size_t  size;  /*size of each datum  */
+    size_t  ncols = 80; /*available output width */
+    h5tools_str_t buffer;  /*string into which to render */
+    int   multiline; /*datum was multiline  */
+    hsize_t  curr_pos;  /* total data element position   */
+    int                 elmt_counter = 0;/*counts the # elements printed.
+                                          *I (ptl?) needed something that
+                                          *isn't going to get reset when a new
+                                          *line is formed. I'm going to use
+                                          *this var to count elements and
+                                          *break after we see a number equal
+                                          *to the ctx->size_last_dim.   */
 
      /* binary dump */
-    if(bin_output) 
-    {
+    if(bin_output) {
         do_bin_output(stream, nelmts, type, _mem);
+        bin_output = 0;
     } /* end if */
-    else 
-    {
-        /* setup */
+    else {
+        /* Setup */
         HDmemset(&buffer, 0, sizeof(h5tools_str_t));
         size = H5Tget_size(type);
 
@@ -615,7 +613,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai
             }
 
             /*
-             * We need to break after each row of a dimension---> we should
+             * We need to break after each row_counter of a dimension---> we should
              * break at the end of the each last dimension well that is the
              * way the dumper did it before
              */
diff --git a/tools/testfiles/h5diff_58.txt b/tools/testfiles/h5diff_58.txt
index b582c88..38d3177 100644
--- a/tools/testfiles/h5diff_58.txt
+++ b/tools/testfiles/h5diff_58.txt
@@ -2,7 +2,7 @@
 Expected output for 'h5diff -v h5diff_dset1.h5 h5diff_dset2.h5 refreg'
 #############################
 dataset: </refreg> and </refreg>
-Referenced dataset      10272            10272
+Referenced dataset      5904            5904
 ------------------------------------------------------------
 Region blocks
 block #0           (2,2)-(7,7)           (0,0)-(2,2)
diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt
index bc9efbe..fe3e03f 100644
--- a/tools/testfiles/h5diff_70.txt
+++ b/tools/testfiles/h5diff_70.txt
@@ -19,15 +19,6 @@ position        string of </>   string of </>   difference
 [ 1 ]          d                z                
 [ 1 ]          e                z                
 4 differences found
-attribute: <VLstring of </>> and <VLstring of </>>
-size:           [2]           [2]
-position        VLstring of </> VLstring of </> difference          
-------------------------------------------------------------
-[ 0 ]          a                z                
-[ 0 ]          b                z                
-[ 1 ]          d                z                
-[ 1 ]          e                z                
-4 differences found
 attribute: <bitfield of </>> and <bitfield of </>>
 size:           [2]           [2]
 position        bitfield of </> bitfield of </> difference          
@@ -108,23 +99,6 @@ position        string2D of </> string2D of </> difference
 [ 2 1 ]          k                z                
 [ 2 1 ]          l                z                
 12 differences found
-attribute: <VLstring2D of </>> and <VLstring2D of </>>
-size:           [3x2]           [3x2]
-position        VLstring2D of </> VLstring2D of </> difference          
-------------------------------------------------------------
-[ 0 0 ]          a                z                
-[ 0 0 ]          b                z                
-[ 0 1 ]          c                z                
-[ 0 1 ]          d                z                
-[ 1 0 ]          e                z                
-[ 1 0 ]          f                z                
-[ 1 1 ]          g                z                
-[ 1 1 ]          h                z                
-[ 2 0 ]          i                z                
-[ 2 0 ]          j                z                
-[ 2 1 ]          k                z                
-[ 2 1 ]          l                z                
-12 differences found
 attribute: <bitfield2D of </>> and <bitfield2D of </>>
 size:           [3x2]           [3x2]
 position        bitfield2D of </> bitfield2D of </> difference          
@@ -288,58 +262,6 @@ position        string3D of </> string3D of </> difference
 [ 3 2 1 ]          X                z                
 [ 3 2 1 ]          Z                z                
 47 differences found
-attribute: <VLstring3D of </>> and <VLstring3D of </>>
-size:           [4x3x2]           [4x3x2]
-position        VLstring3D of </> VLstring3D of </> difference          
-------------------------------------------------------------
-[ 0 0 0 ]          a                z                
-[ 0 0 0 ]          b                z                
-[ 0 0 1 ]          c                z                
-[ 0 0 1 ]          d                z                
-[ 0 1 0 ]          e                z                
-[ 0 1 0 ]          f                z                
-[ 0 1 1 ]          g                z                
-[ 0 1 1 ]          h                z                
-[ 0 2 0 ]          i                z                
-[ 0 2 0 ]          j                z                
-[ 0 2 1 ]          k                z                
-[ 0 2 1 ]          l                z                
-[ 1 0 0 ]          m                z                
-[ 1 0 0 ]          n                z                
-[ 1 0 1 ]          p                z                
-[ 1 0 1 ]          q                z                
-[ 1 1 0 ]          r                z                
-[ 1 1 0 ]          s                z                
-[ 1 1 1 ]          t                z                
-[ 1 1 1 ]          u                z                
-[ 1 2 0 ]          v                z                
-[ 1 2 0 ]          w                z                
-[ 1 2 1 ]          x                z                
-[ 2 0 0 ]          A                z                
-[ 2 0 0 ]          B                z                
-[ 2 0 1 ]          C                z                
-[ 2 0 1 ]          D                z                
-[ 2 1 0 ]          E                z                
-[ 2 1 0 ]          F                z                
-[ 2 1 1 ]          G                z                
-[ 2 1 1 ]          H                z                
-[ 2 2 0 ]          I                z                
-[ 2 2 0 ]          J                z                
-[ 2 2 1 ]          K                z                
-[ 2 2 1 ]          L                z                
-[ 3 0 0 ]          M                z                
-[ 3 0 0 ]          N                z                
-[ 3 0 1 ]          P                z                
-[ 3 0 1 ]          Q                z                
-[ 3 1 0 ]          R                z                
-[ 3 1 0 ]          S                z                
-[ 3 1 1 ]          T                z                
-[ 3 1 1 ]          U                z                
-[ 3 2 0 ]          V                z                
-[ 3 2 0 ]          W                z                
-[ 3 2 1 ]          X                z                
-[ 3 2 1 ]          Z                z                
-47 differences found
 attribute: <bitfield3D of </>> and <bitfield3D of </>>
 size:           [4x3x2]           [4x3x2]
 position        bitfield3D of </> bitfield3D of </> difference          
@@ -690,15 +612,6 @@ position        string of </dset> string of </dset> difference
 [ 1 ]          d                z                
 [ 1 ]          e                z                
 4 differences found
-attribute: <VLstring of </dset>> and <VLstring of </dset>>
-size:           [2]           [2]
-position        VLstring of </dset> VLstring of </dset> difference          
-------------------------------------------------------------
-[ 0 ]          a                z                
-[ 0 ]          b                z                
-[ 1 ]          d                z                
-[ 1 ]          e                z                
-4 differences found
 attribute: <bitfield of </dset>> and <bitfield of </dset>>
 size:           [2]           [2]
 position        bitfield of </dset> bitfield of </dset> difference          
@@ -781,23 +694,6 @@ position        string2D of </dset> string2D of </dset> difference
 [ 2 1 ]          k                z                
 [ 2 1 ]          l                z                
 12 differences found
-attribute: <VLstring2D of </dset>> and <VLstring2D of </dset>>
-size:           [3x2]           [3x2]
-position        VLstring2D of </dset> VLstring2D of </dset> difference          
-------------------------------------------------------------
-[ 0 0 ]          a                z                
-[ 0 0 ]          b                z                
-[ 0 1 ]          c                z                
-[ 0 1 ]          d                z                
-[ 1 0 ]          e                z                
-[ 1 0 ]          f                z                
-[ 1 1 ]          g                z                
-[ 1 1 ]          h                z                
-[ 2 0 ]          i                z                
-[ 2 0 ]          j                z                
-[ 2 1 ]          k                z                
-[ 2 1 ]          l                z                
-12 differences found
 attribute: <bitfield2D of </dset>> and <bitfield2D of </dset>>
 size:           [3x2]           [3x2]
 position        bitfield2D of </dset> bitfield2D of </dset> difference          
@@ -963,58 +859,6 @@ position        string3D of </dset> string3D of </dset> difference
 [ 3 2 1 ]          X                z                
 [ 3 2 1 ]          Z                z                
 47 differences found
-attribute: <VLstring3D of </dset>> and <VLstring3D of </dset>>
-size:           [4x3x2]           [4x3x2]
-position        VLstring3D of </dset> VLstring3D of </dset> difference          
-------------------------------------------------------------
-[ 0 0 0 ]          a                z                
-[ 0 0 0 ]          b                z                
-[ 0 0 1 ]          c                z                
-[ 0 0 1 ]          d                z                
-[ 0 1 0 ]          e                z                
-[ 0 1 0 ]          f                z                
-[ 0 1 1 ]          g                z                
-[ 0 1 1 ]          h                z                
-[ 0 2 0 ]          i                z                
-[ 0 2 0 ]          j                z                
-[ 0 2 1 ]          k                z                
-[ 0 2 1 ]          l                z                
-[ 1 0 0 ]          m                z                
-[ 1 0 0 ]          n                z                
-[ 1 0 1 ]          p                z                
-[ 1 0 1 ]          q                z                
-[ 1 1 0 ]          r                z                
-[ 1 1 0 ]          s                z                
-[ 1 1 1 ]          t                z                
-[ 1 1 1 ]          u                z                
-[ 1 2 0 ]          v                z                
-[ 1 2 0 ]          w                z                
-[ 1 2 1 ]          x                z                
-[ 2 0 0 ]          A                z                
-[ 2 0 0 ]          B                z                
-[ 2 0 1 ]          C                z                
-[ 2 0 1 ]          D                z                
-[ 2 1 0 ]          E                z                
-[ 2 1 0 ]          F                z                
-[ 2 1 1 ]          G                z                
-[ 2 1 1 ]          H                z                
-[ 2 2 0 ]          I                z                
-[ 2 2 0 ]          J                z                
-[ 2 2 1 ]          K                z                
-[ 2 2 1 ]          L                z                
-[ 3 0 0 ]          M                z                
-[ 3 0 0 ]          N                z                
-[ 3 0 1 ]          P                z                
-[ 3 0 1 ]          Q                z                
-[ 3 1 0 ]          R                z                
-[ 3 1 0 ]          S                z                
-[ 3 1 1 ]          T                z                
-[ 3 1 1 ]          U                z                
-[ 3 2 0 ]          V                z                
-[ 3 2 0 ]          W                z                
-[ 3 2 1 ]          X                z                
-[ 3 2 1 ]          Z                z                
-47 differences found
 attribute: <bitfield3D of </dset>> and <bitfield3D of </dset>>
 size:           [4x3x2]           [4x3x2]
 position        bitfield3D of </dset> bitfield3D of </dset> difference          
@@ -1356,7 +1200,7 @@ position        float3D of </dset> float3D of </dset> difference
 [ 3 2 0 ]          23              0               23             
 [ 3 2 1 ]          24              0               24             
 24 differences found
-519 differences found
+456 differences found
 group  : </g1> and </g1>
 0 differences found
 attribute: <string of </g1>> and <string of </g1>>
@@ -1368,15 +1212,6 @@ position        string of </g1> string of </g1> difference
 [ 1 ]          d                z                
 [ 1 ]          e                z                
 4 differences found
-attribute: <VLstring of </g1>> and <VLstring of </g1>>
-size:           [2]           [2]
-position        VLstring of </g1> VLstring of </g1> difference          
-------------------------------------------------------------
-[ 0 ]          a                z                
-[ 0 ]          b                z                
-[ 1 ]          d                z                
-[ 1 ]          e                z                
-4 differences found
 attribute: <bitfield of </g1>> and <bitfield of </g1>>
 size:           [2]           [2]
 position        bitfield of </g1> bitfield of </g1> difference          
@@ -1457,23 +1292,6 @@ position        string2D of </g1> string2D of </g1> difference
 [ 2 1 ]          k                z                
 [ 2 1 ]          l                z                
 12 differences found
-attribute: <VLstring2D of </g1>> and <VLstring2D of </g1>>
-size:           [3x2]           [3x2]
-position        VLstring2D of </g1> VLstring2D of </g1> difference          
-------------------------------------------------------------
-[ 0 0 ]          a                z                
-[ 0 0 ]          b                z                
-[ 0 1 ]          c                z                
-[ 0 1 ]          d                z                
-[ 1 0 ]          e                z                
-[ 1 0 ]          f                z                
-[ 1 1 ]          g                z                
-[ 1 1 ]          h                z                
-[ 2 0 ]          i                z                
-[ 2 0 ]          j                z                
-[ 2 1 ]          k                z                
-[ 2 1 ]          l                z                
-12 differences found
 attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>>
 size:           [3x2]           [3x2]
 position        bitfield2D of </g1> bitfield2D of </g1> difference          
@@ -1637,58 +1455,6 @@ position        string3D of </g1> string3D of </g1> difference
 [ 3 2 1 ]          X                z                
 [ 3 2 1 ]          Z                z                
 47 differences found
-attribute: <VLstring3D of </g1>> and <VLstring3D of </g1>>
-size:           [4x3x2]           [4x3x2]
-position        VLstring3D of </g1> VLstring3D of </g1> difference          
-------------------------------------------------------------
-[ 0 0 0 ]          a                z                
-[ 0 0 0 ]          b                z                
-[ 0 0 1 ]          c                z                
-[ 0 0 1 ]          d                z                
-[ 0 1 0 ]          e                z                
-[ 0 1 0 ]          f                z                
-[ 0 1 1 ]          g                z                
-[ 0 1 1 ]          h                z                
-[ 0 2 0 ]          i                z                
-[ 0 2 0 ]          j                z                
-[ 0 2 1 ]          k                z                
-[ 0 2 1 ]          l                z                
-[ 1 0 0 ]          m                z                
-[ 1 0 0 ]          n                z                
-[ 1 0 1 ]          p                z                
-[ 1 0 1 ]          q                z                
-[ 1 1 0 ]          r                z                
-[ 1 1 0 ]          s                z                
-[ 1 1 1 ]          t                z                
-[ 1 1 1 ]          u                z                
-[ 1 2 0 ]          v                z                
-[ 1 2 0 ]          w                z                
-[ 1 2 1 ]          x                z                
-[ 2 0 0 ]          A                z                
-[ 2 0 0 ]          B                z                
-[ 2 0 1 ]          C                z                
-[ 2 0 1 ]          D                z                
-[ 2 1 0 ]          E                z                
-[ 2 1 0 ]          F                z                
-[ 2 1 1 ]          G                z                
-[ 2 1 1 ]          H                z                
-[ 2 2 0 ]          I                z                
-[ 2 2 0 ]          J                z                
-[ 2 2 1 ]          K                z                
-[ 2 2 1 ]          L                z                
-[ 3 0 0 ]          M                z                
-[ 3 0 0 ]          N                z                
-[ 3 0 1 ]          P                z                
-[ 3 0 1 ]          Q                z                
-[ 3 1 0 ]          R                z                
-[ 3 1 0 ]          S                z                
-[ 3 1 1 ]          T                z                
-[ 3 1 1 ]          U                z                
-[ 3 2 0 ]          V                z                
-[ 3 2 0 ]          W                z                
-[ 3 2 1 ]          X                z                
-[ 3 2 1 ]          Z                z                
-47 differences found
 attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>>
 size:           [4x3x2]           [4x3x2]
 position        bitfield3D of </g1> bitfield3D of </g1> difference          
diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt
index 9c0bd33..90ee5c0 100644
--- a/tools/testfiles/h5diff_80.txt
+++ b/tools/testfiles/h5diff_80.txt
@@ -8,9 +8,6 @@ file1     file2
     x      x    /dset          
     x      x    /dsetref       
     x      x    /g1            
-    x      x    /g1/VLstring   
-    x      x    /g1/VLstring2D 
-    x      x    /g1/VLstring3D 
     x      x    /g1/array      
     x      x    /g1/array2D    
     x      x    /g1/array3D    
@@ -56,84 +53,6 @@ dataset: </dsetref> and </dsetref>
 0 differences found
 group  : </g1> and </g1>
 0 differences found
-dataset: </g1/VLstring> and </g1/VLstring>
-size:           [2]           [2]
-position        VLstring        VLstring        difference          
-------------------------------------------------------------
-[ 0 ]          a                z                
-[ 0 ]          b                z                
-[ 1 ]          d                z                
-[ 1 ]          e                z                
-4 differences found
-dataset: </g1/VLstring2D> and </g1/VLstring2D>
-size:           [3x2]           [3x2]
-position        VLstring2D      VLstring2D      difference          
-------------------------------------------------------------
-[ 0 0 ]          a                z                
-[ 0 0 ]          b                z                
-[ 0 1 ]          c                z                
-[ 0 1 ]          d                z                
-[ 1 0 ]          e                z                
-[ 1 0 ]          f                z                
-[ 1 1 ]          g                z                
-[ 1 1 ]          h                z                
-[ 2 0 ]          i                z                
-[ 2 0 ]          j                z                
-[ 2 1 ]          k                z                
-[ 2 1 ]          l                z                
-12 differences found
-dataset: </g1/VLstring3D> and </g1/VLstring3D>
-size:           [4x3x2]           [4x3x2]
-position        VLstring3D      VLstring3D      difference          
-------------------------------------------------------------
-[ 0 0 0 ]          a                z                
-[ 0 0 0 ]          b                z                
-[ 0 0 1 ]          c                z                
-[ 0 0 1 ]          d                z                
-[ 0 1 0 ]          e                z                
-[ 0 1 0 ]          f                z                
-[ 0 1 1 ]          g                z                
-[ 0 1 1 ]          h                z                
-[ 0 2 0 ]          i                z                
-[ 0 2 0 ]          j                z                
-[ 0 2 1 ]          k                z                
-[ 0 2 1 ]          l                z                
-[ 1 0 0 ]          m                z                
-[ 1 0 0 ]          n                z                
-[ 1 0 1 ]          p                z                
-[ 1 0 1 ]          q                z                
-[ 1 1 0 ]          r                z                
-[ 1 1 0 ]          s                z                
-[ 1 1 1 ]          t                z                
-[ 1 1 1 ]          u                z                
-[ 1 2 0 ]          v                z                
-[ 1 2 0 ]          w                z                
-[ 1 2 1 ]          x                z                
-[ 2 0 0 ]          A                z                
-[ 2 0 0 ]          B                z                
-[ 2 0 1 ]          C                z                
-[ 2 0 1 ]          D                z                
-[ 2 1 0 ]          E                z                
-[ 2 1 0 ]          F                z                
-[ 2 1 1 ]          G                z                
-[ 2 1 1 ]          H                z                
-[ 2 2 0 ]          I                z                
-[ 2 2 0 ]          J                z                
-[ 2 2 1 ]          K                z                
-[ 2 2 1 ]          L                z                
-[ 3 0 0 ]          M                z                
-[ 3 0 0 ]          N                z                
-[ 3 0 1 ]          P                z                
-[ 3 0 1 ]          Q                z                
-[ 3 1 0 ]          R                z                
-[ 3 1 0 ]          S                z                
-[ 3 1 1 ]          T                z                
-[ 3 1 1 ]          U                z                
-[ 3 2 0 ]          V                z                
-[ 3 2 0 ]          W                z                
-[ 3 2 1 ]          X                z                
-[ 3 2 1 ]          Z                z                
-47 differences found
 dataset: </g1/array> and </g1/array>
 size:           [2]           [2]
 position        array           array           difference          
@@ -857,7 +776,7 @@ position        vlen3D          vlen3D          difference
 [ 3 2 1 ]          59              0               59             
 59 differences found
 dataset: </refreg> and </refreg>
-Referenced dataset      10272            10272
+Referenced dataset      5904            5904
 ------------------------------------------------------------
 Region blocks
 block #0           (2,2)-(7,7)           (0,0)-(2,2)
diff --git a/tools/testfiles/h5diff_attr1.h5 b/tools/testfiles/h5diff_attr1.h5
index c44066b..e261486 100644
--- a/tools/testfiles/h5diff_attr1.h5
+++ b/tools/testfiles/h5diff_attr1.h5
diff --git a/tools/testfiles/h5diff_attr2.h5 b/tools/testfiles/h5diff_attr2.h5
index 5de3303..0a59fc5 100644
--- a/tools/testfiles/h5diff_attr2.h5
+++ b/tools/testfiles/h5diff_attr2.h5
diff --git a/tools/testfiles/h5diff_basic2.h5 b/tools/testfiles/h5diff_basic2.h5
index ad45cc0..209485f 100644
--- a/tools/testfiles/h5diff_basic2.h5
+++ b/tools/testfiles/h5diff_basic2.h5
diff --git a/tools/testfiles/h5diff_dset1.h5 b/tools/testfiles/h5diff_dset1.h5
index ab6b96f..3f853be 100644
--- a/tools/testfiles/h5diff_dset1.h5
+++ b/tools/testfiles/h5diff_dset1.h5
diff --git a/tools/testfiles/h5diff_dset2.h5 b/tools/testfiles/h5diff_dset2.h5
index 3db0c8e..1f14d29 100644
--- a/tools/testfiles/h5diff_dset2.h5
+++ b/tools/testfiles/h5diff_dset2.h5
diff --git a/tools/testfiles/tallfilters.ddl b/tools/testfiles/tallfilters.ddl
index 43c27a9..282c085 100644
--- a/tools/testfiles/tallfilters.ddl
+++ b/tools/testfiles/tallfilters.ddl
@@ -7,7 +7,7 @@ DATASET "all" {
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
    STORAGE_LAYOUT {
       CHUNKED ( 10, 5 )
-      SIZE 458 (42.8%COMPRESSION)
+      SIZE 458
     }
    FILTERS {
       PREPROCESSING SHUFFLE
diff --git a/tools/testfiles/tbin4.ddl b/tools/testfiles/tbin4.ddl
index 78a6cd2..89849e4 100644
--- a/tools/testfiles/tbin4.ddl
+++ b/tools/testfiles/tbin4.ddl
@@ -1,7 +1,7 @@
 HDF5 "tbinary.h5" {
 DATASET "double" {
    DATATYPE  H5T_IEEE_F64LE
-   DATASPACE  SIMPLE { ( 6 ) / ( 6 ) }
+   DATASPACE  SIMPLE { ( 100000 ) / ( 100000 ) }
    DATA {
    }
 }
diff --git a/tools/testfiles/tbinary.h5 b/tools/testfiles/tbinary.h5
index adc5b15..691b008 100644
--- a/tools/testfiles/tbinary.h5
+++ b/tools/testfiles/tbinary.h5
diff --git a/tools/testfiles/tdeflate.ddl b/tools/testfiles/tdeflate.ddl
index cc5b49b..fc98432 100644
--- a/tools/testfiles/tdeflate.ddl
+++ b/tools/testfiles/tdeflate.ddl
@@ -7,7 +7,7 @@ DATASET "deflate" {
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
    STORAGE_LAYOUT {
       CHUNKED ( 10, 5 )
-      SIZE 385 (51.9%COMPRESSION)
+      SIZE 385
     }
    FILTERS {
       COMPRESSION DEFLATE { LEVEL 9 }
diff --git a/tools/testfiles/tnbit.ddl b/tools/testfiles/tnbit.ddl
index 2f932b5..a8bf549 100644
--- a/tools/testfiles/tnbit.ddl
+++ b/tools/testfiles/tnbit.ddl
@@ -7,7 +7,7 @@ DATASET "nbit" {
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
    STORAGE_LAYOUT {
       CHUNKED ( 10, 5 )
-      SIZE 76 (90.5%COMPRESSION)
+      SIZE 76
     }
    FILTERS {
       COMPRESSION NBIT
diff --git a/tools/testfiles/tscaleoffset.ddl b/tools/testfiles/tscaleoffset.ddl
index c9a46f4..6693f92 100644
--- a/tools/testfiles/tscaleoffset.ddl
+++ b/tools/testfiles/tscaleoffset.ddl
@@ -7,7 +7,7 @@ DATASET "scaleoffset" {
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
    STORAGE_LAYOUT {
       CHUNKED ( 10, 5 )
-      SIZE 152 (81.0%COMPRESSION)
+      SIZE 152
     }
    FILTERS {
       COMPRESSION SCALEOFFSET { MIN BITS 4 }
diff --git a/tools/testfiles/tszip.ddl b/tools/testfiles/tszip.ddl
index 6411bc3..4c6af47 100644
--- a/tools/testfiles/tszip.ddl
+++ b/tools/testfiles/tszip.ddl
@@ -7,7 +7,7 @@ DATASET "szip" {
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
    STORAGE_LAYOUT {
       CHUNKED ( 10, 5 )
-      SIZE 372 (53.5%COMPRESSION)
+      SIZE 372
     }
    FILTERS {
       COMPRESSION SZIP {
diff --git a/windows/c++/test/dsets_cpp/dsets_cpp.vcproj b/windows/c++/test/dsets_cpp/dsets_cpp.vcproj
index 050309c..3b37eee 100644
--- a/windows/c++/test/dsets_cpp/dsets_cpp.vcproj
+++ b/windows/c++/test/dsets_cpp/dsets_cpp.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="dsets_cpp"

 	ProjectGUID="{802B922A-E813-438E-A180-4A8839A11A55}"

-	RootNamespace="dsets_cpp"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../../test/dsets_cpp/Release/dsets_cpp.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../../test/dsets_cpp/Release/dsets_cpp.pdb"

diff --git a/windows/c++/test/dsets_cppdll/dsets_cppdll.vcproj b/windows/c++/test/dsets_cppdll/dsets_cppdll.vcproj
index 4e3a883..8ff1c29 100644
--- a/windows/c++/test/dsets_cppdll/dsets_cppdll.vcproj
+++ b/windows/c++/test/dsets_cppdll/dsets_cppdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="dsets_cppdll"

 	ProjectGUID="{76858167-F4DB-476C-A2B6-A3069D60D9E2}"

-	RootNamespace="dsets_cppdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="hdf5ddll.lib odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Debug"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="hdf5ddll.lib odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Debug"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="hdf5dll.lib odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Release"

 				ProgramDatabaseFile=".\../../../../test/dsets_cppdll/Release/dsets_cppdll.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="hdf5dll.lib odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Release"

 				ProgramDatabaseFile=".\../../../../test/dsets_cppdll/Release/dsets_cppdll.pdb"

diff --git a/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj b/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj
index 58de131..d60a52d 100644
--- a/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj
+++ b/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="testhdf5_cpp"

 	ProjectGUID="{EFA04391-B35B-44C0-AB27-1383D4C9E358}"

-	RootNamespace="testhdf5_cpp"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cpp/Release/testhdf5_cpp.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cpp/Release/testhdf5_cpp.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +260,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj b/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj
index 2d28c43..d64d274 100644
--- a/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj
+++ b/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="testhdf5_cppdll"

 	ProjectGUID="{DBA493BD-3AF1-4616-8A80-F6FD41B70392}"

-	RootNamespace="testhdf5_cppdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="hdf5ddll.lib odbc32.lib odbccp32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Debug"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="hdf5ddll.lib odbc32.lib odbccp32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Debug"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="hdf5dll.lib odbc32.lib odbccp32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Release"

 				ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cppdll/Release/testhdf5_cppdll.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\..\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="hdf5dll.lib odbc32.lib odbccp32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\Release"

 				ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cppdll/Release/testhdf5_cppdll.pdb"

diff --git a/windows/copy_hdf.bat b/windows/copy_hdf.bat
index c9b2957..b02e2eb 100755
--- a/windows/copy_hdf.bat
+++ b/windows/copy_hdf.bat
@@ -21,11 +21,11 @@ rem Last Update : November 17, 2007 by Scott Wegner
 

 pushd %~dp0

 

-copy /y src\H5Tinit.c ..\src > nul

-copy /y src\H5pubconf.h ..\src > nul

-copy /y fortran\src\H5f90i_gen.h ..\fortran\src > nul

-copy /y fortran\src\H5fortran_types.f90 ..\fortran\src > nul

-xcopy /s /i /y *.bat ..\ > nul

-copy /y examples\testExamples_exp_output.txt ..\examples > nul

+copy src\H5Tinit.c ..\src

+copy src\H5pubconf.h ..\src

+copy fortran\src\H5f90i_gen.h ..\fortran\src

+copy fortran\src\H5fortran_types.f90 ..\fortran\src

+xcopy /e/i/Y *.bat ..\

+copy examples\testExamples_exp_output.txt ..\examples

 

 popd

diff --git a/windows/fortran/examples/attreexampletest/attreexampletest.vfproj b/windows/fortran/examples/attreexampletest/attreexampletest.vfproj
index 5ab3c67..71e547e 100644
--- a/windows/fortran/examples/attreexampletest/attreexampletest.vfproj
+++ b/windows/fortran/examples/attreexampletest/attreexampletest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/attreexampletest.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/attreexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/attreexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/attreexampletest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/attreexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/attreexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/attreexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/attreexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/attreexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/attreexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/attreexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/attreexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/attreexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/attreexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\attrexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/attreexampletestdll/attreexampletestdll.vfproj b/windows/fortran/examples/attreexampletestdll/attreexampletestdll.vfproj
index 186e880..2941411 100644
--- a/windows/fortran/examples/attreexampletestdll/attreexampletestdll.vfproj
+++ b/windows/fortran/examples/attreexampletestdll/attreexampletestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/attreexampletestdll.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/attreexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/attreexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/attreexampletestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/attreexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/attreexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/attreexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/attreexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/attreexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/attreexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/attreexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/attreexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\attrexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/compoundtest/compoundtest.vfproj b/windows/fortran/examples/compoundtest/compoundtest.vfproj
index be0bf80..6cbd858 100644
--- a/windows/fortran/examples/compoundtest/compoundtest.vfproj
+++ b/windows/fortran/examples/compoundtest/compoundtest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/compoundtest.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/compoundtest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/compoundtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/compoundtest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/compoundtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/compoundtest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/compoundtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/compoundtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/compoundtest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/compoundtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/compoundtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/compoundtest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/compoundtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/compoundtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\compound.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/compoundtestdll/compoundtestdll.vfproj b/windows/fortran/examples/compoundtestdll/compoundtestdll.vfproj
index 0afe8ff..49605a9 100644
--- a/windows/fortran/examples/compoundtestdll/compoundtestdll.vfproj
+++ b/windows/fortran/examples/compoundtestdll/compoundtestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/compoundtestdll.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/compoundtestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/compoundtestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/compoundtestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/compoundtestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/compoundtestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/compoundtestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/compoundtestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/compoundtestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/compoundtestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/compoundtestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/compoundtestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\compound.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/dsetexampletest/dsetexampletest.vfproj b/windows/fortran/examples/dsetexampletest/dsetexampletest.vfproj
index 1c0f48b..642a5ee 100644
--- a/windows/fortran/examples/dsetexampletest/dsetexampletest.vfproj
+++ b/windows/fortran/examples/dsetexampletest/dsetexampletest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/dsetexampletest.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/dsetexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/dsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/dsetexampletest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/dsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/dsetexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/dsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/dsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/dsetexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/dsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/dsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/dsetexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/dsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/dsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\dsetexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/dsetexampletestdll/dsetexampletestdll.vfproj b/windows/fortran/examples/dsetexampletestdll/dsetexampletestdll.vfproj
index 3ad1b8d..0c525ec 100644
--- a/windows/fortran/examples/dsetexampletestdll/dsetexampletestdll.vfproj
+++ b/windows/fortran/examples/dsetexampletestdll/dsetexampletestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/dsetexampletestdll.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/dsetexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/dsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/dsetexampletestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/dsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/dsetexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/dsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/dsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/dsetexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/dsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/dsetexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/dsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\dsetexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/fileexampletest/fileexampletest.vfproj b/windows/fortran/examples/fileexampletest/fileexampletest.vfproj
index 6427bfb..2e42130 100644
--- a/windows/fortran/examples/fileexampletest/fileexampletest.vfproj
+++ b/windows/fortran/examples/fileexampletest/fileexampletest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/fileexampletest.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/fileexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/fileexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/fileexampletest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/fileexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/fileexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/fileexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/fileexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/fileexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/fileexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/fileexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/fileexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/fileexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/fileexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\fileexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/fileexampletestdll/fileexampletestdll.vfproj b/windows/fortran/examples/fileexampletestdll/fileexampletestdll.vfproj
index ec59134..270081c 100644
--- a/windows/fortran/examples/fileexampletestdll/fileexampletestdll.vfproj
+++ b/windows/fortran/examples/fileexampletestdll/fileexampletestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/fileexampletestdll.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/fileexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/fileexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/fileexampletestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/fileexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/fileexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/fileexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/fileexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/fileexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/fileexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/fileexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/fileexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\fileexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/groupexampletest/groupexampletest.vfproj b/windows/fortran/examples/groupexampletest/groupexampletest.vfproj
index 000a6ed..dffd7b7 100644
--- a/windows/fortran/examples/groupexampletest/groupexampletest.vfproj
+++ b/windows/fortran/examples/groupexampletest/groupexampletest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/groupexampletest.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/groupexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/groupexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/groupexampletest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/groupexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/groupexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/groupexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/groupexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/groupexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/groupexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/groupexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/groupexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/groupexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/groupexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\groupexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/groupexampletestdll/groupexampletestdll.vfproj b/windows/fortran/examples/groupexampletestdll/groupexampletestdll.vfproj
index b567ac2..0390a02 100644
--- a/windows/fortran/examples/groupexampletestdll/groupexampletestdll.vfproj
+++ b/windows/fortran/examples/groupexampletestdll/groupexampletestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/groupexampletestdll.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/groupexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/groupexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/groupexampletestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/groupexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/groupexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/groupexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/groupexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/groupexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/groupexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/groupexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/groupexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\groupexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/grpdsetexampletest/grpdsetexampletest.vfproj b/windows/fortran/examples/grpdsetexampletest/grpdsetexampletest.vfproj
index c897e60..8391b35 100644
--- a/windows/fortran/examples/grpdsetexampletest/grpdsetexampletest.vfproj
+++ b/windows/fortran/examples/grpdsetexampletest/grpdsetexampletest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpdsetexampletest.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpdsetexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpdsetexampletest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpdsetexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpdsetexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpdsetexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\grpdsetexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/grpdsetexampletestdll/grpdsetexampletestdll.vfproj b/windows/fortran/examples/grpdsetexampletestdll/grpdsetexampletestdll.vfproj
index 4aa60f5..e2f6cba 100644
--- a/windows/fortran/examples/grpdsetexampletestdll/grpdsetexampletestdll.vfproj
+++ b/windows/fortran/examples/grpdsetexampletestdll/grpdsetexampletestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpdsetexampletestdll.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpdsetexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpdsetexampletestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpdsetexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpdsetexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpdsetexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpdsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\grpdsetexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/grpittest/grpittest.vfproj b/windows/fortran/examples/grpittest/grpittest.vfproj
index 4df93ef..2f9af7e 100644
--- a/windows/fortran/examples/grpittest/grpittest.vfproj
+++ b/windows/fortran/examples/grpittest/grpittest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpittest.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpittest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpittest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpittest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpittest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpittest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/grpittest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/grpittest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpittest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpittest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpittest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpittest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/grpittest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/grpittest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\grpit.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/grpittestdll/grpittestdll.vfproj b/windows/fortran/examples/grpittestdll/grpittestdll.vfproj
index ceaea49..8ca49e5 100644
--- a/windows/fortran/examples/grpittestdll/grpittestdll.vfproj
+++ b/windows/fortran/examples/grpittestdll/grpittestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpittestdll.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpittestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/grpittestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpittestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/grpittestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpittestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpittestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpittestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpittestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/grpittestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpittestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpittestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\grpit.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/grpsexampletest/grpsexampletest.vfproj b/windows/fortran/examples/grpsexampletest/grpsexampletest.vfproj
index 6548a7a..2c49b6c 100644
--- a/windows/fortran/examples/grpsexampletest/grpsexampletest.vfproj
+++ b/windows/fortran/examples/grpsexampletest/grpsexampletest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpsexampletest.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpsexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/grpsexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpsexampletest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/grpsexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpsexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpsexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpsexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpsexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/grpsexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/grpsexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpsexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpsexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpsexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\grpsexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/grpsexampletestdll/grpsexampletestdll.vfproj b/windows/fortran/examples/grpsexampletestdll/grpsexampletestdll.vfproj
index 7bcd3de..ba8d18c 100644
--- a/windows/fortran/examples/grpsexampletestdll/grpsexampletestdll.vfproj
+++ b/windows/fortran/examples/grpsexampletestdll/grpsexampletestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpsexampletestdll.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpsexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpsexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpsexampletestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpsexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpsexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/grpsexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/grpsexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpsexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/grpsexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/grpsexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/grpsexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\grpsexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/hyperslabtest/hyperslabtest.vfproj b/windows/fortran/examples/hyperslabtest/hyperslabtest.vfproj
index 378e178..f6ed859 100644
--- a/windows/fortran/examples/hyperslabtest/hyperslabtest.vfproj
+++ b/windows/fortran/examples/hyperslabtest/hyperslabtest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hyperslabtest.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hyperslabtest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/hyperslabtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hyperslabtest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/hyperslabtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hyperslabtest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hyperslabtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hyperslabtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hyperslabtest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/hyperslabtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/hyperslabtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hyperslabtest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hyperslabtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hyperslabtest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\hyperslab.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/hyperslabtestdll/hyperslabtestdll.vfproj b/windows/fortran/examples/hyperslabtestdll/hyperslabtestdll.vfproj
index bd71275..76a8f14 100644
--- a/windows/fortran/examples/hyperslabtestdll/hyperslabtestdll.vfproj
+++ b/windows/fortran/examples/hyperslabtestdll/hyperslabtestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hyperslabtestdll.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hyperslabtestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hyperslabtestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hyperslabtestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hyperslabtestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hyperslabtestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/hyperslabtestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/hyperslabtestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hyperslabtestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hyperslabtestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hyperslabtestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/hyperslabtestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\hyperslab.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/mountexampletest/mountexampletest.vfproj b/windows/fortran/examples/mountexampletest/mountexampletest.vfproj
index ce6a9a0..666c906 100644
--- a/windows/fortran/examples/mountexampletest/mountexampletest.vfproj
+++ b/windows/fortran/examples/mountexampletest/mountexampletest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/mountexampletest.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/mountexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/mountexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/mountexampletest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/mountexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/mountexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/mountexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/mountexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/mountexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/mountexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/mountexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/mountexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/mountexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/mountexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\mountexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/mountexampletestdll/mountexampletestdll.vfproj b/windows/fortran/examples/mountexampletestdll/mountexampletestdll.vfproj
index f80531b..225ebdb 100644
--- a/windows/fortran/examples/mountexampletestdll/mountexampletestdll.vfproj
+++ b/windows/fortran/examples/mountexampletestdll/mountexampletestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/mountexampletestdll.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/mountexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/mountexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/mountexampletestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/mountexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/mountexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/mountexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/mountexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/mountexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/mountexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/mountexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/mountexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\mountexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/refobjexampletest/refobjexampletest.vfproj b/windows/fortran/examples/refobjexampletest/refobjexampletest.vfproj
index 1d1ab1e..24f36d1 100644
--- a/windows/fortran/examples/refobjexampletest/refobjexampletest.vfproj
+++ b/windows/fortran/examples/refobjexampletest/refobjexampletest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refobjexampletest.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refobjexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/refobjexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refobjexampletest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/refobjexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refobjexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refobjexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refobjexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refobjexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/refobjexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/refobjexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refobjexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refobjexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refobjexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\refobjexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/refobjexampletestdll/refobjexampletestdll.vfproj b/windows/fortran/examples/refobjexampletestdll/refobjexampletestdll.vfproj
index b0d7517..a3b7cab 100644
--- a/windows/fortran/examples/refobjexampletestdll/refobjexampletestdll.vfproj
+++ b/windows/fortran/examples/refobjexampletestdll/refobjexampletestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refobjexampletestdll.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refobjexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refobjexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refobjexampletestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refobjexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refobjexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/refobjexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/refobjexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refobjexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refobjexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refobjexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/refobjexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\refobjexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/refregexampletest/refregexampletest.vfproj b/windows/fortran/examples/refregexampletest/refregexampletest.vfproj
index 17b7969..1fb300c 100644
--- a/windows/fortran/examples/refregexampletest/refregexampletest.vfproj
+++ b/windows/fortran/examples/refregexampletest/refregexampletest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refregexampletest.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refregexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refregexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refregexampletest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refregexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refregexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/refregexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/refregexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refregexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refregexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refregexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refregexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/refregexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/refregexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\refregexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/refregexampletestdll/refregexampletestdll.vfproj b/windows/fortran/examples/refregexampletestdll/refregexampletestdll.vfproj
index 4672135..72db3cb 100644
--- a/windows/fortran/examples/refregexampletestdll/refregexampletestdll.vfproj
+++ b/windows/fortran/examples/refregexampletestdll/refregexampletestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refregexampletestdll.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refregexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refregexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refregexampletestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refregexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refregexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/refregexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/refregexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refregexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/refregexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/refregexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/refregexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\refregexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/rwdsetexampletest/rwdsetexampletest.vfproj b/windows/fortran/examples/rwdsetexampletest/rwdsetexampletest.vfproj
index 40d2f8c..8f46837 100644
--- a/windows/fortran/examples/rwdsetexampletest/rwdsetexampletest.vfproj
+++ b/windows/fortran/examples/rwdsetexampletest/rwdsetexampletest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/rwdsetexampletest.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/rwdsetexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/rwdsetexampletest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/rwdsetexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/rwdsetexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/rwdsetexampletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\rwdsetexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/rwdsetexampletestdll/rwdsetexampletestdll.vfproj b/windows/fortran/examples/rwdsetexampletestdll/rwdsetexampletestdll.vfproj
index ee22d56..35ff3bf 100644
--- a/windows/fortran/examples/rwdsetexampletestdll/rwdsetexampletestdll.vfproj
+++ b/windows/fortran/examples/rwdsetexampletestdll/rwdsetexampletestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/rwdsetexampletestdll.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/rwdsetexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/rwdsetexampletestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/rwdsetexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/rwdsetexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/rwdsetexampletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/rwdsetexampletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\rwdsetexample.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/selecteletest/selecteletest.vfproj b/windows/fortran/examples/selecteletest/selecteletest.vfproj
index 40c690a..d5466db 100644
--- a/windows/fortran/examples/selecteletest/selecteletest.vfproj
+++ b/windows/fortran/examples/selecteletest/selecteletest.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/selecteletest.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/selecteletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/selecteletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/selecteletest.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/selecteletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/selecteletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/selecteletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/selecteletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/selecteletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/Debug/;..\..\..\..\proj\hdf5_fortran\Debug/;Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/selecteletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\hdf5lib\debug\lib" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/selecteletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/selecteletest.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/selecteletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\hdf5lib\release\lib" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/selecteletest.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\selectele.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/examples/selecteletestdll/selecteletestdll.vfproj b/windows/fortran/examples/selecteletestdll/selecteletestdll.vfproj
index d7d92aa..dabad78 100644
--- a/windows/fortran/examples/selecteletestdll/selecteletestdll.vfproj
+++ b/windows/fortran/examples/selecteletestdll/selecteletestdll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/selecteletestdll.tlb"/>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/selecteletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/selecteletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/selecteletestdll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/selecteletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/selecteletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/selecteletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/selecteletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/selecteletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\hdf5lib\release\DLL" ProgramDatabaseFile="$(OUTDIR)/selecteletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/selecteletestdll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\hdf5lib\debug\DLL" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/selecteletestdll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\examples\selectele.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/test/flush1_fortran/flush1_fortran.vfproj b/windows/fortran/test/flush1_fortran/flush1_fortran.vfproj
index d869aa5..0232562 100644
--- a/windows/fortran/test/flush1_fortran/flush1_fortran.vfproj
+++ b/windows/fortran/test/flush1_fortran/flush1_fortran.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush1_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/flush1_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush1_fortran.tlb"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush1_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortran\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortran\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/flush1_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/flush1_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush1_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/flush1_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush1_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortran\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/flush1_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\test\fflush1.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/test/flush1_fortrandll/flush1_fortrandll.vfproj b/windows/fortran/test/flush1_fortrandll/flush1_fortrandll.vfproj
index aa8d458..85c0dd3 100644
--- a/windows/fortran/test/flush1_fortrandll/flush1_fortrandll.vfproj
+++ b/windows/fortran/test/flush1_fortrandll/flush1_fortrandll.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush1_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/flush1_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush1_fortrandll.tlb"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush1_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/flush1_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/flush1_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush1_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/flush1_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush1_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/flush1_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\test\fflush1.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/test/flush2_fortran/flush2_fortran.vfproj b/windows/fortran/test/flush2_fortran/flush2_fortran.vfproj
index 97c4e1e..f2cac5c 100644
--- a/windows/fortran/test/flush2_fortran/flush2_fortran.vfproj
+++ b/windows/fortran/test/flush2_fortran/flush2_fortran.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush2_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/flush2_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush2_fortran.tlb"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush2_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortran\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortran\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/flush2_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/flush2_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush2_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/flush2_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush2_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortran\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/flush2_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\test\fflush2.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/test/flush2_fortrandll/flush2_fortrandll.vfproj b/windows/fortran/test/flush2_fortrandll/flush2_fortrandll.vfproj
index 9e49132..09a74e0 100644
--- a/windows/fortran/test/flush2_fortrandll/flush2_fortrandll.vfproj
+++ b/windows/fortran/test/flush2_fortrandll/flush2_fortrandll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush2_fortrandll.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush2_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/flush2_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/flush2_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush2_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/flush2_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush2_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/flush2_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/flush2_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/flush2_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\test\fflush2.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/test/libtest_cstubdll/libtest_cstubdll.vcproj b/windows/fortran/test/libtest_cstubdll/libtest_cstubdll.vcproj
index 3fd617d..fc91703 100644
--- a/windows/fortran/test/libtest_cstubdll/libtest_cstubdll.vcproj
+++ b/windows/fortran/test/libtest_cstubdll/libtest_cstubdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="libtest_cstubdll"

 	ProjectGUID="{1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C}"

-	RootNamespace="libtest_cstubdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -80,7 +79,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\libtest_cstubdll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../fortran/test/libtest_cstubdll/Release/libtest_cstubdll.pdb"

 				ImportLibrary=".\../../../../fortran/test/libtest_cstubdll/Release/libtest_cstubdll.lib"

@@ -116,7 +115,7 @@
 			OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -174,7 +173,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\libtest_cstubdll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../fortran/test/libtest_cstubdll/Release/libtest_cstubdll.pdb"

 				ImportLibrary=".\../../../../fortran/test/libtest_cstubdll/Release/libtest_cstubdll.lib"

@@ -210,7 +209,7 @@
 			OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -267,7 +266,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\libtest_cstubddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../fortran/test/libtest_cstubdll/Debug/libtest_cstubddll.pdb"

@@ -304,7 +303,7 @@
 			OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -361,7 +360,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\libtest_cstubddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../fortran/test/libtest_cstubdll/Debug/libtest_cstubddll.pdb"

@@ -407,7 +406,7 @@
 					Name="VCCLCompilerTool"

 					Optimization="2"

 					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS;$(NoInherit)"

 				/>

 			</FileConfiguration>

 			<FileConfiguration

@@ -417,7 +416,7 @@
 					Name="VCCLCompilerTool"

 					Optimization="2"

 					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS;$(NoInherit)"

 				/>

 			</FileConfiguration>

 			<FileConfiguration

@@ -427,7 +426,7 @@
 					Name="VCCLCompilerTool"

 					Optimization="0"

 					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

+					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					BasicRuntimeChecks="3"

 				/>

 			</FileConfiguration>

@@ -438,7 +437,7 @@
 					Name="VCCLCompilerTool"

 					Optimization="0"

 					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

+					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					BasicRuntimeChecks="3"

 				/>

 			</FileConfiguration>

@@ -453,7 +452,7 @@
 					Name="VCCLCompilerTool"

 					Optimization="2"

 					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS;$(NoInherit)"

 				/>

 			</FileConfiguration>

 			<FileConfiguration

@@ -463,7 +462,7 @@
 					Name="VCCLCompilerTool"

 					Optimization="2"

 					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS;$(NoInherit)"

 				/>

 			</FileConfiguration>

 			<FileConfiguration

@@ -473,7 +472,7 @@
 					Name="VCCLCompilerTool"

 					Optimization="0"

 					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

+					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					BasicRuntimeChecks="3"

 				/>

 			</FileConfiguration>

@@ -484,7 +483,7 @@
 					Name="VCCLCompilerTool"

 					Optimization="0"

 					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

+					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					BasicRuntimeChecks="3"

 				/>

 			</FileConfiguration>

diff --git a/windows/fortran/test/libtest_fortran/libtest_cstub.vcproj b/windows/fortran/test/libtest_fortran/libtest_cstub.vcproj
index 4490f95..af47ff9 100644
--- a/windows/fortran/test/libtest_fortran/libtest_cstub.vcproj
+++ b/windows/fortran/test/libtest_fortran/libtest_cstub.vcproj
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -95,7 +95,7 @@
 			OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +170,7 @@
 			OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -245,7 +245,7 @@
 			OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

diff --git a/windows/fortran/test/libtest_fortran/libtest_fortran.vfproj b/windows/fortran/test/libtest_fortran/libtest_fortran.vfproj
index a87cb98..e455508 100644
--- a/windows/fortran/test/libtest_fortran/libtest_fortran.vfproj
+++ b/windows/fortran/test/libtest_fortran/libtest_fortran.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

 				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" Command="$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortran\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortran\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLibrarianTool" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="..\..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

 				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortran\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\test\tf.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/test/libtest_fortrandll/libtest_fortrandll.vfproj b/windows/fortran/test/libtest_fortrandll/libtest_fortrandll.vfproj
index 61bc96d..58b4b9c 100644
--- a/windows/fortran/test/libtest_fortrandll/libtest_fortrandll.vfproj
+++ b/windows/fortran/test/libtest_fortrandll/libtest_fortrandll.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="midlTargetWin32" TypeLibraryName="$(OUTDIR)/libtest_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" ModulePath="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\libtest_fortrandll.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" Command="$(TargetPath)">

-				<Tool Name="VFMidlTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="midlTargetWin32" TypeLibraryName="$(OUTDIR)/libtest_fortrandll.tlb"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="midlTargetWin32" TypeLibraryName="$(OUTDIR)/libtest_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" WarnArgMismatch="true" ModulePath="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" WarnArgMismatch="true" ModulePath="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" OutputFile="$(OutDir)\libtest_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\libtest_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/libtest_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" ModulePath="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" ModulePath="Release/;..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\libtest_fortrandll.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/libtest_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" WarnArgMismatch="true" ModulePath="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" WarnArgMismatch="true" ModulePath="Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\libtest_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\fortran\test\tf.f90"/></Files>

 	<Globals/></VisualStudioProject>

diff --git a/windows/fortran/test/testhdf5_fortran/testhdf5_fortran.vfproj b/windows/fortran/test/testhdf5_fortran/testhdf5_fortran.vfproj
index 178cc19..8f82df2 100644
--- a/windows/fortran/test/testhdf5_fortran/testhdf5_fortran.vfproj
+++ b/windows/fortran/test/testhdf5_fortran/testhdf5_fortran.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/testhdf5_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" ModulePath="..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" ModulePath="..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/testhdf5_fortran.tlb"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/testhdf5_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortran\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortran\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/testhdf5_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/;..\..\..\..\proj\hdf5_fortran\Release/" ModulePath="..\..\..\proj\hdf5_fortran\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/testhdf5_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\..\proj\hdf5_fortran\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortran\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 		<File RelativePath="..\..\..\..\fortran\test\fortranlib_test.f90"/>

diff --git a/windows/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.vfproj b/windows/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.vfproj
index 9daf267..66d0e84 100644
--- a/windows/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.vfproj
+++ b/windows/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/testhdf5_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Release/;..\..\..\proj\hdf5_fortrandll\Release/" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Release/;..\..\..\proj\hdf5_fortrandll\Release/" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/testhdf5_fortrandll.tlb"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/testhdf5_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\proj\hdf5_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\proj\hdf5_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/testhdf5_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Release/;..\..\..\proj\hdf5_fortrandll\Release/" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/testhdf5_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\proj\hdf5_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/testhdf5_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 		<File RelativePath="..\..\..\..\fortran\test\fortranlib_test.f90"/>

@@ -57,7 +57,7 @@
 		<File RelativePath="..\..\..\..\fortran\test\tH5VL.f90"/>

 		<File RelativePath="..\..\..\..\fortran\test\tH5Z.f90">

 			<FileConfiguration Name="Debug|Win32">

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="false" AdditionalIncludeDirectories="..\..\..\..\proj\hdf5_fortrandll\Debug/" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/"/></FileConfiguration>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalIncludeDirectories="..\..\..\..\proj\hdf5_fortrandll\Debug/" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/"/></FileConfiguration>

 			<FileConfiguration Name="Debug|x64">

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalIncludeDirectories="..\..\..\..\proj\hdf5_fortrandll\Debug/" ModulePath="..\..\..\..\proj\hdf5_fortrandll\Debug/"/></FileConfiguration></File></Filter>

 		<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;fi;fd"/>

diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT
index 192940e..26b1e14 100755
--- a/windows/hdf5bt.BAT
+++ b/windows/hdf5bt.BAT
@@ -19,9 +19,6 @@ rem This batch file takes the following options:
 rem .  /fort             Build and test HDF5 with Fortran libraries

 rem .  /useenv           Build HDF5 using compiler settings defined

 rem .                    in the environment, rather than the IDE.

-rem .  /log               Log the build and test results in files defined by

-rem .                      environment variables HDF5BUILD_LOG and

-rem .                      HDF5CHECK_LOG

 rem .  /?                Help information

 rem By Xuan Bai

 rem Created: Aug. 16, 2004

@@ -36,8 +33,6 @@ rem    - szip and zlib DLLs are already placed in an accessible directory
 rem    - hdf5_ext_szip or hdf5_ext_zlib have been set accordingly

 rem    - if building with the /useenv option, szip and zlib paths have been added

 rem      to %include% and %libpath% as necessary.

-rem    - if using the /log option, hdf5build_log and hdf5_check log should be defined

-rem    - in the environment.

 

 rem By default, only C and C++ libraries are built and tested.

 

@@ -45,7 +40,6 @@ setlocal enabledelayedexpansion
 pushd %~dp0

 

 set nerrors=0

-if "%1"=="/?" goto help

 goto main

 

 rem Print a help message

@@ -75,10 +69,6 @@ rem Parse through the parameters sent to file, and set appropriate variables
             rem Pass /useenv flag to devenv

             set hdf5_useenv=true

             

-        ) else if "%%a"=="/log" (

-            rem Log our results to files defined in environment

-            set hdf5_logresults=true

-                        

         ) else if "%%a"=="/?" (

             rem Set errorlevel 1 and send to help

             call :help

@@ -112,49 +102,21 @@ rem Setup our environment
         set hdf5build_params=%hdf5build_params% /useenv

     )

     

-    rem Clear out our log files if they will be used

-    if defined hdf5_logresults (

-        if not defined hdf5build_log (

-            echo.Error: HDF5BUILD_LOG not defined in environment!

-            exit /b 1

-        ) else (

-            type nul > !hdf5build_log!

-        )

-        

-        if not defined hdf5check_log (

-            echo.Error: HDF5CHECK_LOG not defined in environment!

-            exit /b 1

-        ) else (

-            type nul > !hdf5check_log!

-        )

-    )

-    

     exit /b 0

 

 

 rem Build HDF5 libraries and tools

 :build

 

-    if defined hdf5_logresults (

-        echo.Calling hdf5bbuild.bat %hdf5build_params%

-        echo.Results logged in %hdf5build_log%

-        call hdf5build.bat %hdf5build_params% > !hdf5build_log! 2>&1

-    ) else (

-        call hdf5build.bat %hdf5build_params%

-    )

+    call hdf5build.bat %hdf5build_params%

 

     exit /b

 

 

 rem Test our libraries and tools

 :test

-    if defined hdf5_logresults (

-        echo.Calling hdf5check.bat %hdf5check_params%

-        echo.Results logged in %hdf5check_log%

-        call hdf5check %hdf5check_params% > !hdf5check_log! 2>&1

-    ) else (

-        call hdf5check %hdf5check_params%

-    )

+

+    call hdf5check %hdf5check_params%

 

     exit /b

 

@@ -189,10 +151,6 @@ rem This is where the magic happens
     )

 

     call :setup

-    if %errorlevel% neq 0 (

-        echo.Error setting up hdf5bt environment!

-        goto error

-    )

 

     echo.*****************************************************************************

     echo.                        Build and Test HDF5 Library and Tools

diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT
index f361e23..71f079c 100755
--- a/windows/hdf5build.BAT
+++ b/windows/hdf5build.BAT
@@ -158,7 +158,7 @@ rem Build the HDF5 libraries.  By default, C and C++ libraries are built.
     rem Build both debug and release versions

     for %%a in (debug release) DO (

         echo.Building %%a libraries...

-        devenv %hdf5_sln% %ccflags% /rebuild %%a

+        devenv .\windows\proj\all\all.sln %ccflags% /rebuild %%a

         if !errorlevel! neq 0 exit /b

     )

 

diff --git a/windows/hdf5build_examples.BAT b/windows/hdf5build_examples.BAT
deleted file mode 100644
index 52b106a..0000000
--- a/windows/hdf5build_examples.BAT
+++ /dev/null
@@ -1,221 +0,0 @@
-@echo OFF

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from helphdfgroup.org.

-

-

-rem File Name: hdf5build_examples.bat

-rem This batch file is used to build HDF5 C/C++/Fortran examples.

-rem This batch file takes the following options:

-rem .  /fort             Build HDF5 examples, including Fortran

-rem .  /useenv           Build HDF5 examples using compiler settings defined

-rem .                    in the environment, rather than the IDE.

-rem .  /?                Help information

-rem By Scott Wegner

-rem Created: April 1st, 2008

-rem Last Updated: April 14, 2008

-

-rem This batch file makes the following assumptions:

-rem    - The appropriate version of Visual Studio is installed and setup

-rem    - The directory structure is setup from a fresh source copy

-rem    - copy_hdf.bat has already been run from the ./windows directory

-rem    - HDF5 has already been built using standard settings

-rem    - Visual Studio already contains the required paths for external libraries

-rem    - szip and zlib DLLs are already placed in an accessible directory

-rem    - hdf5_ext_szip or hdf5_ext_zlib have been set accordingly

-rem    - if building with the /useenv option, szip and zlib paths have been added

-rem      to %include% and %libpath% as necessary.

-

-rem By default, only C and C++ examples are built.

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-set nerrors=0

-if "%1"=="/?" goto help

-goto main

-

-rem Print a help message

-:help

-

-    echo.Builds HDF5 example projects.

-    echo.

-    echo.Usage: %~nx0 [OPTION]

-    echo.

-    echo.   /fort             Build HDF5 examples, including Fortran

-    echo.   /useenv           Build HDF5 examples using compiler settings defined

-    echo.                     in the environment, rather than the IDE.

-    echo.   /?                Help information

-

-    exit /b 0

-

-

-rem Parse through the parameters sent to file, and set appropriate variables

-:parse_params

-

-    for %%a in (%*) do (

-        if "%%a"=="/fort" (

-            rem Enable Fortran

-            set hdf5_enablefortran=true

-            

-        ) else if "%%a"=="/useenv" (

-            rem Pass /useenv flag to devenv

-            set hdf5_useenv=true

-            

-        ) else (

-            rem Set errorlevel 2 to send to help if we receive a bad parameter

-            echo.Unknown option: %%a

-            call :help

-            exit /b 1

-        )

-    )

-    

-    exit /b 0

-

-

-rem Setup our environment

-:setup

-

-    rem Constants

-    

-    echo.Setting up environment

-    

-    rem Setup Visual Studio environment.  By default, use the Visual Studio 

-    rem 2005 environment.

-    

-    set ccflags=

-    

-    rem Currently VS2005 is the only compiler supported.  --SJW 9/26/07

-    echo.Using Visual Studio 2005

-    

-    if not defined hdf5_enablefortran (

-        if defined vs80comntools (

-            rem This sets the Visual Studio path and environment variables

-            call "%vs80comntools%\vsvars32.bat"

-        ) else (

-            echo.Error: Cannot setup Visual Studio 2005 environment.  Please

-            echo.make sure VS80COMNTOOLS is defined in the environment.

-            exit /b 1

-        )

-        

-    ) else (

-        echo.with Intel Visual Fortran 9.1

-        

-        if defined ifort_compiler91 (

-            rem This sets the Intel Fortran 9.1 environment, as well as

-            rem setting the appropriate Visual Studio environment

-            

-            rem Assume 32-bit environment

-            call "%ifort_compiler91%\IA32\Bin\ifortvars.bat"

-        ) else (

-            echo.Error: Cannot setup Intel Fortran 9.1 environment.  Please

-            echo.make sure IFORT_COMPILER91 is defined in the environment.

-            exit /b 1

-        )

-    )

-    

-    rem Setup variables for our SLN files

-    set C_SLN=%CD%\windows\examples\allexamples\allexamples.sln

-    set CPP_SLN=%CD%\windows\c++\examples\allcppexamples\allcppexamples.sln

-    set HL_SLN=%CD%\windows\hl\examples\allhlcexamples\allhlcexamples.sln

-    rem We currently don't have HL C++ project files

-    if defined hdf5_enablefortran (

-        set FORT_SLN=%CD%\windows\fortran\examples\allf90examples\allf90examples.sln

-        set HLFORT_SLN=%CD%\windows\hl\fortran\examples\allhlf90examples\allhlf90examples.sln

-    ) else (

-        set FORT_SLN=

-        set HLFORT_SLN=

-    )

-    

-    if defined hdf5_useenv (

-        rem This will tell Visual Studio to use include, library, etc. paths

-        rem defined by %INCLUDE% %LIBPATH%, etc.  Assume the user has already

-        rem added external library paths to these variables.

-        set ccflags=%ccflags% /useenv

-    )

-

-    exit /b 0

-

-

-rem Build the HDF5 libraries.  By default, C and C++ libraries are built.

-:build

-

-    echo.Building HDF5

-

-    echo.*****************************************************************************

-    echo.                        Build HDF5 Examples

-    echo.*****************************************************************************

-    echo.

-

-    rem TODO: Write code for each of these example sets

-    rem Build both debug and release versions

-    for %%a in (C CPP HL FORT HLFORT) do (

-        if defined %%a_SLN (

-            echo.**************************

-            echo. Building %%a Examples

-            echo.**************************

-            for %%b in (Debug Release) do (

-                echo.Building %%a %%b examples...

-                devenv !%%a_SLN! %ccflags% /rebuild %%b

-                if !errorlevel! neq 0 (

-                    echo.HDF5 %%b %%a examples build failed

-                    exit /b

-                )

-            )

-        )

-    )

-

-    exit /b

-

-

-rem Handle errors

-:error

-

-    rem For now, our error handling consists of setting nerrors and quitting

-    echo.HDF5 examples build failed.

-    set /a nerrors=%nerrors%+1

-    goto end

-    

-    rem We'll never really get here, but we keep this line for consistency.

-    exit /b

-

-

-rem This is where the magic happens

-:main

-

-    call :parse_params %*

-    if %errorlevel% neq 0 (

-        rem Error case.

-        echo.Error parsing parameters!

-        goto error

-    )

-    

-    call :setup

-    if %errorlevel% neq 0 (

-        echo.Error setting up examples build environment.

-        goto error

-    )

-

-    call :build

-    if %errorlevel% neq 0 (

-        echo.Error building HDF5 examples!

-        goto error

-    )

-

-    if "%nerrors%"=="0" (

-        echo. All HDF5 example projects built successfully!

-    )

-    rem Fall through to end

-

-:end

-    popd

-    endlocal & exit /b %nerrors%

diff --git a/windows/hdf5check.BAT b/windows/hdf5check.BAT
index f3caea2..929abab 100755
--- a/windows/hdf5check.BAT
+++ b/windows/hdf5check.BAT
@@ -101,7 +101,7 @@ rem on it for sending parameters.  --SJW 9/6/07
     call :add_test checktools.bat .\tools

     

     rem Only check C++/Fortran if they are set to build.

-    if defined build_cpp_conditional (

+    if defined build_cxx_conditional (

         call :add_test checkcpptests.bat .\c++\test

     )

     if defined build_fortran_conditional (

@@ -133,4 +133,4 @@ rem on it for sending parameters.  --SJW 9/6/07
     

     popd

     endlocal & exit /b %nerrors%

-    

+    
\ No newline at end of file
diff --git a/windows/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj b/windows/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj
index 5417f67..cec63c8 100644
--- a/windows/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj
+++ b/windows/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hl_test_table_cpp"

 	ProjectGUID="{6312B365-AA53-43AA-BD00-848C1323CA8B}"

-	RootNamespace="hl_test_table_cpp"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/hl_test_table_cpp.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/hl_test_table_cpp.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/hl_test_table_cpp.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cpp/Release/hl_test_table_cpp.pdb"

 				SubSystem="1"

diff --git a/windows/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj b/windows/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj
index e8740a8..d79e83a 100644
--- a/windows/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj
+++ b/windows/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hl_test_table_cppdll"

 	ProjectGUID="{0D18A50F-52B3-4322-AC0D-F15CD657CEC4}"

-	RootNamespace="hl_test_table_cppdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/hl_test_table_cppdll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Release/hl_test_table_cppdll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/hl_test_table_cppdll.pdb"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\..\..\hl\c++\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -351,7 +350,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/hl_test_table_cppdll.pdb"

diff --git a/windows/hl/examples/allhlcexamples/allhlcexamples.sln b/windows/hl/examples/allhlcexamples/allhlcexamples.sln
index 95c9bcc..f0a4082 100644
--- a/windows/hl/examples/allhlcexamples/allhlcexamples.sln
+++ b/windows/hl/examples/allhlcexamples/allhlcexamples.sln
@@ -14,85 +14,25 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allhlcexamples", "allhlcexa
 		{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618} = {4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_ds1", "..\ex_ds1\ex_ds1.vcproj", "{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_ds", "..\ex_ds\ex_ds.vcproj", "{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_ds1dll", "..\ex_ds1dll\ex_ds1dll.vcproj", "{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_dsdll", "..\ex_dsdll\ex_dsdll.vcproj", "{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_image1", "..\ex_image1\ex_image1.vcproj", "{B4DE42B5-0032-4175-BEEE-F65875360A45}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_images", "..\ex_images\ex_images.vcproj", "{B4DE42B5-0032-4175-BEEE-F65875360A45}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_image1dll", "..\ex_image1dll\ex_image1dll.vcproj", "{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_imagesdll", "..\ex_imagesdll\ex_imagesdll.vcproj", "{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite1", "..\ex_lite1\ex_lite1.vcproj", "{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite", "..\ex_lite\ex_lite.vcproj", "{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite1dll", "..\ex_lite1dll\ex_lite1dll.vcproj", "{DB7330C6-D009-4BF7-B85D-656185825950}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_litedll", "..\ex_litedll\ex_litedll.vcproj", "{DB7330C6-D009-4BF7-B85D-656185825950}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptExampleFL", "..\ptExampleFL\ptExampleFL.vcproj", "{47753B08-F9F5-409B-9EC2-9135B4508BAF}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_packet", "..\ex_packet\ex_packet.vcproj", "{47753B08-F9F5-409B-9EC2-9135B4508BAF}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptExampleFLdll", "..\ptExampleFLdll\ptExampleFLdll.vcproj", "{25DC2207-299D-4272-9530-B126539BE0E9}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_packetdll", "..\ex_packetdll\ex_packetdll.vcproj", "{25DC2207-299D-4272-9530-B126539BE0E9}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table01", "..\ex_table01\ex_table01.vcproj", "{334E19CF-8B74-4067-8303-A398E3F22593}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table", "..\ex_table\ex_table.vcproj", "{334E19CF-8B74-4067-8303-A398E3F22593}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table01dll", "..\ex_table01dll\ex_table01dll.vcproj", "{4116EF37-EBA5-424F-A01B-2D80DB5807E3}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite2", "..\ex_lite2\ex_lite2.vcproj", "{47A5C65E-8669-4AF7-AC7F-ABD572567243}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite2dll", "..\ex_lite2dll\ex_lite2dll.vcproj", "{95515861-DE06-4542-AA50-6E4780597720}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite3", "..\ex_lite3\ex_lite3.vcproj", "{E5A24019-F635-4D4E-8A60-2D757F05C906}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite3dll", "..\ex_lite3dll\ex_lite3dll.vcproj", "{8431432A-6535-4599-9D76-008C4420CF1D}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptExampleVL", "..\ptExampleVL\ptExampleVL.vcproj", "{CD526D51-176A-4AC1-B2C9-B2155FAF59FB}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptExampleVLdll", "..\ptExampleVLdll\ptExampleVLdll.vcproj", "{0A6C0B51-23EF-40E7-A086-BACF2171B02F}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_image2", "..\ex_image2\ex_image2.vcproj", "{66106B22-4C8B-4B4A-A8DE-0C1ADEF0A219}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_image2dll", "..\ex_image2dll\ex_image2dll.vcproj", "{CADD763A-7F15-453F-A922-79C5FC9FDAED}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table02", "..\ex_table02\ex_table02.vcproj", "{B28B170D-0C78-484C-B398-A6F2FA2C1B26}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table02dll", "..\ex_table02dll\ex_table02dll.vcproj", "{D29B5F9D-CA5C-4F2F-AB16-8FE0189E520C}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table03", "..\ex_table03\ex_table03.vcproj", "{7E46D3EA-E3AA-458B-ACA8-A585F62B24A9}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table03dll", "..\ex_table03dll\ex_table03dll.vcproj", "{D72AE740-D901-41E7-8A85-04A41EA31EB5}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table04", "..\ex_table04\ex_table04.vcproj", "{A840E983-177E-4218-916F-37391939E32D}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table04dll", "..\ex_table04dll\ex_table04dll.vcproj", "{33FCABE9-BCC4-4894-9BD5-C3AD8FB0E18A}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table05", "..\ex_table05\ex_table05.vcproj", "{B0C2EB18-6469-4350-AC72-983E3D0B5F3C}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table05dll", "..\ex_table05dll\ex_table05dll.vcproj", "{86418725-0244-46CC-A4E1-D7D21CAC620B}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table06", "..\ex_table06\ex_table06.vcproj", "{8E92B4DB-65AD-4CF7-B806-3AA6D17F3F5C}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table06dll", "..\ex_table06dll\ex_table06dll.vcproj", "{DC9562D3-A5A4-4BB0-98C3-7863AACFF1C8}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table07", "..\ex_table07\ex_table07.vcproj", "{2FBE4820-120C-478D-8DF2-39E53C885830}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table07dll", "..\ex_table07dll\ex_table07dll.vcproj", "{9CD7FB43-AEAA-4380-AB53-9DC8487D553F}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table08", "..\ex_table08\ex_table08.vcproj", "{58988CC8-3154-45C1-A05E-9AF4FE45D7FE}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table08dll", "..\ex_table08dll\ex_table08dll.vcproj", "{A800762F-F9D8-494B-AFCE-AFE75053A9C8}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table09", "..\ex_table09\ex_table09.vcproj", "{5FC6935E-35DE-4A68-87FE-8ADCDEED2B48}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table09dll", "..\ex_table09dll\ex_table09dll.vcproj", "{D3FAA3AB-9A66-4911-85CE-73B674B683EC}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table10", "..\ex_table10\ex_table10.vcproj", "{31BA8F80-0A8C-4CFC-AD63-D947F1ABAC8C}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table10dll", "..\ex_table10dll\ex_table10dll.vcproj", "{EBA97261-BA06-4889-8568-0488E791F9A3}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table11", "..\ex_table11\ex_table11.vcproj", "{BB90C9EC-7C4F-4AEA-A64E-95A2EA9C2F06}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table11dll", "..\ex_table11dll\ex_table11dll.vcproj", "{93EA2B92-DF8B-4D30-9788-99D63D779756}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table12", "..\ex_table12\ex_table12.vcproj", "{F8D2C124-2238-47AB-8A51-4A42D8F10BF5}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table12dll", "..\ex_table12dll\ex_table12dll.vcproj", "{447B9176-2551-4BE1-BBFF-D74C1723D6E0}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_tabledll", "..\ex_tabledll\ex_tabledll.vcproj", "{4116EF37-EBA5-424F-A01B-2D80DB5807E3}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -190,246 +130,6 @@ Global
 		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Release|Win32.Build.0 = Release|Win32

 		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Release|x64.ActiveCfg = Release|x64

 		{4116EF37-EBA5-424F-A01B-2D80DB5807E3}.Release|x64.Build.0 = Release|x64

-		{47A5C65E-8669-4AF7-AC7F-ABD572567243}.Debug|Win32.ActiveCfg = Debug|Win32

-		{47A5C65E-8669-4AF7-AC7F-ABD572567243}.Debug|Win32.Build.0 = Debug|Win32

-		{47A5C65E-8669-4AF7-AC7F-ABD572567243}.Debug|x64.ActiveCfg = Debug|x64

-		{47A5C65E-8669-4AF7-AC7F-ABD572567243}.Debug|x64.Build.0 = Debug|x64

-		{47A5C65E-8669-4AF7-AC7F-ABD572567243}.Release|Win32.ActiveCfg = Release|Win32

-		{47A5C65E-8669-4AF7-AC7F-ABD572567243}.Release|Win32.Build.0 = Release|Win32

-		{47A5C65E-8669-4AF7-AC7F-ABD572567243}.Release|x64.ActiveCfg = Release|x64

-		{47A5C65E-8669-4AF7-AC7F-ABD572567243}.Release|x64.Build.0 = Release|x64

-		{95515861-DE06-4542-AA50-6E4780597720}.Debug|Win32.ActiveCfg = Debug|Win32

-		{95515861-DE06-4542-AA50-6E4780597720}.Debug|Win32.Build.0 = Debug|Win32

-		{95515861-DE06-4542-AA50-6E4780597720}.Debug|x64.ActiveCfg = Debug|x64

-		{95515861-DE06-4542-AA50-6E4780597720}.Debug|x64.Build.0 = Debug|x64

-		{95515861-DE06-4542-AA50-6E4780597720}.Release|Win32.ActiveCfg = Release|Win32

-		{95515861-DE06-4542-AA50-6E4780597720}.Release|Win32.Build.0 = Release|Win32

-		{95515861-DE06-4542-AA50-6E4780597720}.Release|x64.ActiveCfg = Release|x64

-		{95515861-DE06-4542-AA50-6E4780597720}.Release|x64.Build.0 = Release|x64

-		{E5A24019-F635-4D4E-8A60-2D757F05C906}.Debug|Win32.ActiveCfg = Debug|Win32

-		{E5A24019-F635-4D4E-8A60-2D757F05C906}.Debug|Win32.Build.0 = Debug|Win32

-		{E5A24019-F635-4D4E-8A60-2D757F05C906}.Debug|x64.ActiveCfg = Debug|x64

-		{E5A24019-F635-4D4E-8A60-2D757F05C906}.Debug|x64.Build.0 = Debug|x64

-		{E5A24019-F635-4D4E-8A60-2D757F05C906}.Release|Win32.ActiveCfg = Release|Win32

-		{E5A24019-F635-4D4E-8A60-2D757F05C906}.Release|Win32.Build.0 = Release|Win32

-		{E5A24019-F635-4D4E-8A60-2D757F05C906}.Release|x64.ActiveCfg = Release|x64

-		{E5A24019-F635-4D4E-8A60-2D757F05C906}.Release|x64.Build.0 = Release|x64

-		{8431432A-6535-4599-9D76-008C4420CF1D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8431432A-6535-4599-9D76-008C4420CF1D}.Debug|Win32.Build.0 = Debug|Win32

-		{8431432A-6535-4599-9D76-008C4420CF1D}.Debug|x64.ActiveCfg = Debug|x64

-		{8431432A-6535-4599-9D76-008C4420CF1D}.Debug|x64.Build.0 = Debug|x64

-		{8431432A-6535-4599-9D76-008C4420CF1D}.Release|Win32.ActiveCfg = Release|Win32

-		{8431432A-6535-4599-9D76-008C4420CF1D}.Release|Win32.Build.0 = Release|Win32

-		{8431432A-6535-4599-9D76-008C4420CF1D}.Release|x64.ActiveCfg = Release|x64

-		{8431432A-6535-4599-9D76-008C4420CF1D}.Release|x64.Build.0 = Release|x64

-		{CD526D51-176A-4AC1-B2C9-B2155FAF59FB}.Debug|Win32.ActiveCfg = Debug|Win32

-		{CD526D51-176A-4AC1-B2C9-B2155FAF59FB}.Debug|Win32.Build.0 = Debug|Win32

-		{CD526D51-176A-4AC1-B2C9-B2155FAF59FB}.Debug|x64.ActiveCfg = Debug|x64

-		{CD526D51-176A-4AC1-B2C9-B2155FAF59FB}.Debug|x64.Build.0 = Debug|x64

-		{CD526D51-176A-4AC1-B2C9-B2155FAF59FB}.Release|Win32.ActiveCfg = Release|Win32

-		{CD526D51-176A-4AC1-B2C9-B2155FAF59FB}.Release|Win32.Build.0 = Release|Win32

-		{CD526D51-176A-4AC1-B2C9-B2155FAF59FB}.Release|x64.ActiveCfg = Release|x64

-		{CD526D51-176A-4AC1-B2C9-B2155FAF59FB}.Release|x64.Build.0 = Release|x64

-		{0A6C0B51-23EF-40E7-A086-BACF2171B02F}.Debug|Win32.ActiveCfg = Debug|Win32

-		{0A6C0B51-23EF-40E7-A086-BACF2171B02F}.Debug|Win32.Build.0 = Debug|Win32

-		{0A6C0B51-23EF-40E7-A086-BACF2171B02F}.Debug|x64.ActiveCfg = Debug|x64

-		{0A6C0B51-23EF-40E7-A086-BACF2171B02F}.Debug|x64.Build.0 = Debug|x64

-		{0A6C0B51-23EF-40E7-A086-BACF2171B02F}.Release|Win32.ActiveCfg = Release|Win32

-		{0A6C0B51-23EF-40E7-A086-BACF2171B02F}.Release|Win32.Build.0 = Release|Win32

-		{0A6C0B51-23EF-40E7-A086-BACF2171B02F}.Release|x64.ActiveCfg = Release|x64

-		{0A6C0B51-23EF-40E7-A086-BACF2171B02F}.Release|x64.Build.0 = Release|x64

-		{66106B22-4C8B-4B4A-A8DE-0C1ADEF0A219}.Debug|Win32.ActiveCfg = Debug|Win32

-		{66106B22-4C8B-4B4A-A8DE-0C1ADEF0A219}.Debug|Win32.Build.0 = Debug|Win32

-		{66106B22-4C8B-4B4A-A8DE-0C1ADEF0A219}.Debug|x64.ActiveCfg = Debug|x64

-		{66106B22-4C8B-4B4A-A8DE-0C1ADEF0A219}.Debug|x64.Build.0 = Debug|x64

-		{66106B22-4C8B-4B4A-A8DE-0C1ADEF0A219}.Release|Win32.ActiveCfg = Release|Win32

-		{66106B22-4C8B-4B4A-A8DE-0C1ADEF0A219}.Release|Win32.Build.0 = Release|Win32

-		{66106B22-4C8B-4B4A-A8DE-0C1ADEF0A219}.Release|x64.ActiveCfg = Release|x64

-		{66106B22-4C8B-4B4A-A8DE-0C1ADEF0A219}.Release|x64.Build.0 = Release|x64

-		{CADD763A-7F15-453F-A922-79C5FC9FDAED}.Debug|Win32.ActiveCfg = Debug|Win32

-		{CADD763A-7F15-453F-A922-79C5FC9FDAED}.Debug|Win32.Build.0 = Debug|Win32

-		{CADD763A-7F15-453F-A922-79C5FC9FDAED}.Debug|x64.ActiveCfg = Debug|x64

-		{CADD763A-7F15-453F-A922-79C5FC9FDAED}.Debug|x64.Build.0 = Debug|x64

-		{CADD763A-7F15-453F-A922-79C5FC9FDAED}.Release|Win32.ActiveCfg = Release|Win32

-		{CADD763A-7F15-453F-A922-79C5FC9FDAED}.Release|Win32.Build.0 = Release|Win32

-		{CADD763A-7F15-453F-A922-79C5FC9FDAED}.Release|x64.ActiveCfg = Release|x64

-		{CADD763A-7F15-453F-A922-79C5FC9FDAED}.Release|x64.Build.0 = Release|x64

-		{B28B170D-0C78-484C-B398-A6F2FA2C1B26}.Debug|Win32.ActiveCfg = Debug|Win32

-		{B28B170D-0C78-484C-B398-A6F2FA2C1B26}.Debug|Win32.Build.0 = Debug|Win32

-		{B28B170D-0C78-484C-B398-A6F2FA2C1B26}.Debug|x64.ActiveCfg = Debug|x64

-		{B28B170D-0C78-484C-B398-A6F2FA2C1B26}.Debug|x64.Build.0 = Debug|x64

-		{B28B170D-0C78-484C-B398-A6F2FA2C1B26}.Release|Win32.ActiveCfg = Release|Win32

-		{B28B170D-0C78-484C-B398-A6F2FA2C1B26}.Release|Win32.Build.0 = Release|Win32

-		{B28B170D-0C78-484C-B398-A6F2FA2C1B26}.Release|x64.ActiveCfg = Release|x64

-		{B28B170D-0C78-484C-B398-A6F2FA2C1B26}.Release|x64.Build.0 = Release|x64

-		{D29B5F9D-CA5C-4F2F-AB16-8FE0189E520C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D29B5F9D-CA5C-4F2F-AB16-8FE0189E520C}.Debug|Win32.Build.0 = Debug|Win32

-		{D29B5F9D-CA5C-4F2F-AB16-8FE0189E520C}.Debug|x64.ActiveCfg = Debug|x64

-		{D29B5F9D-CA5C-4F2F-AB16-8FE0189E520C}.Debug|x64.Build.0 = Debug|x64

-		{D29B5F9D-CA5C-4F2F-AB16-8FE0189E520C}.Release|Win32.ActiveCfg = Release|Win32

-		{D29B5F9D-CA5C-4F2F-AB16-8FE0189E520C}.Release|Win32.Build.0 = Release|Win32

-		{D29B5F9D-CA5C-4F2F-AB16-8FE0189E520C}.Release|x64.ActiveCfg = Release|x64

-		{D29B5F9D-CA5C-4F2F-AB16-8FE0189E520C}.Release|x64.Build.0 = Release|x64

-		{7E46D3EA-E3AA-458B-ACA8-A585F62B24A9}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7E46D3EA-E3AA-458B-ACA8-A585F62B24A9}.Debug|Win32.Build.0 = Debug|Win32

-		{7E46D3EA-E3AA-458B-ACA8-A585F62B24A9}.Debug|x64.ActiveCfg = Debug|x64

-		{7E46D3EA-E3AA-458B-ACA8-A585F62B24A9}.Debug|x64.Build.0 = Debug|x64

-		{7E46D3EA-E3AA-458B-ACA8-A585F62B24A9}.Release|Win32.ActiveCfg = Release|Win32

-		{7E46D3EA-E3AA-458B-ACA8-A585F62B24A9}.Release|Win32.Build.0 = Release|Win32

-		{7E46D3EA-E3AA-458B-ACA8-A585F62B24A9}.Release|x64.ActiveCfg = Release|x64

-		{7E46D3EA-E3AA-458B-ACA8-A585F62B24A9}.Release|x64.Build.0 = Release|x64

-		{D72AE740-D901-41E7-8A85-04A41EA31EB5}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D72AE740-D901-41E7-8A85-04A41EA31EB5}.Debug|Win32.Build.0 = Debug|Win32

-		{D72AE740-D901-41E7-8A85-04A41EA31EB5}.Debug|x64.ActiveCfg = Debug|x64

-		{D72AE740-D901-41E7-8A85-04A41EA31EB5}.Debug|x64.Build.0 = Debug|x64

-		{D72AE740-D901-41E7-8A85-04A41EA31EB5}.Release|Win32.ActiveCfg = Release|Win32

-		{D72AE740-D901-41E7-8A85-04A41EA31EB5}.Release|Win32.Build.0 = Release|Win32

-		{D72AE740-D901-41E7-8A85-04A41EA31EB5}.Release|x64.ActiveCfg = Release|x64

-		{D72AE740-D901-41E7-8A85-04A41EA31EB5}.Release|x64.Build.0 = Release|x64

-		{A840E983-177E-4218-916F-37391939E32D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A840E983-177E-4218-916F-37391939E32D}.Debug|Win32.Build.0 = Debug|Win32

-		{A840E983-177E-4218-916F-37391939E32D}.Debug|x64.ActiveCfg = Debug|x64

-		{A840E983-177E-4218-916F-37391939E32D}.Debug|x64.Build.0 = Debug|x64

-		{A840E983-177E-4218-916F-37391939E32D}.Release|Win32.ActiveCfg = Release|Win32

-		{A840E983-177E-4218-916F-37391939E32D}.Release|Win32.Build.0 = Release|Win32

-		{A840E983-177E-4218-916F-37391939E32D}.Release|x64.ActiveCfg = Release|x64

-		{A840E983-177E-4218-916F-37391939E32D}.Release|x64.Build.0 = Release|x64

-		{33FCABE9-BCC4-4894-9BD5-C3AD8FB0E18A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{33FCABE9-BCC4-4894-9BD5-C3AD8FB0E18A}.Debug|Win32.Build.0 = Debug|Win32

-		{33FCABE9-BCC4-4894-9BD5-C3AD8FB0E18A}.Debug|x64.ActiveCfg = Debug|x64

-		{33FCABE9-BCC4-4894-9BD5-C3AD8FB0E18A}.Debug|x64.Build.0 = Debug|x64

-		{33FCABE9-BCC4-4894-9BD5-C3AD8FB0E18A}.Release|Win32.ActiveCfg = Release|Win32

-		{33FCABE9-BCC4-4894-9BD5-C3AD8FB0E18A}.Release|Win32.Build.0 = Release|Win32

-		{33FCABE9-BCC4-4894-9BD5-C3AD8FB0E18A}.Release|x64.ActiveCfg = Release|x64

-		{33FCABE9-BCC4-4894-9BD5-C3AD8FB0E18A}.Release|x64.Build.0 = Release|x64

-		{B0C2EB18-6469-4350-AC72-983E3D0B5F3C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{B0C2EB18-6469-4350-AC72-983E3D0B5F3C}.Debug|Win32.Build.0 = Debug|Win32

-		{B0C2EB18-6469-4350-AC72-983E3D0B5F3C}.Debug|x64.ActiveCfg = Debug|x64

-		{B0C2EB18-6469-4350-AC72-983E3D0B5F3C}.Debug|x64.Build.0 = Debug|x64

-		{B0C2EB18-6469-4350-AC72-983E3D0B5F3C}.Release|Win32.ActiveCfg = Release|Win32

-		{B0C2EB18-6469-4350-AC72-983E3D0B5F3C}.Release|Win32.Build.0 = Release|Win32

-		{B0C2EB18-6469-4350-AC72-983E3D0B5F3C}.Release|x64.ActiveCfg = Release|x64

-		{B0C2EB18-6469-4350-AC72-983E3D0B5F3C}.Release|x64.Build.0 = Release|x64

-		{86418725-0244-46CC-A4E1-D7D21CAC620B}.Debug|Win32.ActiveCfg = Debug|Win32

-		{86418725-0244-46CC-A4E1-D7D21CAC620B}.Debug|Win32.Build.0 = Debug|Win32

-		{86418725-0244-46CC-A4E1-D7D21CAC620B}.Debug|x64.ActiveCfg = Debug|x64

-		{86418725-0244-46CC-A4E1-D7D21CAC620B}.Debug|x64.Build.0 = Debug|x64

-		{86418725-0244-46CC-A4E1-D7D21CAC620B}.Release|Win32.ActiveCfg = Release|Win32

-		{86418725-0244-46CC-A4E1-D7D21CAC620B}.Release|Win32.Build.0 = Release|Win32

-		{86418725-0244-46CC-A4E1-D7D21CAC620B}.Release|x64.ActiveCfg = Release|x64

-		{86418725-0244-46CC-A4E1-D7D21CAC620B}.Release|x64.Build.0 = Release|x64

-		{8E92B4DB-65AD-4CF7-B806-3AA6D17F3F5C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8E92B4DB-65AD-4CF7-B806-3AA6D17F3F5C}.Debug|Win32.Build.0 = Debug|Win32

-		{8E92B4DB-65AD-4CF7-B806-3AA6D17F3F5C}.Debug|x64.ActiveCfg = Debug|x64

-		{8E92B4DB-65AD-4CF7-B806-3AA6D17F3F5C}.Debug|x64.Build.0 = Debug|x64

-		{8E92B4DB-65AD-4CF7-B806-3AA6D17F3F5C}.Release|Win32.ActiveCfg = Release|Win32

-		{8E92B4DB-65AD-4CF7-B806-3AA6D17F3F5C}.Release|Win32.Build.0 = Release|Win32

-		{8E92B4DB-65AD-4CF7-B806-3AA6D17F3F5C}.Release|x64.ActiveCfg = Release|x64

-		{8E92B4DB-65AD-4CF7-B806-3AA6D17F3F5C}.Release|x64.Build.0 = Release|x64

-		{DC9562D3-A5A4-4BB0-98C3-7863AACFF1C8}.Debug|Win32.ActiveCfg = Debug|Win32

-		{DC9562D3-A5A4-4BB0-98C3-7863AACFF1C8}.Debug|Win32.Build.0 = Debug|Win32

-		{DC9562D3-A5A4-4BB0-98C3-7863AACFF1C8}.Debug|x64.ActiveCfg = Debug|x64

-		{DC9562D3-A5A4-4BB0-98C3-7863AACFF1C8}.Debug|x64.Build.0 = Debug|x64

-		{DC9562D3-A5A4-4BB0-98C3-7863AACFF1C8}.Release|Win32.ActiveCfg = Release|Win32

-		{DC9562D3-A5A4-4BB0-98C3-7863AACFF1C8}.Release|Win32.Build.0 = Release|Win32

-		{DC9562D3-A5A4-4BB0-98C3-7863AACFF1C8}.Release|x64.ActiveCfg = Release|x64

-		{DC9562D3-A5A4-4BB0-98C3-7863AACFF1C8}.Release|x64.Build.0 = Release|x64

-		{2FBE4820-120C-478D-8DF2-39E53C885830}.Debug|Win32.ActiveCfg = Debug|Win32

-		{2FBE4820-120C-478D-8DF2-39E53C885830}.Debug|Win32.Build.0 = Debug|Win32

-		{2FBE4820-120C-478D-8DF2-39E53C885830}.Debug|x64.ActiveCfg = Debug|x64

-		{2FBE4820-120C-478D-8DF2-39E53C885830}.Debug|x64.Build.0 = Debug|x64

-		{2FBE4820-120C-478D-8DF2-39E53C885830}.Release|Win32.ActiveCfg = Release|Win32

-		{2FBE4820-120C-478D-8DF2-39E53C885830}.Release|Win32.Build.0 = Release|Win32

-		{2FBE4820-120C-478D-8DF2-39E53C885830}.Release|x64.ActiveCfg = Release|x64

-		{2FBE4820-120C-478D-8DF2-39E53C885830}.Release|x64.Build.0 = Release|x64

-		{9CD7FB43-AEAA-4380-AB53-9DC8487D553F}.Debug|Win32.ActiveCfg = Debug|Win32

-		{9CD7FB43-AEAA-4380-AB53-9DC8487D553F}.Debug|Win32.Build.0 = Debug|Win32

-		{9CD7FB43-AEAA-4380-AB53-9DC8487D553F}.Debug|x64.ActiveCfg = Debug|x64

-		{9CD7FB43-AEAA-4380-AB53-9DC8487D553F}.Debug|x64.Build.0 = Debug|x64

-		{9CD7FB43-AEAA-4380-AB53-9DC8487D553F}.Release|Win32.ActiveCfg = Release|Win32

-		{9CD7FB43-AEAA-4380-AB53-9DC8487D553F}.Release|Win32.Build.0 = Release|Win32

-		{9CD7FB43-AEAA-4380-AB53-9DC8487D553F}.Release|x64.ActiveCfg = Release|x64

-		{9CD7FB43-AEAA-4380-AB53-9DC8487D553F}.Release|x64.Build.0 = Release|x64

-		{58988CC8-3154-45C1-A05E-9AF4FE45D7FE}.Debug|Win32.ActiveCfg = Debug|Win32

-		{58988CC8-3154-45C1-A05E-9AF4FE45D7FE}.Debug|Win32.Build.0 = Debug|Win32

-		{58988CC8-3154-45C1-A05E-9AF4FE45D7FE}.Debug|x64.ActiveCfg = Debug|x64

-		{58988CC8-3154-45C1-A05E-9AF4FE45D7FE}.Debug|x64.Build.0 = Debug|x64

-		{58988CC8-3154-45C1-A05E-9AF4FE45D7FE}.Release|Win32.ActiveCfg = Release|Win32

-		{58988CC8-3154-45C1-A05E-9AF4FE45D7FE}.Release|Win32.Build.0 = Release|Win32

-		{58988CC8-3154-45C1-A05E-9AF4FE45D7FE}.Release|x64.ActiveCfg = Release|x64

-		{58988CC8-3154-45C1-A05E-9AF4FE45D7FE}.Release|x64.Build.0 = Release|x64

-		{A800762F-F9D8-494B-AFCE-AFE75053A9C8}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A800762F-F9D8-494B-AFCE-AFE75053A9C8}.Debug|Win32.Build.0 = Debug|Win32

-		{A800762F-F9D8-494B-AFCE-AFE75053A9C8}.Debug|x64.ActiveCfg = Debug|x64

-		{A800762F-F9D8-494B-AFCE-AFE75053A9C8}.Debug|x64.Build.0 = Debug|x64

-		{A800762F-F9D8-494B-AFCE-AFE75053A9C8}.Release|Win32.ActiveCfg = Release|Win32

-		{A800762F-F9D8-494B-AFCE-AFE75053A9C8}.Release|Win32.Build.0 = Release|Win32

-		{A800762F-F9D8-494B-AFCE-AFE75053A9C8}.Release|x64.ActiveCfg = Release|x64

-		{A800762F-F9D8-494B-AFCE-AFE75053A9C8}.Release|x64.Build.0 = Release|x64

-		{5FC6935E-35DE-4A68-87FE-8ADCDEED2B48}.Debug|Win32.ActiveCfg = Debug|Win32

-		{5FC6935E-35DE-4A68-87FE-8ADCDEED2B48}.Debug|Win32.Build.0 = Debug|Win32

-		{5FC6935E-35DE-4A68-87FE-8ADCDEED2B48}.Debug|x64.ActiveCfg = Debug|x64

-		{5FC6935E-35DE-4A68-87FE-8ADCDEED2B48}.Debug|x64.Build.0 = Debug|x64

-		{5FC6935E-35DE-4A68-87FE-8ADCDEED2B48}.Release|Win32.ActiveCfg = Release|Win32

-		{5FC6935E-35DE-4A68-87FE-8ADCDEED2B48}.Release|Win32.Build.0 = Release|Win32

-		{5FC6935E-35DE-4A68-87FE-8ADCDEED2B48}.Release|x64.ActiveCfg = Release|x64

-		{5FC6935E-35DE-4A68-87FE-8ADCDEED2B48}.Release|x64.Build.0 = Release|x64

-		{D3FAA3AB-9A66-4911-85CE-73B674B683EC}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D3FAA3AB-9A66-4911-85CE-73B674B683EC}.Debug|Win32.Build.0 = Debug|Win32

-		{D3FAA3AB-9A66-4911-85CE-73B674B683EC}.Debug|x64.ActiveCfg = Debug|x64

-		{D3FAA3AB-9A66-4911-85CE-73B674B683EC}.Debug|x64.Build.0 = Debug|x64

-		{D3FAA3AB-9A66-4911-85CE-73B674B683EC}.Release|Win32.ActiveCfg = Release|Win32

-		{D3FAA3AB-9A66-4911-85CE-73B674B683EC}.Release|Win32.Build.0 = Release|Win32

-		{D3FAA3AB-9A66-4911-85CE-73B674B683EC}.Release|x64.ActiveCfg = Release|x64

-		{D3FAA3AB-9A66-4911-85CE-73B674B683EC}.Release|x64.Build.0 = Release|x64

-		{31BA8F80-0A8C-4CFC-AD63-D947F1ABAC8C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{31BA8F80-0A8C-4CFC-AD63-D947F1ABAC8C}.Debug|Win32.Build.0 = Debug|Win32

-		{31BA8F80-0A8C-4CFC-AD63-D947F1ABAC8C}.Debug|x64.ActiveCfg = Debug|x64

-		{31BA8F80-0A8C-4CFC-AD63-D947F1ABAC8C}.Debug|x64.Build.0 = Debug|x64

-		{31BA8F80-0A8C-4CFC-AD63-D947F1ABAC8C}.Release|Win32.ActiveCfg = Release|Win32

-		{31BA8F80-0A8C-4CFC-AD63-D947F1ABAC8C}.Release|Win32.Build.0 = Release|Win32

-		{31BA8F80-0A8C-4CFC-AD63-D947F1ABAC8C}.Release|x64.ActiveCfg = Release|x64

-		{31BA8F80-0A8C-4CFC-AD63-D947F1ABAC8C}.Release|x64.Build.0 = Release|x64

-		{EBA97261-BA06-4889-8568-0488E791F9A3}.Debug|Win32.ActiveCfg = Debug|Win32

-		{EBA97261-BA06-4889-8568-0488E791F9A3}.Debug|Win32.Build.0 = Debug|Win32

-		{EBA97261-BA06-4889-8568-0488E791F9A3}.Debug|x64.ActiveCfg = Debug|x64

-		{EBA97261-BA06-4889-8568-0488E791F9A3}.Debug|x64.Build.0 = Debug|x64

-		{EBA97261-BA06-4889-8568-0488E791F9A3}.Release|Win32.ActiveCfg = Release|Win32

-		{EBA97261-BA06-4889-8568-0488E791F9A3}.Release|Win32.Build.0 = Release|Win32

-		{EBA97261-BA06-4889-8568-0488E791F9A3}.Release|x64.ActiveCfg = Release|x64

-		{EBA97261-BA06-4889-8568-0488E791F9A3}.Release|x64.Build.0 = Release|x64

-		{BB90C9EC-7C4F-4AEA-A64E-95A2EA9C2F06}.Debug|Win32.ActiveCfg = Debug|Win32

-		{BB90C9EC-7C4F-4AEA-A64E-95A2EA9C2F06}.Debug|Win32.Build.0 = Debug|Win32

-		{BB90C9EC-7C4F-4AEA-A64E-95A2EA9C2F06}.Debug|x64.ActiveCfg = Debug|x64

-		{BB90C9EC-7C4F-4AEA-A64E-95A2EA9C2F06}.Debug|x64.Build.0 = Debug|x64

-		{BB90C9EC-7C4F-4AEA-A64E-95A2EA9C2F06}.Release|Win32.ActiveCfg = Release|Win32

-		{BB90C9EC-7C4F-4AEA-A64E-95A2EA9C2F06}.Release|Win32.Build.0 = Release|Win32

-		{BB90C9EC-7C4F-4AEA-A64E-95A2EA9C2F06}.Release|x64.ActiveCfg = Release|x64

-		{BB90C9EC-7C4F-4AEA-A64E-95A2EA9C2F06}.Release|x64.Build.0 = Release|x64

-		{93EA2B92-DF8B-4D30-9788-99D63D779756}.Debug|Win32.ActiveCfg = Debug|Win32

-		{93EA2B92-DF8B-4D30-9788-99D63D779756}.Debug|Win32.Build.0 = Debug|Win32

-		{93EA2B92-DF8B-4D30-9788-99D63D779756}.Debug|x64.ActiveCfg = Debug|x64

-		{93EA2B92-DF8B-4D30-9788-99D63D779756}.Debug|x64.Build.0 = Debug|x64

-		{93EA2B92-DF8B-4D30-9788-99D63D779756}.Release|Win32.ActiveCfg = Release|Win32

-		{93EA2B92-DF8B-4D30-9788-99D63D779756}.Release|Win32.Build.0 = Release|Win32

-		{93EA2B92-DF8B-4D30-9788-99D63D779756}.Release|x64.ActiveCfg = Release|x64

-		{93EA2B92-DF8B-4D30-9788-99D63D779756}.Release|x64.Build.0 = Release|x64

-		{F8D2C124-2238-47AB-8A51-4A42D8F10BF5}.Debug|Win32.ActiveCfg = Debug|Win32

-		{F8D2C124-2238-47AB-8A51-4A42D8F10BF5}.Debug|Win32.Build.0 = Debug|Win32

-		{F8D2C124-2238-47AB-8A51-4A42D8F10BF5}.Debug|x64.ActiveCfg = Debug|x64

-		{F8D2C124-2238-47AB-8A51-4A42D8F10BF5}.Debug|x64.Build.0 = Debug|x64

-		{F8D2C124-2238-47AB-8A51-4A42D8F10BF5}.Release|Win32.ActiveCfg = Release|Win32

-		{F8D2C124-2238-47AB-8A51-4A42D8F10BF5}.Release|Win32.Build.0 = Release|Win32

-		{F8D2C124-2238-47AB-8A51-4A42D8F10BF5}.Release|x64.ActiveCfg = Release|x64

-		{F8D2C124-2238-47AB-8A51-4A42D8F10BF5}.Release|x64.Build.0 = Release|x64

-		{447B9176-2551-4BE1-BBFF-D74C1723D6E0}.Debug|Win32.ActiveCfg = Debug|Win32

-		{447B9176-2551-4BE1-BBFF-D74C1723D6E0}.Debug|Win32.Build.0 = Debug|Win32

-		{447B9176-2551-4BE1-BBFF-D74C1723D6E0}.Debug|x64.ActiveCfg = Debug|x64

-		{447B9176-2551-4BE1-BBFF-D74C1723D6E0}.Debug|x64.Build.0 = Debug|x64

-		{447B9176-2551-4BE1-BBFF-D74C1723D6E0}.Release|Win32.ActiveCfg = Release|Win32

-		{447B9176-2551-4BE1-BBFF-D74C1723D6E0}.Release|Win32.Build.0 = Release|Win32

-		{447B9176-2551-4BE1-BBFF-D74C1723D6E0}.Release|x64.ActiveCfg = Release|x64

-		{447B9176-2551-4BE1-BBFF-D74C1723D6E0}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/windows/hl/examples/ex_ds1/ex_ds1.vcproj b/windows/hl/examples/ex_ds/ex_ds.vcproj
index f95613c..4aa8cd8 100644
--- a/windows/hl/examples/ex_ds1/ex_ds1.vcproj
+++ b/windows/hl/examples/ex_ds/ex_ds.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="ex_ds1"

+	Name="ex_ds"

 	ProjectGUID="{70E7B820-4AEB-49EF-93C5-A6BBDF69B76F}"

-	RootNamespace="ex_ds1"

+	RootNamespace="ex_ds"

 	>

 	<Platforms>

 		<Platform

@@ -41,7 +41,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds1\Release/ex_ds1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -54,10 +54,10 @@
 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds1\Release/ex_ds1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds1\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_ds1\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_ds\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -80,7 +80,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds1\Release/ex_ds1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -134,7 +134,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds1\Release/ex_ds1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -147,10 +147,10 @@
 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds1\Release/ex_ds1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds1\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_ds1\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_ds\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -173,7 +173,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds1\Release/ex_ds1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

@@ -226,7 +226,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds1\Debug/ex_ds1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -237,10 +237,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds1\Debug/ex_ds1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds1\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_ds1\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_ds\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

@@ -265,7 +265,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds1\Debug/ex_ds1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -319,7 +319,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds1\Debug/ex_ds1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -330,10 +330,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds1\Debug/ex_ds1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds1\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_ds1\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_ds\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

@@ -358,7 +358,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds1\Debug/ex_ds1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

diff --git a/windows/hl/examples/ex_ds1dll/ex_ds1dll.vcproj b/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj
index 7d1fac0..ef47818 100644
--- a/windows/hl/examples/ex_ds1dll/ex_ds1dll.vcproj
+++ b/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj
@@ -2,9 +2,8 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="ex_ds1dll"

+	Name="ex_dsdll"

 	ProjectGUID="{C17AAC18-2DFC-46DE-AF5F-749F6F043DE0}"

-	RootNamespace="ex_ds1dll"

 	>

 	<Platforms>

 		<Platform

@@ -41,7 +40,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/ex_ds1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -52,10 +51,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/ex_ds1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

@@ -80,7 +79,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/ex_ds1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -134,7 +133,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/ex_ds1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -145,10 +144,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/ex_ds1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

@@ -173,7 +172,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/ex_ds1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

@@ -226,7 +225,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds1dll\Release/ex_ds1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -239,10 +238,10 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds1dll\Release/ex_ds1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds1dll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_ds1dll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1dll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -265,7 +264,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds1dll\Release/ex_ds1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -319,7 +318,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds1dll\Release/ex_ds1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -332,10 +331,10 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds1dll\Release/ex_ds1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds1dll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_ds1dll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1dll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -358,7 +357,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds1dll\Release/ex_ds1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

diff --git a/windows/hl/examples/ex_image2/ex_image2.vcproj b/windows/hl/examples/ex_image2/ex_image2.vcproj
deleted file mode 100644
index 25e2074..0000000
--- a/windows/hl/examples/ex_image2/ex_image2.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_image2"

-	ProjectGUID="{66106B22-4C8B-4B4A-A8DE-0C1ADEF0A219}"

-	RootNamespace="ex_image2"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_image2.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_image2dll/ex_image2dll.vcproj b/windows/hl/examples/ex_image2dll/ex_image2dll.vcproj
deleted file mode 100644
index 24d2c3e..0000000
--- a/windows/hl/examples/ex_image2dll/ex_image2dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_image2dll"

-	ProjectGUID="{CADD763A-7F15-453F-A922-79C5FC9FDAED}"

-	RootNamespace="ex_image2dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_image2.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_image1/ex_image1.vcproj b/windows/hl/examples/ex_images/ex_images.vcproj
index 011053e..7707a24 100644
--- a/windows/hl/examples/ex_image1/ex_image1.vcproj
+++ b/windows/hl/examples/ex_images/ex_images.vcproj
@@ -2,9 +2,8 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="ex_image1"

+	Name="ex_images"

 	ProjectGUID="{B4DE42B5-0032-4175-BEEE-F65875360A45}"

-	RootNamespace="ex_image1"

 	>

 	<Platforms>

 		<Platform

@@ -41,7 +40,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_image1\Debug/ex_image1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -52,10 +51,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_image1\Debug/ex_image1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_image1\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_image1\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_images\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_images\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_images\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

@@ -80,7 +79,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_image1\Debug/ex_image1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -134,7 +133,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_image1\Debug/ex_image1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -145,10 +144,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_image1\Debug/ex_image1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_image1\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_image1\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_images\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_images\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_images\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

@@ -173,7 +172,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_image1\Debug/ex_image1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

@@ -226,7 +225,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_image1\Release/ex_image1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -239,10 +238,10 @@
 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_image1\Release/ex_image1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_image1\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_image1\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_images\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_images\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_images\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -265,7 +264,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_image1\Release/ex_image1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -319,7 +318,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_image1\Release/ex_image1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -332,10 +331,10 @@
 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_image1\Release/ex_image1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_image1\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_image1\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_images\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_images\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_images\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -358,7 +357,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_image1\Release/ex_image1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

diff --git a/windows/hl/examples/ex_image1dll/ex_image1dll.vcproj b/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
index 90f6f60..3c3e26a 100644
--- a/windows/hl/examples/ex_image1dll/ex_image1dll.vcproj
+++ b/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
@@ -2,9 +2,8 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="ex_image1dll"

+	Name="ex_imagesdll"

 	ProjectGUID="{E424C58A-BEA8-4801-8A9C-5E976A3FAA5D}"

-	RootNamespace="ex_image1dll"

 	>

 	<Platforms>

 		<Platform

@@ -41,7 +40,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_image1dll\Debug/ex_image1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -52,10 +51,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_image1dll\Debug/ex_image1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_image1dll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_image1dll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1dll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

@@ -80,7 +79,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_image1dll\Debug/ex_image1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -134,7 +133,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_image1dll\Debug/ex_image1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -145,10 +144,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_image1dll\Debug/ex_image1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_image1dll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_image1dll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1dll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

@@ -173,7 +172,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_image1dll\Debug/ex_image1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

@@ -226,7 +225,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_image1dll\Release/ex_image1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -239,10 +238,10 @@
 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_image1dll\Release/ex_image1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_image1dll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_image1dll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1dll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -265,7 +264,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_image1dll\Release/ex_image1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -319,7 +318,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_image1dll\Release/ex_image1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -332,10 +331,10 @@
 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_image1dll\Release/ex_image1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_image1dll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_image1dll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1dll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -358,7 +357,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_image1dll\Release/ex_image1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

diff --git a/windows/hl/examples/ex_lite1/ex_lite1.vcproj b/windows/hl/examples/ex_lite/ex_lite.vcproj
index a6e6f75..519c5ea 100644
--- a/windows/hl/examples/ex_lite1/ex_lite1.vcproj
+++ b/windows/hl/examples/ex_lite/ex_lite.vcproj
@@ -2,9 +2,8 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="ex_lite1"

+	Name="ex_lite"

 	ProjectGUID="{4B6CC6F6-C64D-4A1A-BF78-1304AA91D618}"

-	RootNamespace="ex_lite1"

 	>

 	<Platforms>

 		<Platform

@@ -41,7 +40,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite1\Release/ex_lite1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -54,10 +53,10 @@
 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite1\Release/ex_lite1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite1\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_lite1\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_lite\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -80,7 +79,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite1\Release/ex_lite1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -134,7 +133,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite1\Release/ex_lite1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -147,10 +146,10 @@
 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite1\Release/ex_lite1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite1\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_lite1\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_lite\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -173,7 +172,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite1\Release/ex_lite1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

@@ -226,7 +225,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite1\Debug/ex_lite1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -237,10 +236,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite1\Debug/ex_lite1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite1\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_lite1\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_lite\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

@@ -265,7 +264,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite1\Debug/ex_lite1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -319,7 +318,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite1\Debug/ex_lite1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -330,10 +329,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite1\Debug/ex_lite1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite1\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_lite1\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_lite\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

@@ -358,7 +357,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite1\Debug/ex_lite1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

diff --git a/windows/hl/examples/ex_lite2/ex_lite2.vcproj b/windows/hl/examples/ex_lite2/ex_lite2.vcproj
deleted file mode 100644
index c07b255..0000000
--- a/windows/hl/examples/ex_lite2/ex_lite2.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_lite2"

-	ProjectGUID="{47A5C65E-8669-4AF7-AC7F-ABD572567243}"

-	RootNamespace="ex_lite2"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_lite2.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_lite2dll/ex_lite2dll.vcproj b/windows/hl/examples/ex_lite2dll/ex_lite2dll.vcproj
deleted file mode 100644
index ec6f60c..0000000
--- a/windows/hl/examples/ex_lite2dll/ex_lite2dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_lite2dll"

-	ProjectGUID="{95515861-DE06-4542-AA50-6E4780597720}"

-	RootNamespace="ex_lite2dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_lite2.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_lite3/ex_lite3.vcproj b/windows/hl/examples/ex_lite3/ex_lite3.vcproj
deleted file mode 100644
index 4bd70fb..0000000
--- a/windows/hl/examples/ex_lite3/ex_lite3.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_lite3"

-	ProjectGUID="{E5A24019-F635-4D4E-8A60-2D757F05C906}"

-	RootNamespace="ex_lite3"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_lite3.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_lite3dll/ex_lite3dll.vcproj b/windows/hl/examples/ex_lite3dll/ex_lite3dll.vcproj
deleted file mode 100644
index b114dde..0000000
--- a/windows/hl/examples/ex_lite3dll/ex_lite3dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_lite3dll"

-	ProjectGUID="{8431432A-6535-4599-9D76-008C4420CF1D}"

-	RootNamespace="ex_lite3dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_lite3.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_lite1dll/ex_lite1dll.vcproj b/windows/hl/examples/ex_litedll/ex_litedll.vcproj
index 45ae1a8..cb014d7 100644
--- a/windows/hl/examples/ex_lite1dll/ex_lite1dll.vcproj
+++ b/windows/hl/examples/ex_litedll/ex_litedll.vcproj
@@ -2,9 +2,8 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="ex_lite1dll"

+	Name="ex_litedll"

 	ProjectGUID="{DB7330C6-D009-4BF7-B85D-656185825950}"

-	RootNamespace="ex_lite1dll"

 	>

 	<Platforms>

 		<Platform

@@ -41,7 +40,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite1dll\Release/ex_lite1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -54,10 +53,10 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite1dll\Release/ex_lite1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite1dll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_lite1dll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1dll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_litedll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_litedll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_litedll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -80,7 +79,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite1dll\Release/ex_lite1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -134,7 +133,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite1dll\Release/ex_lite1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -147,10 +146,10 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite1dll\Release/ex_lite1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite1dll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_lite1dll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1dll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_litedll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_litedll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_litedll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -173,7 +172,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite1dll\Release/ex_lite1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

@@ -226,7 +225,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/ex_lite1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -237,10 +236,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/ex_lite1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

@@ -265,7 +264,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/ex_lite1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -319,7 +318,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/ex_lite1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -330,10 +329,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/ex_lite1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

@@ -358,7 +357,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/ex_lite1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

diff --git a/windows/hl/examples/ptExampleFL/ptExampleFL.vcproj b/windows/hl/examples/ex_packet/ex_packet.vcproj
index 2ef6fe3..474803f 100644
--- a/windows/hl/examples/ptExampleFL/ptExampleFL.vcproj
+++ b/windows/hl/examples/ex_packet/ex_packet.vcproj
@@ -2,9 +2,8 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="ptExampleFL"

+	Name="ex_packet"

 	ProjectGUID="{47753B08-F9F5-409B-9EC2-9135B4508BAF}"

-	RootNamespace="ptExampleFL"

 	>

 	<Platforms>

 		<Platform

@@ -41,7 +40,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ptExampleFL\Debug/ptExampleFL.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -52,10 +51,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ptExampleFL\Debug/ptExampleFL.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ptExampleFL\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ptExampleFL\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFL\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packet\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packet\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packet\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

@@ -80,7 +79,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ptExampleFL\Debug/ptExampleFL.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -134,7 +133,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ptExampleFL\Debug/ptExampleFL.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -145,10 +144,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ptExampleFL\Debug/ptExampleFL.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ptExampleFL\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ptExampleFL\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFL\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packet\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packet\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packet\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

@@ -173,7 +172,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ptExampleFL\Debug/ptExampleFL.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

@@ -226,7 +225,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ptExampleFL\Release/ptExampleFL.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -239,10 +238,10 @@
 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ptExampleFL\Release/ptExampleFL.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ptExampleFL\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ptExampleFL\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFL\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packet\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packet\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packet\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -265,7 +264,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ptExampleFL\Release/ptExampleFL.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -319,7 +318,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ptExampleFL\Release/ptExampleFL.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -332,10 +331,10 @@
 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ptExampleFL\Release/ptExampleFL.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ptExampleFL\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ptExampleFL\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFL\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packet\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packet\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packet\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -358,7 +357,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ptExampleFL\Release/ptExampleFL.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

diff --git a/windows/hl/examples/ptExampleFLdll/ptExampleFLdll.vcproj b/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj
index 98962e7..3eb72f0 100644
--- a/windows/hl/examples/ptExampleFLdll/ptExampleFLdll.vcproj
+++ b/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj
@@ -2,9 +2,8 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="ptExampleFLdll"

+	Name="ex_packetdll"

 	ProjectGUID="{25DC2207-299D-4272-9530-B126539BE0E9}"

-	RootNamespace="ptExampleFLdll"

 	>

 	<Platforms>

 		<Platform

@@ -41,7 +40,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/ptExampleFLdll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -52,10 +51,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/ptExampleFLdll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

@@ -80,7 +79,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/ptExampleFLdll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -134,7 +133,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/ptExampleFLdll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -145,10 +144,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/ptExampleFLdll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

@@ -173,7 +172,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/ptExampleFLdll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

@@ -226,7 +225,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/ptExampleFLdll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -239,10 +238,10 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/ptExampleFLdll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -265,7 +264,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/ptExampleFLdll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -319,7 +318,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/ptExampleFLdll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -332,10 +331,10 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/ptExampleFLdll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -358,7 +357,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/ptExampleFLdll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

diff --git a/windows/hl/examples/ex_table01/ex_table01.vcproj b/windows/hl/examples/ex_table/ex_table.vcproj
index 517a18f..d438e79 100644
--- a/windows/hl/examples/ex_table01/ex_table01.vcproj
+++ b/windows/hl/examples/ex_table/ex_table.vcproj
@@ -2,9 +2,8 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="ex_table01"

+	Name="ex_table"

 	ProjectGUID="{334E19CF-8B74-4067-8303-A398E3F22593}"

-	RootNamespace="ex_table01"

 	>

 	<Platforms>

 		<Platform

@@ -41,7 +40,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table01\Release/ex_table01.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -54,10 +53,10 @@
 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table01\Release/ex_table01.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table01\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_table01\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_table\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -80,7 +79,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table01\Release/ex_table01.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -134,7 +133,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table01\Release/ex_table01.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -147,10 +146,10 @@
 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table01\Release/ex_table01.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table01\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_table01\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_table\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -173,7 +172,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table01\Release/ex_table01.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

@@ -226,7 +225,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table01\Debug/ex_table01.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -237,10 +236,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table01\Debug/ex_table01.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table01\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_table01\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_table\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

@@ -265,7 +264,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table01\Debug/ex_table01.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -319,7 +318,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table01\Debug/ex_table01.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -330,10 +329,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table01\Debug/ex_table01.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table01\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_table01\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_table\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

@@ -358,7 +357,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table01\Debug/ex_table01.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

diff --git a/windows/hl/examples/ex_table02/ex_table02.vcproj b/windows/hl/examples/ex_table02/ex_table02.vcproj
deleted file mode 100644
index 0836e76..0000000
--- a/windows/hl/examples/ex_table02/ex_table02.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table02"

-	ProjectGUID="{B28B170D-0C78-484C-B398-A6F2FA2C1B26}"

-	RootNamespace="ex_table02"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_02.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table02dll/ex_table02dll.vcproj b/windows/hl/examples/ex_table02dll/ex_table02dll.vcproj
deleted file mode 100644
index dde93ed..0000000
--- a/windows/hl/examples/ex_table02dll/ex_table02dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table02dll"

-	ProjectGUID="{D29B5F9D-CA5C-4F2F-AB16-8FE0189E520C}"

-	RootNamespace="ex_table02dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_02.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table03/ex_table03.vcproj b/windows/hl/examples/ex_table03/ex_table03.vcproj
deleted file mode 100644
index 07b5207..0000000
--- a/windows/hl/examples/ex_table03/ex_table03.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table03"

-	ProjectGUID="{7E46D3EA-E3AA-458B-ACA8-A585F62B24A9}"

-	RootNamespace="ex_table03"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_03.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table03dll/ex_table03dll.vcproj b/windows/hl/examples/ex_table03dll/ex_table03dll.vcproj
deleted file mode 100644
index 1114424..0000000
--- a/windows/hl/examples/ex_table03dll/ex_table03dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table03dll"

-	ProjectGUID="{D72AE740-D901-41E7-8A85-04A41EA31EB5}"

-	RootNamespace="ex_table03dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_03.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table04/ex_table04.vcproj b/windows/hl/examples/ex_table04/ex_table04.vcproj
deleted file mode 100644
index 475e55a..0000000
--- a/windows/hl/examples/ex_table04/ex_table04.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table04"

-	ProjectGUID="{A840E983-177E-4218-916F-37391939E32D}"

-	RootNamespace="ex_table04"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_04.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table04dll/ex_table04dll.vcproj b/windows/hl/examples/ex_table04dll/ex_table04dll.vcproj
deleted file mode 100644
index 8da9f98..0000000
--- a/windows/hl/examples/ex_table04dll/ex_table04dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table04dll"

-	ProjectGUID="{33FCABE9-BCC4-4894-9BD5-C3AD8FB0E18A}"

-	RootNamespace="ex_table04dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_04.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table05/ex_table05.vcproj b/windows/hl/examples/ex_table05/ex_table05.vcproj
deleted file mode 100644
index 5524b1b..0000000
--- a/windows/hl/examples/ex_table05/ex_table05.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table05"

-	ProjectGUID="{B0C2EB18-6469-4350-AC72-983E3D0B5F3C}"

-	RootNamespace="ex_table05"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_05.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table05dll/ex_table05dll.vcproj b/windows/hl/examples/ex_table05dll/ex_table05dll.vcproj
deleted file mode 100644
index 96911ee..0000000
--- a/windows/hl/examples/ex_table05dll/ex_table05dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table05dll"

-	ProjectGUID="{86418725-0244-46CC-A4E1-D7D21CAC620B}"

-	RootNamespace="ex_table05dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_05.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table06/ex_table06.vcproj b/windows/hl/examples/ex_table06/ex_table06.vcproj
deleted file mode 100644
index 8a53e79..0000000
--- a/windows/hl/examples/ex_table06/ex_table06.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table06"

-	ProjectGUID="{8E92B4DB-65AD-4CF7-B806-3AA6D17F3F5C}"

-	RootNamespace="ex_table06"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_06.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table06dll/ex_table06dll.vcproj b/windows/hl/examples/ex_table06dll/ex_table06dll.vcproj
deleted file mode 100644
index cf93765..0000000
--- a/windows/hl/examples/ex_table06dll/ex_table06dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table06dll"

-	ProjectGUID="{DC9562D3-A5A4-4BB0-98C3-7863AACFF1C8}"

-	RootNamespace="ex_table06dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_06.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table07/ex_table07.vcproj b/windows/hl/examples/ex_table07/ex_table07.vcproj
deleted file mode 100644
index 8b55075..0000000
--- a/windows/hl/examples/ex_table07/ex_table07.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table07"

-	ProjectGUID="{2FBE4820-120C-478D-8DF2-39E53C885830}"

-	RootNamespace="ex_table07"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_07.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table07dll/ex_table07dll.vcproj b/windows/hl/examples/ex_table07dll/ex_table07dll.vcproj
deleted file mode 100644
index 22f6974..0000000
--- a/windows/hl/examples/ex_table07dll/ex_table07dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table07dll"

-	ProjectGUID="{9CD7FB43-AEAA-4380-AB53-9DC8487D553F}"

-	RootNamespace="ex_table07dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_07.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table08/ex_table08.vcproj b/windows/hl/examples/ex_table08/ex_table08.vcproj
deleted file mode 100644
index 374e095..0000000
--- a/windows/hl/examples/ex_table08/ex_table08.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table08"

-	ProjectGUID="{58988CC8-3154-45C1-A05E-9AF4FE45D7FE}"

-	RootNamespace="ex_table08"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_08.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table08dll/ex_table08dll.vcproj b/windows/hl/examples/ex_table08dll/ex_table08dll.vcproj
deleted file mode 100644
index b21c4d1..0000000
--- a/windows/hl/examples/ex_table08dll/ex_table08dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table08dll"

-	ProjectGUID="{A800762F-F9D8-494B-AFCE-AFE75053A9C8}"

-	RootNamespace="ex_table08dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_08.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table09/ex_table09.vcproj b/windows/hl/examples/ex_table09/ex_table09.vcproj
deleted file mode 100644
index 6b30c0e..0000000
--- a/windows/hl/examples/ex_table09/ex_table09.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table09"

-	ProjectGUID="{5FC6935E-35DE-4A68-87FE-8ADCDEED2B48}"

-	RootNamespace="ex_table09"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_09.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table09dll/ex_table09dll.vcproj b/windows/hl/examples/ex_table09dll/ex_table09dll.vcproj
deleted file mode 100644
index a7cf263..0000000
--- a/windows/hl/examples/ex_table09dll/ex_table09dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table09dll"

-	ProjectGUID="{D3FAA3AB-9A66-4911-85CE-73B674B683EC}"

-	RootNamespace="ex_table09dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_09.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table10/ex_table10.vcproj b/windows/hl/examples/ex_table10/ex_table10.vcproj
deleted file mode 100644
index 784a5e1..0000000
--- a/windows/hl/examples/ex_table10/ex_table10.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table10"

-	ProjectGUID="{31BA8F80-0A8C-4CFC-AD63-D947F1ABAC8C}"

-	RootNamespace="ex_table10"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_10.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table10dll/ex_table10dll.vcproj b/windows/hl/examples/ex_table10dll/ex_table10dll.vcproj
deleted file mode 100644
index eee4ebb..0000000
--- a/windows/hl/examples/ex_table10dll/ex_table10dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table10dll"

-	ProjectGUID="{EBA97261-BA06-4889-8568-0488E791F9A3}"

-	RootNamespace="ex_table10dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_10.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table11/ex_table11.vcproj b/windows/hl/examples/ex_table11/ex_table11.vcproj
deleted file mode 100644
index e9ebbb4..0000000
--- a/windows/hl/examples/ex_table11/ex_table11.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table11"

-	ProjectGUID="{BB90C9EC-7C4F-4AEA-A64E-95A2EA9C2F06}"

-	RootNamespace="ex_table11"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_11.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table11dll/ex_table11dll.vcproj b/windows/hl/examples/ex_table11dll/ex_table11dll.vcproj
deleted file mode 100644
index 4033bf1..0000000
--- a/windows/hl/examples/ex_table11dll/ex_table11dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table11dll"

-	ProjectGUID="{93EA2B92-DF8B-4D30-9788-99D63D779756}"

-	RootNamespace="ex_table11dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_11.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table12/ex_table12.vcproj b/windows/hl/examples/ex_table12/ex_table12.vcproj
deleted file mode 100644
index 284c354..0000000
--- a/windows/hl/examples/ex_table12/ex_table12.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table12"

-	ProjectGUID="{F8D2C124-2238-47AB-8A51-4A42D8F10BF5}"

-	RootNamespace="ex_table12"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_12.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table12dll/ex_table12dll.vcproj b/windows/hl/examples/ex_table12dll/ex_table12dll.vcproj
deleted file mode 100644
index 302ede9..0000000
--- a/windows/hl/examples/ex_table12dll/ex_table12dll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ex_table12dll"

-	ProjectGUID="{447B9176-2551-4BE1-BBFF-D74C1723D6E0}"

-	RootNamespace="ex_table12dll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_12.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ex_table01dll/ex_table01dll.vcproj b/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj
index 8a0fab9..7a05fac 100644
--- a/windows/hl/examples/ex_table01dll/ex_table01dll.vcproj
+++ b/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj
@@ -2,9 +2,8 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="ex_table01dll"

+	Name="ex_tabledll"

 	ProjectGUID="{4116EF37-EBA5-424F-A01B-2D80DB5807E3}"

-	RootNamespace="ex_table01dll"

 	>

 	<Platforms>

 		<Platform

@@ -41,7 +40,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table01dll\Release/ex_table01dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -54,10 +53,10 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table01dll\Release/ex_table01dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table01dll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_table01dll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01dll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -80,7 +79,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table01dll\Release/ex_table01dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -134,7 +133,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table01dll\Release/ex_table01dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -147,10 +146,10 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table01dll\Release/ex_table01dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table01dll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_table01dll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01dll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

@@ -173,7 +172,7 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table01dll\Release/ex_table01dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

@@ -226,7 +225,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table01dll\Debug/ex_table01dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -237,10 +236,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table01dll\Debug/ex_table01dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table01dll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_table01dll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01dll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

@@ -265,7 +264,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table01dll\Debug/ex_table01dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -319,7 +318,7 @@
 			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table01dll\Debug/ex_table01dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -330,10 +329,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table01dll\Debug/ex_table01dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table01dll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_table01dll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01dll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

@@ -358,7 +357,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table01dll\Debug/ex_table01dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.pdb"

 				SubSystem="1"

 				TargetMachine="17"

 			/>

diff --git a/windows/hl/examples/ptExampleVL/ptExampleVL.vcproj b/windows/hl/examples/ptExampleVL/ptExampleVL.vcproj
deleted file mode 100644
index 95dc8e0..0000000
--- a/windows/hl/examples/ptExampleVL/ptExampleVL.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ptExampleVL"

-	ProjectGUID="{CD526D51-176A-4AC1-B2C9-B2155FAF59FB}"

-	RootNamespace="ptExampleVL"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ptExampleVL.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/ptExampleVLdll/ptExampleVLdll.vcproj b/windows/hl/examples/ptExampleVLdll/ptExampleVLdll.vcproj
deleted file mode 100644
index df0d7f8..0000000
--- a/windows/hl/examples/ptExampleVLdll/ptExampleVLdll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ptExampleVLdll"

-	ProjectGUID="{0A6C0B51-23EF-40E7-A086-BACF2171B02F}"

-	RootNamespace="ptExampleVLdll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\debug\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\src;..\..\..\..\hl\src;..\..\..\..\hdf5lib\release\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\..\hl\examples\ptExampleVL.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/hl/examples/test_hl_cexamples.BAT b/windows/hl/examples/test_hl_cexamples.BAT
index 4fb6309..be63180 100644
--- a/windows/hl/examples/test_hl_cexamples.BAT
+++ b/windows/hl/examples/test_hl_cexamples.BAT
@@ -1,26 +1,23 @@
-@echo OFF

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

+@REM Copyright by The HDF Group.

+@REM Copyright by the Board of Trustees of the University of Illinois.

+@REM All rights reserved.

+@REM

+@REM This file is part of HDF5.  The full HDF5 copyright notice, including

+@REM terms governing use, modification, and redistribution, is contained in

+@REM the files COPYING and Copyright.html.  COPYING can be found at the root

+@REM of the source code distribution tree; Copyright.html can be found at the

+@REM root level of an installed copy of the electronic HDF5 document set and

+@REM is linked from the top-level documents page.  It can also be found at

+@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

+@REM access to either file, you may request a copy from help@hdfgroup.org.

 

-rem This batch file is used to test HDF5 High Level C examples.

-rem Written by   : Fang GUO

-rem Created      : 07/26/2005

-rem Last Modified: 2/18/08

+@ECHO OFF

+@:: This batch file is used to test HDF5 High Level C examples.

+@:: Written by   : Fang GUO

+@:: Created      : 07/26/2005

+@:: Last Modified: 

 

-rem Use delayed expansion to track changes inside a loop

-setlocal enabledelayedexpansion

-

-rem Track errors

+:: Track errors

 set total_error=0

 

 if %1.==. GOTO WRONG

@@ -31,70 +28,49 @@ if "%1"=="debug" GOTO CONFIG
 GOTO WRONG

 

 :CONFIG

-    if "%2"=="dll" GOTO TEST

-    if %2.==. GOTO TEST

-    GOTO WRONG

+if "%2"=="dll" GOTO TEST

+if %2.==. GOTO TEST

+GOTO WRONG

 

 :TEST

-    echo Testing %1 %2 version of High Level examples 

-    echo.

+echo Testing %1 %2 version of High Level examples 

+echo.

 

-    HLCexamples%1%2\ex_ds1%2.exe HLCexamples%1%2

-    

-    for /l %%a in (1,1,2) do (

-        HLCexamples%1%2\ex_image%%a%2.exe HLCexamples%1%2

-        if not !errorlevel!==0 set /A total_error=!total_error!+1

-    )

-    

-    for /l %%a in (1,1,3) do (

-        HLCexamples%1%2\ex_lite%%a%2.exe HLCexamples%1%2

-        if not !errorlevel!==0 set /A total_error=!total_error!+1

-    )

+for %%i in (ds lite table images packet) do (

+HLCexamples%1%2\ex_%%i%2

+if not %errorlevel%==0 set /A totalerror=totalerror+1

+)

 

-    for /l %%a in (1,1,9) do (

-        HLCexamples%1%2\ex_table0%%a%2.exe HLCexamples%1%2

-        if not !errorlevel!==0 set /A total_error=!total_error!+1

-    )

-    

-    for /l %%a in (10,1,12) do (

-        HLCexamples%1%2\ex_table%%a%2.exe HLCexamples%1%2

-        if not !errorlevel!==0 set /A total_error=!total_error!+1

-    )

-    

-    for %%a in (FL VL) do (

-        HLCexamples%1%2\ptExample%%a%2.exe HLCexamples%1%2

-        if not !errorlevel!==0 set /A total_error=!total_error!+1

-    )

 

-    if %total_error%==0 (

-        echo.

-        echo. All of the HL C Examples Passed!

-    ) else (

-        echo.

-        echo. %total_error% HL C Examples Failed!

-    )

+if %total_error%==0 (

+echo.

+echo. All of the HL C Examples Passed!

+) else (

+echo.

+echo. %total_error% HL C Examples Failed!

+)

 

-    GOTO END

+GOTO END

 

 :WRONG

-    echo The syntax of the command is incorrect.

-    echo Use test_hl_cexamples /? for usage information

-    echo.

-    GOTO END

+echo The syntax of the command is incorrect.

+echo Use test_hl_cexamples /? for usage informtaion

+echo.

+GOTO END

 

 :HELP

-    echo Tests HDF5 High Level C examples.

-    echo.

-    echo test_hl_cexamples [OPTION]

-    echo.

-    echo Please use one of the following options!

-    echo.

-    echo test_hl_cexamples release     test HDF5 HL C examples -- release version

-    echo test_hl_cexamples release dll test HDF5 HL C examples -- release dll version

-    echo test_hl_cexamples debug       test HDF5 HL C examples -- debug version

-    echo test_hl_cexamples debug dll   test HDF5 HL C examples -- debug dll version

-    echo test_hl_cexamples /?          Help information

-    echo.

-    GOTO END

+echo Tests HDF5 High Level C examples.

+echo.

+echo test_hl_cexamples [OPTION]

+echo.

+echo Please use one of the following options!

+echo.

+echo test_hl_cexamples release     test HDF5 HL C examples -- release version

+echo test_hl_cexamples release dll test HDF5 HL C examples -- release dll version

+echo test_hl_cexamples debug       test HDF5 HL C examples -- debug version

+echo test_hl_cexamples debug dll   test HDF5 HL C examples -- debug dll version

+echo test_hl_cexamples /?          Help information

+echo.

+GOTO END

 

 :END

diff --git a/windows/hl/fortran/examples/ex_lite/ex_lite.vfproj b/windows/hl/fortran/examples/ex_lite/ex_lite.vfproj
index f3b5c52..a3e699b 100644
--- a/windows/hl/fortran/examples/ex_lite/ex_lite.vfproj
+++ b/windows/hl/fortran/examples/ex_lite/ex_lite.vfproj
@@ -4,31 +4,31 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_lite.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_lite.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\debug/;..\..\..\..\..\proj\hdf5_hl_fortran\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\debug/;..\..\..\..\..\proj\hdf5_hl_fortran\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5\debug;..\..\..\..\..\proj\hdf5_hl\debug;..\..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\..\proj\hdf5_hl_fortran\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib hdf5_hld.lib hdf5_hl_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\..\proj\hdf5_hl_fortran\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib hdf5_hl_fortrand.lib hdf5_hl_fortrand_lib.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

 				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_lite.tlb"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_lite.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\release/;..\..\..\..\..\proj\hdf5_hl_fortran\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\release/;..\..\..\..\..\proj\hdf5_hl_fortran\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5\release;..\..\..\..\..\proj\hdf5_hl\release;..\..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\..\proj\hdf5_hl_fortran\release" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) hdf5.lib hdf5_hl.lib hdf5_fortran.lib hdf5_hl_fortran.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\..\proj\hdf5_hl_fortran\release" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) hdf5_fortran.lib hdf5_hl_fortran.lib hdf5_hl_fortran_lib.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_lite.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\debug/;..\..\..\..\..\proj\hdf5_hl_fortran\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5\debug;..\..\..\..\..\proj\hdf5_hl\debug;..\..\..\..\..\proj\hdf5_fortran\debug;..\..\..\..\..\proj\hdf5_hl_fortran\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_fortrand.lib hdf5_hld.lib hdf5_hl_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortran\debug,..\..\..\..\..\proj\hdf5_hl_fortran\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib hdf5_hl_fortrand.lib hdf5_hl_fortrand_lib.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

 				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

@@ -37,7 +37,7 @@
 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\release/;..\..\..\..\..\proj\hdf5_hl_fortran\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5\release;..\..\..\..\..\proj\hdf5_hl\release;..\..\..\..\..\proj\hdf5_fortran\release;..\..\..\..\..\proj\hdf5_hl_fortran\release" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) hdf5.lib hdf5_hl.lib hdf5_fortran.lib hdf5_hl_fortran.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortran\release,..\..\..\..\..\proj\hdf5_hl_fortran\release" ProgramDatabaseFile="$(OUTDIR)/ex_lite.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) hdf5_fortran.lib hdf5_hl_fortran.lib hdf5_hl_fortran_lib.lib"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

 				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

diff --git a/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj b/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj
index a8afebb..dca50cc 100644
--- a/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj
+++ b/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_litedll.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_litedll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\..\proj\hdf5_hl_fortrandll\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortranddll.lib hdf5_hl_fortranddll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_litedll.tlb"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\..\proj\hdf5_hl_fortrandll\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortranddll.lib hdf5_hl_fortranddll.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_litedll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\..\proj\hdf5_hl_fortrandll\release" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrandll.lib hdf5_hl_fortrandll.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\..\proj\hdf5_hl_fortrandll\release" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrandll.lib hdf5_hl_fortrandll.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_litedll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\debug/" WarnArgMismatch="true" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\..\proj\hdf5_hl_fortrandll\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortranddll.lib hdf5_hl_fortranddll.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\examples\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/ex_litedll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\release/" ModulePath="Release/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\release,..\..\..\..\..\proj\hdf5_hl_fortrandll\release" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrandll.lib hdf5_hl_fortrandll.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

 		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 		<File RelativePath="..\..\..\..\..\hl\fortran\examples\exlite.f90"/></Filter>

diff --git a/windows/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.vfproj b/windows/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.vfproj
index f52ed9d..d9b2172 100644
--- a/windows/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.vfproj
+++ b/windows/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortran.tlb"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\..\hl\fortran\test\tstimage.f90"/>

 		<Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>

diff --git a/windows/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.vfproj b/windows/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.vfproj
index 2000f23..df43c76 100644
--- a/windows/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.vfproj
+++ b/windows/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortrandll.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_image_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_image_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

 		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 		<File RelativePath="..\..\..\..\..\hl\fortran\test\tstimage.f90"/></Filter>

diff --git a/windows/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.vfproj b/windows/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.vfproj
index 9c83392..379f403 100644
--- a/windows/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.vfproj
+++ b/windows/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortran.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\..\hl\fortran\test\tstlite.f90"/>

 		<Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>

diff --git a/windows/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.vfproj b/windows/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.vfproj
index 5e4125f..64d314d 100644
--- a/windows/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.vfproj
+++ b/windows/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortrandll.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_lite_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_lite_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

 		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 		<File RelativePath="..\..\..\..\..\hl\fortran\test\tstlite.f90"/></Filter>

diff --git a/windows/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.vfproj b/windows/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.vfproj
index 60dc1cc..140a6aa 100644
--- a/windows/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.vfproj
+++ b/windows/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortran.tlb"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Release/;..\..\..\..\..\proj\hdf5_hl_fortran\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortran.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortran\Debug/;..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortran.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

 		<File RelativePath="..\..\..\..\..\hl\fortran\test\tsttable.f90"/>

 		<Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>

diff --git a/windows/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.vfproj b/windows/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.vfproj
index 1ae031f..f095faf 100644
--- a/windows/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.vfproj
+++ b/windows/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortrandll.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\..\hl\fortran\test\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hl_test_table_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\Release/;..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/hl_test_table_fortrandll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

 		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 		<File RelativePath="..\..\..\..\..\hl\fortran\test\tsttable.f90"/></Filter>

diff --git a/windows/hl/test/hl_test_ds/hl_test_ds.vcproj b/windows/hl/test/hl_test_ds/hl_test_ds.vcproj
index 542ce4c..3eeb105 100644
--- a/windows/hl/test/hl_test_ds/hl_test_ds.vcproj
+++ b/windows/hl/test/hl_test_ds/hl_test_ds.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hl_test_ds"

 	ProjectGUID="{6410E6D2-EDBF-439D-8C43-1AB0C37AC851}"

-	RootNamespace="hl_test_ds"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_ds/Release/hl_test_ds.pdb"

 				SubSystem="1"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_ds/Release/hl_test_ds.pdb"

 				SubSystem="1"

diff --git a/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj b/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj
index 376088e..48880f7 100644
--- a/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj
+++ b/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hl_test_dsdll"

 	ProjectGUID="{3B4A4A62-FDAC-4219-98BD-80C4FE5D4B2F}"

-	RootNamespace="hl_test_dsdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_hldll\hdf5_hlddll.dll"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_hldll\hdf5_hlddll.dll"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +260,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories=".."

 				GenerateDebugInformation="true"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories=".."

 				GenerateDebugInformation="true"

diff --git a/windows/hl/test/hl_test_image/hl_test_image.vcproj b/windows/hl/test/hl_test_image/hl_test_image.vcproj
index ddf9f5a..b2f0cc6 100644
--- a/windows/hl/test/hl_test_image/hl_test_image.vcproj
+++ b/windows/hl/test/hl_test_image/hl_test_image.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hl_test_image"

 	ProjectGUID="{03359B45-E43D-44B3-BDE5-8B14D9F0D827}"

-	RootNamespace="hl_test_image"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_image/Release/hl_test_image.pdb"

 				SubSystem="1"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_image/Release/hl_test_image.pdb"

 				SubSystem="1"

diff --git a/windows/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj b/windows/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj
index e1fef67..d15b64c 100644
--- a/windows/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj
+++ b/windows/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hl_test_imagedll"

 	ProjectGUID="{9A226D92-9326-4907-A462-25997D5C9427}"

-	RootNamespace="hl_test_imagedll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_imagedll/Debug/hl_test_imagedll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_imagedll/Debug/hl_test_imagedll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_imagedll/Release/hl_test_imagedll.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_imagedll/Release/hl_test_imagedll.pdb"

 				SubSystem="1"

diff --git a/windows/hl/test/hl_test_lite/hl_test_lite.vcproj b/windows/hl/test/hl_test_lite/hl_test_lite.vcproj
index 7d46340..a718284 100644
--- a/windows/hl/test/hl_test_lite/hl_test_lite.vcproj
+++ b/windows/hl/test/hl_test_lite/hl_test_lite.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hl_test_lite"

 	ProjectGUID="{6FFCE804-EF4A-468F-A174-561934C153A1}"

-	RootNamespace="hl_test_lite"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_lite/Release/hl_test_lite.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_lite/Release/hl_test_lite.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/hl/test/hl_test_litedll/hl_test_litedll.vcproj b/windows/hl/test/hl_test_litedll/hl_test_litedll.vcproj
index f2f6707..c4e4ef3 100644
--- a/windows/hl/test/hl_test_litedll/hl_test_litedll.vcproj
+++ b/windows/hl/test/hl_test_litedll/hl_test_litedll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hl_test_litedll"

 	ProjectGUID="{98AE818A-E887-414B-985F-85F8411916C9}"

-	RootNamespace="hl_test_litedll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_litedll/Release/hl_test_litedll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_litedll/Release/hl_test_litedll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_litedll/Debug/hl_test_litedll.pdb"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -351,7 +350,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_litedll/Debug/hl_test_litedll.pdb"

diff --git a/windows/hl/test/hl_test_packet/hl_test_packet.vcproj b/windows/hl/test/hl_test_packet/hl_test_packet.vcproj
index 621e5bf..0b483b6 100644
--- a/windows/hl/test/hl_test_packet/hl_test_packet.vcproj
+++ b/windows/hl/test/hl_test_packet/hl_test_packet.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hl_test_packet"

 	ProjectGUID="{5CC7FFCE-2612-41B6-AF83-C1B61F67949B}"

-	RootNamespace="hl_test_packet"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packet/Release/hl_test_packet.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packet/Release/hl_test_packet.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj b/windows/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj
index fe6d9a6..cbf5c43 100644
--- a/windows/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj
+++ b/windows/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hl_test_packetdll"

 	ProjectGUID="{E3B02B7C-6CF5-42C5-8AF5-48D2B6D8F94B}"

-	RootNamespace="hl_test_packetdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packetdll/Release/hl_test_packetdll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packetdll/Release/hl_test_packetdll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packetdll/Debug/hl_test_packetdll.pdb"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -351,7 +350,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_packetdll/Debug/hl_test_packetdll.pdb"

diff --git a/windows/hl/test/hl_test_table/hl_test_table.vcproj b/windows/hl/test/hl_test_table/hl_test_table.vcproj
index e3b895c..3102709 100644
--- a/windows/hl/test/hl_test_table/hl_test_table.vcproj
+++ b/windows/hl/test/hl_test_table/hl_test_table.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hl_test_table"

 	ProjectGUID="{43069CE7-E7CB-4EBF-A6CC-31E7A06D3835}"

-	RootNamespace="hl_test_table"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_table/Release/hl_test_table.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_table/Release/hl_test_table.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj b/windows/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj
index 9d9fb8c..351c560 100644
--- a/windows/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj
+++ b/windows/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hl_test_tabledll"

 	ProjectGUID="{D1AADCA9-FB5A-4F44-8E11-8232941E2C33}"

-	RootNamespace="hl_test_tabledll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_tabledll/Debug/hl_test_tabledll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_tabledll/Debug/hl_test_tabledll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_tabledll/Release/hl_test_tabledll.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\..\hl\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../hl/test/hl_test_tabledll/Release/hl_test_tabledll.pdb"

 				SubSystem="1"

diff --git a/windows/hl/tools/gifconv/gif2h5.vcproj b/windows/hl/tools/gifconv/gif2h5.vcproj
index 19b6e7c..fa1e9d4 100644
--- a/windows/hl/tools/gifconv/gif2h5.vcproj
+++ b/windows/hl/tools/gifconv/gif2h5.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="gif2h5"

 	ProjectGUID="{7C30B2A4-A24D-4796-9754-CABBDB46D0F8}"

-	RootNamespace="gif2h5"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/gif2h5.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/gif2h5.pdb"

diff --git a/windows/hl/tools/gifconv/h52gif.vcproj b/windows/hl/tools/gifconv/h52gif.vcproj
index e244e5a..a464744 100644
--- a/windows/hl/tools/gifconv/h52gif.vcproj
+++ b/windows/hl/tools/gifconv/h52gif.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h52gif"

 	ProjectGUID="{AA7A40A2-A837-4557-AB3D-D64980F6F8E4}"

-	RootNamespace="h52gif"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/h52gif.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/h52gif.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +260,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconv\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/hl/tools/gifconvdll/gif2h5dll.vcproj b/windows/hl/tools/gifconvdll/gif2h5dll.vcproj
index c1e7947..6a3ba12 100644
--- a/windows/hl/tools/gifconvdll/gif2h5dll.vcproj
+++ b/windows/hl/tools/gifconvdll/gif2h5dll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="gif2h5dll"

 	ProjectGUID="{C325E167-DBC3-4611-8AC8-2A118432E35B}"

-	RootNamespace="gif2h5dll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/gif2h5dll.pdb"

 				SubSystem="1"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release/gif2h5dll.pdb"

 				SubSystem="1"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -256,7 +255,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/gif2h5dll.pdb"

@@ -293,7 +292,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -347,7 +346,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/gif2h5dll.pdb"

diff --git a/windows/hl/tools/gifconvdll/h52gifdll.vcproj b/windows/hl/tools/gifconvdll/h52gifdll.vcproj
index 5d0e7a1..ca902e9 100644
--- a/windows/hl/tools/gifconvdll/h52gifdll.vcproj
+++ b/windows/hl/tools/gifconvdll/h52gifdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h52gifdll"

 	ProjectGUID="{834DD32C-D078-441F-95F4-9CDE108B60AE}"

-	RootNamespace="h52gifdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/h52gifdll.pdb"

 				SubSystem="1"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release/h52gifdll.pdb"

 				SubSystem="1"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -256,7 +255,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/h52gifdll.pdb"

@@ -293,7 +292,7 @@
 			OutputDirectory="..\..\..\..\hl\tools\gifconvdll\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -347,7 +346,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/h52gifdll.pdb"

diff --git a/windows/install_hlcexamples.BAT b/windows/install_hlcexamples.BAT
index 7644ed0..306a340 100755
--- a/windows/install_hlcexamples.BAT
+++ b/windows/install_hlcexamples.BAT
@@ -1,95 +1,34 @@
-@echo OFF

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

+@REM Copyright by The HDF Group.

+@REM Copyright by the Board of Trustees of the University of Illinois.

+@REM All rights reserved.

+@REM

+@REM This file is part of HDF5.  The full HDF5 copyright notice, including

+@REM terms governing use, modification, and redistribution, is contained in

+@REM the files COPYING and Copyright.html.  COPYING can be found at the root

+@REM of the source code distribution tree; Copyright.html can be found at the

+@REM root level of an installed copy of the electronic HDF5 document set and

+@REM is linked from the top-level documents page.  It can also be found at

+@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

+@REM access to either file, you may request a copy from help@hdfgroup.org.

 

 

-rem This batch file is used to install HDF5 High Level C 

-rem Examples' executable files.

-rem Written by   : Fang GUO

-rem Created on   : 07/25/2005

-rem Last Modified: 2/18/2008

+@ECHO OFF

+@:: This batch file is used to install HDF5 High Level C 

+@:: Examples' executable files.

+@:: Written by   : Fang GUO

+@:: Created on   : 07/25/2005

+@:: Last Modified: 03/08/2006

 

-setlocal enabledelayedexpansion

-pushd %~dp0

+cd hl/examples

 

-set exdir=hl\examples

-set nerrors=0

-goto main

+mkdir HLCexamplesRELEASE

+mkdir HLCexamplesRELEASEDLL

+mkdir HLCexamplesDEBUG

+mkdir HLCexamplesDEBUGDLL

 

-rem Simply create the needed directories

-:makedirs

-    mkdir %exdir%\HLCexamplesRELEASE

-    mkdir %exdir%\HLCexamplesRELEASEDLL

-    mkdir %exdir%\HLCexamplesDEBUG

-    mkdir %exdir%\HLCexamplesDEBUGDLL

-    exit /b

-

-rem This function actally copies the file over, first making sure it exists.  If not, we increment nerrors

-rem and print an error message

-rem Expected parameters:

-rem     %1 - name of file to copy

-rem     %2 - destination to copy to

-:safe_copy

-    

-    if exist %exdir%\%1 (

-        copy /y %exdir%\%1 %exdir%\%2 > nul

-    ) else (

-        echo.Warning: Cannot find example file: %exdir%\%1

-        set /a nerrors=%nerrors%+1

-    )

-    

-    exit /b %nerrors%

-    

-    

-:main

-    if not exist %exdir% (

-        echo.Error: Examples directory doesn't exist: %CD%\%exdir%

-        set /a nerrors=!nerrors!+1

-        goto :end

-    )

-    

-    call :makedirs

-    

-    rem copy the files

-    for %%a in (DEBUG RELEASE) do (

-        for %%b in (DLL static) do (

-            set ver=%%b

-            set ver=!ver:static=!

-            

-            call :safe_copy ex_ds1!ver!\%%a\ex_ds1!ver!.exe HLCexamples%%a!ver!

-            

-            for /l %%c in (1,1,2) do (

-                call :safe_copy ex_image%%c!ver!\%%a\ex_image%%c!ver!.exe HLCexamples%%a!ver!

-            )

-            

-            for /l %%c in (1,1,3) do (

-                call :safe_copy ex_lite%%c!ver!\%%a\ex_lite%%c!ver!.exe HLCexamples%%a!ver!

-            )

-    

-            for /l %%c in (1,1,9) do (

-                call :safe_copy ex_table0%%c!ver!\%%a\ex_table0%%c!ver!.exe HLCexamples%%a!ver!

-            )

-            

-            for /l %%c in (10,1,12) do (

-                call :safe_copy ex_table%%c!ver!\%%a\ex_table%%c!ver!.exe HLCexamples%%a!ver!

-            )

-            

-            for %%c in (FL VL) do (

-                call :safe_copy ptExample%%c!ver!\%%a\ptExample%%c!ver!.exe HLCexamples%%a!ver!

-            )

-        )

-    )

-    

-:end

-popd

-endlocal & exit /b %nerrors%
\ No newline at end of file
+for %%i in (images lite table ds packet) do (

+copy ex_%%i\debug\ex_%%i.exe HLCexamplesDEBUG\

+copy ex_%%i\release\ex_%%i.exe HLCexamplesRELEASE\

+copy ex_%%idll\debug\ex_%%idll.exe HLCexamplesDEBUGDLL\

+copy ex_%%idll\release\ex_%%idll.exe HLCexamplesRELEASEDLL\

+)

diff --git a/windows/installhdf5lib.bat b/windows/installhdf5lib.bat
index 8ee5bb6..d53258c 100755
--- a/windows/installhdf5lib.bat
+++ b/windows/installhdf5lib.bat
@@ -1,328 +1,178 @@
-@echo OFF

-rem Copyright by The HDF Group.

-rem Copyright by the Board of Trustees of the University of Illinois.

-rem All rights reserved.

-rem

-rem This file is part of HDF5.  The full HDF5 copyright notice, including

-rem terms governing use, modification, and redistribution, is contained in

-rem the files COPYING and Copyright.html.  COPYING can be found at the root

-rem of the source code distribution tree; Copyright.html can be found at the

-rem root level of an installed copy of the electronic HDF5 document set and

-rem is linked from the top-level documents page.  It can also be found at

-rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

-rem access to either file, you may request a copy from help@hdfgroup.org.

-

-

-rem This batch file is used to install HDF5 libraries and tools

-rem Last Updated: 2/12/2007

-

-setlocal enabledelayedexpansion

-pushd %~dp0

-

-set install_dir=%systemroot%\system

-

-goto main

-

-rem Create the directory structure that we'll need to install

-:create_directories

-

-    for %%a in (debug release) do (

-        for %%b in (bin bindll dll lib include modsdll) do (

-            if not exist hdf5lib\%%a\%%b (

-                mkdir hdf5lib\%%a\%%b

-            )

-        )

-    )

-    

-    exit /b

-

-rem This function actally copies the file over, first making sure it exists.  If not, we increment nerrors

-rem Expected parameters:

-rem     %1 - name of file to copy

-rem     %2 - destination to copy to

-:safe_copy

-    

-    if exist %1 (

-        copy /y %1 %2 > nul

-    ) else (

-        set /a nerrors=%nerrors%+1

-    )

-    

-    exit /b

-    

-

-rem Only delete a file if it actually exists.  Return the status of delete if it was called

-rem Expected paramters:

-rem     %1 - name of file to delete

-:safe_delete

-    if exist %1 (

-        del /f %1 > nul

-    )

-    

-    exit /b

-

-

-rem Install C Libraries and Tools

-:install_c

-    set nerrors=0

-    

-    rem ===DEBUG===

-    rem include

-    call :safe_copy src\*.h hdf5lib\debug\include

-    call :safe_delete hdf5lib\debug\include\*private.h

-    rem lib

-    call :safe_copy proj\hdf5\debug\hdf5d.lib hdf5lib\debug\lib

-    rem dll

-    call :safe_copy proj\hdf5dll\debug\hdf5ddll.lib hdf5lib\debug\dll

-    call :safe_copy proj\hdf5dll\debug\hdf5ddll.dll hdf5lib\debug\dll

-    rem bin

-    call :safe_copy hl\tools\gifconv\gif2h5\debug\gif2h5.exe hdf5lib\debug\bin

-    call :safe_copy hl\tools\gifconv\h52gif\debug\h52gif.exe hdf5lib\debug\bin

-    call :safe_copy tools\h5debug\debug\h5debug.exe hdf5lib\debug\bin

-    call :safe_copy tools\h5diff\debug\h5diff.exe hdf5lib\debug\bin

-    call :safe_copy tools\h5dump\debug\h5dump.exe hdf5lib\debug\bin

-    call :safe_copy tools\h5import\debug\h5import.exe hdf5lib\debug\bin

-    call :safe_copy tools\h5jam\debug\h5jam.exe hdf5lib\debug\bin

-    call :safe_copy tools\h5ls\debug\h5ls.exe hdf5lib\debug\bin

-    call :safe_copy tools\h5repack\debug\h5repack.exe hdf5lib\debug\bin

-    call :safe_copy tools\h5repart\debug\h5repart.exe hdf5lib\debug\bin

-    call :safe_copy tools\h5unjam\debug\h5unjam.exe hdf5lib\debug\bin

-    rem bindll

-    call :safe_copy hl\tools\gifconvdll\h52gifdll\debug\h52gifdll.exe hdf5lib\debug\bindll

-    call :safe_copy hl\tools\gifconvdll\gif2h5dll\debug\gif2h5dll.exe hdf5lib\debug\bindll

-    call :safe_copy tools\h5debugdll\debug\h5debugdll.exe hdf5lib\debug\bindll

-    call :safe_copy tools\h5diffdll\debug\h5diffdll.exe hdf5lib\debug\bindll

-    call :safe_copy tools\h5dumpdll\debug\h5dumpdll.exe hdf5lib\debug\bindll

-    call :safe_copy tools\h5importdll\debug\h5importdll.exe hdf5lib\debug\bindll

-    call :safe_copy tools\h5lsdll\debug\h5lsdll.exe hdf5lib\debug\bindll

-    call :safe_copy tools\h5repackdll\debug\h5repackdll.exe hdf5lib\debug\bindll

-    call :safe_copy tools\h5repartdll\debug\h5repartdll.exe hdf5lib\debug\bindll

-    

-    rem ===RELEASE===

-    rem include

-    call :safe_copy src\*.h hdf5lib\release\include

-    call :safe_delete hdf5lib\release\include\*private.h

-    rem lib

-    call :safe_copy proj\hdf5\release\hdf5.lib hdf5lib\release\lib

-    rem dll

-    call :safe_copy proj\hdf5dll\release\hdf5dll.lib hdf5lib\release\dll

-    call :safe_copy proj\hdf5dll\release\hdf5dll.dll hdf5lib\release\dll

-    rem bin

-    call :safe_copy hl\tools\gifconv\gif2h5\release\gif2h5.exe hdf5lib\release\bin

-    call :safe_copy hl\tools\gifconv\h52gif\release\h52gif.exe hdf5lib\release\bin

-    call :safe_copy tools\h5debug\release\h5debug.exe hdf5lib\release\bin

-    call :safe_copy tools\h5diff\release\h5diff.exe hdf5lib\release\bin

-    call :safe_copy tools\h5dump\release\h5dump.exe hdf5lib\release\bin

-    call :safe_copy tools\h5import\release\h5import.exe hdf5lib\release\bin

-    call :safe_copy tools\h5jam\release\h5jam.exe hdf5lib\release\bin

-    call :safe_copy tools\h5ls\release\h5ls.exe hdf5lib\release\bin

-    call :safe_copy tools\h5repack\release\h5repack.exe hdf5lib\release\bin

-    call :safe_copy tools\h5repart\release\h5repart.exe hdf5lib\release\bin

-    call :safe_copy tools\h5unjam\release\h5unjam.exe hdf5lib\release\bin

-    rem bindll

-    call :safe_copy hl\tools\gifconvdll\h52gifdll\release\h52gifdll.exe hdf5lib\release\bindll

-    call :safe_copy hl\tools\gifconvdll\gif2h5dll\release\gif2h5dll.exe hdf5lib\release\bindll

-    call :safe_copy tools\h5debugdll\release\h5debugdll.exe hdf5lib\release\bindll

-    call :safe_copy tools\h5diffdll\release\h5diffdll.exe hdf5lib\release\bindll

-    call :safe_copy tools\h5dumpdll\release\h5dumpdll.exe hdf5lib\release\bindll

-    call :safe_copy tools\h5importdll\release\h5importdll.exe hdf5lib\release\bindll

-    call :safe_copy tools\h5lsdll\release\h5lsdll.exe hdf5lib\release\bindll

-    call :safe_copy tools\h5repackdll\release\h5repackdll.exe hdf5lib\release\bindll

-    call :safe_copy tools\h5repartdll\release\h5repartdll.exe hdf5lib\release\bindll

-    

-    exit /b %nerrors%

-    

-

-rem Install HL Libraries and Tools

-:install_hl

-    set nerrors=0

-    

-    rem ===DEBUG===

-    rem include

-    call :safe_copy hl\src\*.h hdf5lib\debug\include

-    rem lib

-    call :safe_copy proj\hdf5_hl\debug\hdf5_hld.lib hdf5lib\debug\lib

-    rem dll

-    call :safe_copy proj\hdf5_hldll\debug\hdf5_hlddll.lib hdf5lib\debug\dll

-    call :safe_copy proj\hdf5_hldll\debug\hdf5_hlddll.dll hdf5lib\debug\dll

-

-    rem ===RELEASE===

-    rem include

-    call :safe_copy hl\src\*.h hdf5lib\release\include

-    rem lib

-    call :safe_copy proj\hdf5_hl\release\hdf5_hl.lib hdf5lib\release\lib

-    rem dll

-    call :safe_copy proj\hdf5_hldll\release\hdf5_hldll.lib hdf5lib\release\dll

-    call :safe_copy proj\hdf5_hldll\release\hdf5_hldll.dll hdf5lib\release\dll

-

-    exit /b %nerrors%

-

-

-rem Install C++ Libraries and Tools

-:install_cpp

-    set nerrors=0

-

-    REM ===DEBUG===

-    rem include

-    call :safe_copy "c++\src\*.h" hdf5lib\debug\include

-    rem lib

-    call :safe_copy proj\hdf5_cpp\debug\hdf5_cppd.lib hdf5lib\debug\lib

-    rem dll

-    call :safe_copy proj\hdf5_cppdll\debug\hdf5_cppddll.lib hdf5lib\debug\dll

-    call :safe_copy proj\hdf5_cppdll\debug\hdf5_cppddll.dll hdf5lib\debug\dll

-

-    rem ===RELEASE===

-    rem include

-    call :safe_copy "c++\src\*.h" hdf5lib\release\include

-    rem lib

-    call :safe_copy proj\hdf5_cpp\release\hdf5_cpp.lib hdf5lib\release\lib

-    rem dll

-    call :safe_copy proj\hdf5_cppdll\release\hdf5_cppdll.lib hdf5lib\release\dll

-    call :safe_copy proj\hdf5_cppdll\release\hdf5_cppdll.dll hdf5lib\release\dll

-

-    exit /b %nerrors%

-    

-    

-rem Install HL C++ Libraries and Tools

-:install_hlcpp

-    set nerrors=0

-    

-    rem ===DEBUG===

-    rem include

-    call :safe_copy "hl\c++\src\*.h" hdf5lib\debug\include

-    rem lib

-    call :safe_copy proj\hdf5_hl_cpp\debug\hdf5_hl_cppd.lib hdf5lib\debug\lib

-    rem dll

-    call :safe_copy proj\hdf5_hl_cppdll\debug\hdf5_hl_cppddll.lib hdf5lib\debug\dll

-    call :safe_copy proj\hdf5_hl_cppdll\debug\hdf5_hl_cppddll.dll hdf5lib\debug\dll

-

-    rem ===RELEASE===

-    rem include

-    call :safe_copy "hl\c++\src\*.h" hdf5lib\release\include

-    rem lib

-    call :safe_copy proj\hdf5_hl_cpp\release\hdf5_hl_cpp.lib hdf5lib\release\lib

-    rem dll

-    call :safe_copy proj\hdf5_hl_cppdll\release\hdf5_hl_cppdll.lib hdf5lib\release\dll

-    call :safe_copy proj\hdf5_hl_cppdll\release\hdf5_hl_cppdll.dll hdf5lib\release\dll

-    

-    exit /b %nerrors%

-    

-    

-rem Install Fortran Libraries and Tools

-:install_fortran

-    set nerrors=0

-    

-    rem ===DEBUG===

-    rem include

-    call :safe_copy proj\hdf5_fortran\debug\*.mod hdf5lib\debug\include

-    rem lib

-    call :safe_copy proj\hdf5_fortran\debug\hdf5_fortrand.lib hdf5lib\debug\lib

-    call :safe_copy proj\hdf5_f90cstub\debug\hdf5_f90cstubd.lib hdf5lib\debug\lib

-    rem modsdll

-    call :safe_copy proj\hdf5_fortrandll\debug\*.mod hdf5lib\debug\modsdll

-    rem dll

-    call :safe_copy proj\hdf5_fortrandll\debug\hdf5_fortranddll.lib hdf5lib\debug\dll

-    call :safe_copy proj\hdf5_fortrandll\debug\hdf5_fortranddll.dll hdf5lib\debug\dll

-    call :safe_copy proj\hdf5_f90cstubdll\debug\hdf5_f90cstubddll.lib hdf5lib\debug\dll

-    call :safe_copy proj\hdf5_f90cstubdll\debug\hdf5_f90cstubddll.dll hdf5lib\debug\dll

-

-    rem ===RELEASE===

-    rem include

-    call :safe_copy proj\hdf5_fortran\release\*.mod hdf5lib\release\include

-    rem lib

-    call :safe_copy proj\hdf5_fortran\release\hdf5_fortran.lib hdf5lib\release\lib

-    call :safe_copy proj\hdf5_f90cstub\release\hdf5_f90cstub.lib hdf5lib\release\lib

-    rem modsdll

-    call :safe_copy proj\hdf5_fortrandll\release\*.mod hdf5lib\release\modsdll

-    rem dll

-    call :safe_copy proj\hdf5_fortrandll\release\hdf5_fortrandll.lib hdf5lib\release\dll

-    call :safe_copy proj\hdf5_fortrandll\release\hdf5_fortrandll.dll hdf5lib\release\dll

-    call :safe_copy proj\hdf5_f90cstubdll\release\hdf5_f90cstubdll.lib hdf5lib\release\dll

-    call :safe_copy proj\hdf5_f90cstubdll\release\hdf5_f90cstubdll.dll hdf5lib\release\dll

-    

-    exit /b %nerrors%

-    

-    

-rem Install HL Fortran Libraries and Tools

-:install_hlfortran

-    set nerrors=0

-    

-    rem ===DEBUG===

-    rem include

-    call :safe_copy proj\hdf5_hl_fortran\debug\*.mod  hdf5lib\debug\include

-    rem lib

-    call :safe_copy proj\hdf5_hl_fortran\debug\hdf5_hl_fortrand.lib hdf5lib\debug\lib

-    call :safe_copy proj\hdf5_hl_f90cstub\debug\hdf5_hl_f90cstubd.lib hdf5lib\debug\lib

-    rem modsdll

-    call :safe_copy proj\hdf5_hl_fortrandll\debug\*.mod  hdf5lib\debug\modsdll

-    rem dll

-    call :safe_copy proj\hdf5_hl_fortrandll\debug\hdf5_hl_fortranddll.lib hdf5lib\debug\dll

-    call :safe_copy proj\hdf5_hl_fortrandll\debug\hdf5_hl_fortranddll.dll hdf5lib\debug\dll

-    call :safe_copy proj\hdf5_hl_f90cstubdll\debug\hdf5_hl_f90cstubddll.lib hdf5lib\debug\dll

-    call :safe_copy proj\hdf5_hl_f90cstubdll\debug\hdf5_hl_f90cstubddll.dll hdf5lib\debug\dll

-

-    rem ===RELEASE===

-    rem include

-    call :safe_copy proj\hdf5_hl_fortran\release\*.mod  hdf5lib\release\include

-    rem lib

-    call :safe_copy proj\hdf5_hl_fortran\release\hdf5_hl_fortran.lib hdf5lib\release\lib

-    call :safe_copy proj\hdf5_hl_f90cstub\release\hdf5_hl_f90cstub.lib hdf5lib\release\lib

-    rem modsdll

-    call :safe_copy proj\hdf5_hl_fortrandll\release\*.mod  hdf5lib\release\modsdll

-    rem dll

-    call :safe_copy proj\hdf5_hl_fortrandll\release\hdf5_hl_fortrandll.lib hdf5lib\release\dll

-    call :safe_copy proj\hdf5_hl_fortrandll\release\hdf5_hl_fortrandll.dll hdf5lib\release\dll

-    call :safe_copy proj\hdf5_hl_f90cstubdll\release\hdf5_hl_f90cstubdll.lib hdf5lib\release\dll

-    call :safe_copy proj\hdf5_hl_f90cstubdll\release\hdf5_hl_f90cstubdll.dll hdf5lib\release\dll

-    

-    exit /b %nerrors%

-    

-    

-:main

-

-    call :create_directories

-    

-    call :install_c

-    if %errorlevel% equ 0 (

-        echo.C libraries and tools installed

-    ) else (

-        echo.C libraries and tools NOT installed

-    )

-    

-    call :install_hl

-    if %errorlevel% equ 0 (

-        echo.High Level C libraries and tools installed

-    ) else (

-        echo.High Level C libraries and tools NOT installed

-    )

-    

-    call :install_cpp

-    if %errorlevel% equ 0 (

-        echo.C++ libraries and tools installed 

-    ) else (

-        echo.C++ libraries and tools NOT installed 

-    )

-    

-    call :install_hlcpp

-    if %errorlevel% equ 0 (

-        echo.High Level C++ libraries and tools installed

-    ) else (

-        echo.High Level C++ libraries and tools NOT installed

-    )

-

-    call :install_fortran

-    if %errorlevel% equ 0 (

-        echo.Fortran libraries and tools installed

-    ) else (

-        echo.Fortran libraries and tools NOT installed

-    )

-    

-    call :install_hlfortran

-    if %errorlevel% equ 0 (

-        echo.High Level Fortran libraries and tools installed

-    ) else (

-        echo.High Level Fortran libraries and tools NOT installed

-    )

-    

-    popd

-    endlocal & exit /b 0

+@REM Copyright by The HDF Group.

+@REM Copyright by the Board of Trustees of the University of Illinois.

+@REM All rights reserved.

+@REM

+@REM This file is part of HDF5.  The full HDF5 copyright notice, including

+@REM terms governing use, modification, and redistribution, is contained in

+@REM the files COPYING and Copyright.html.  COPYING can be found at the root

+@REM of the source code distribution tree; Copyright.html can be found at the

+@REM root level of an installed copy of the electronic HDF5 document set and

+@REM is linked from the top-level documents page.  It can also be found at

+@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have

+@REM access to either file, you may request a copy from help@hdfgroup.org.

+

+

+@REM This batch file is used to install HDF5 libraries and tools

+@REM Last Updated: 11/03/2004

+

+mkdir hdf5lib

+cd hdf5lib

+mkdir debug

+cd debug

+mkdir bin

+mkdir bindll

+mkdir dll

+mkdir lib

+mkdir include

+mkdir modsdll

+cd ..

+mkdir release

+cd release

+mkdir bin

+mkdir bindll

+mkdir dll

+mkdir lib

+mkdir include

+mkdir modsdll

+cd ..

+cd ..

+

+@REM Install C libraries and tools

+copy src\*.h hdf5lib\debug\include

+del hdf5lib\debug\include\*private.h

+copy proj\hdf5\debug\hdf5d.lib hdf5lib\debug\lib

+copy proj\hdf5dll\debug\hdf5ddll.lib hdf5lib\debug\dll

+copy proj\hdf5dll\debug\hdf5ddll.dll hdf5lib\debug\dll

+

+copy hl\tools\gifconv\gif2h5\debug\gif2h5.exe hdf5lib\debug\bin

+copy hl\tools\gifconv\h52gif\debug\h52gif.exe hdf5lib\debug\bin

+copy tools\h5debug\debug\h5debug.exe hdf5lib\debug\bin

+copy tools\h5diff\debug\h5diff.exe hdf5lib\debug\bin

+copy tools\h5dump\debug\h5dump.exe hdf5lib\debug\bin

+copy tools\h5import\debug\h5import.exe hdf5lib\debug\bin

+copy tools\h5jam\debug\h5jam.exe hdf5lib\debug\bin

+copy tools\h5ls\debug\h5ls.exe hdf5lib\debug\bin

+copy tools\h5repack\debug\h5repack.exe hdf5lib\debug\bin

+copy tools\h5repart\debug\h5repart.exe hdf5lib\debug\bin

+copy tools\h5unjam\debug\h5unjam.exe hdf5lib\debug\bin

+

+copy hl\tools\gifconvdll\h52gifdll\debug\h52gifdll.exe hdf5lib\debug\bindll

+copy hl\tools\gifconvdll\gif2h5dll\debug\gif2h5dll.exe hdf5lib\debug\bindll

+copy tools\h5debugdll\debug\h5debugdll.exe hdf5lib\debug\bindll

+copy tools\h5diffdll\debug\h5diffdll.exe hdf5lib\debug\bindll

+copy tools\h5dumpdll\debug\h5dumpdll.exe hdf5lib\debug\bindll

+copy tools\h5importdll\debug\h5importdll.exe hdf5lib\debug\bindll

+copy tools\h5lsdll\debug\h5lsdll.exe hdf5lib\debug\bindll

+copy tools\h5repackdll\debug\h5repackdll.exe hdf5lib\debug\bindll

+copy tools\h5repartdll\debug\h5repartdll.exe hdf5lib\debug\bindll

+

+copy src\*.h hdf5lib\release\include

+del hdf5lib\release\include\*private.h

+copy proj\hdf5\release\hdf5.lib hdf5lib\release\lib

+copy proj\hdf5dll\release\hdf5dll.lib hdf5lib\release\dll

+copy proj\hdf5dll\release\hdf5dll.dll hdf5lib\release\dll

+

+

+copy hl\tools\gifconv\gif2h5\release\gif2h5.exe hdf5lib\release\bin

+copy hl\tools\gifconv\h52gif\release\h52gif.exe hdf5lib\release\bin

+copy tools\h5debug\release\h5debug.exe hdf5lib\release\bin

+copy tools\h5diff\release\h5diff.exe hdf5lib\release\bin

+copy tools\h5dump\release\h5dump.exe hdf5lib\release\bin

+copy tools\h5import\release\h5import.exe hdf5lib\release\bin

+copy tools\h5jam\release\h5jam.exe hdf5lib\release\bin

+copy tools\h5ls\release\h5ls.exe hdf5lib\release\bin

+copy tools\h5repack\release\h5repack.exe hdf5lib\release\bin

+copy tools\h5repart\release\h5repart.exe hdf5lib\release\bin

+copy tools\h5unjam\release\h5unjam.exe hdf5lib\release\bin

+

+copy hl\tools\gifconvdll\h52gifdll\release\h52gifdll.exe hdf5lib\release\bindll

+copy hl\tools\gifconvdll\gif2h5dll\release\gif2h5dll.exe hdf5lib\release\bindll

+copy tools\h5debugdll\release\h5debugdll.exe hdf5lib\release\bindll

+copy tools\h5diffdll\release\h5diffdll.exe hdf5lib\release\bindll

+copy tools\h5dumpdll\release\h5dumpdll.exe hdf5lib\release\bindll

+copy tools\h5importdll\release\h5importdll.exe hdf5lib\release\bindll

+copy tools\h5lsdll\release\h5lsdll.exe hdf5lib\release\bindll

+copy tools\h5repackdll\release\h5repackdll.exe hdf5lib\release\bindll

+copy tools\h5repartdll\release\h5repartdll.exe hdf5lib\release\bindll

+

+@REM Install HDF5 High Level Libraries

+copy hl\src\*.h hdf5lib\debug\include

+copy "hl\c++\src\*.h" hdf5lib\debug\include

+copy proj\hdf5_hl_fortran\debug\*.mod  hdf5lib\debug\include

+copy proj\hdf5_hl_fortrandll\debug\*.mod  hdf5lib\debug\modsdll

+

+

+copy proj\hdf5_hl\debug\hdf5_hld.lib hdf5lib\debug\lib

+copy proj\hdf5_hl_cpp\debug\hdf5_hl_cppd.lib hdf5lib\debug\lib

+copy proj\hdf5_hl_fortran\debug\hdf5_hl_fortrand.lib hdf5lib\debug\lib

+copy proj\hdf5_hl_f90cstub\debug\hdf5_hl_f90cstubd.lib hdf5lib\debug\lib

+

+

+copy proj\hdf5_hldll\debug\hdf5_hlddll.lib hdf5lib\debug\dll

+copy proj\hdf5_hldll\debug\hdf5_hlddll.dll hdf5lib\debug\dll

+

+copy proj\hdf5_hl_cppdll\debug\hdf5_hl_cppddll.lib hdf5lib\debug\dll

+copy proj\hdf5_hl_cppdll\debug\hdf5_hl_cppddll.dll hdf5lib\debug\dll

+

+copy proj\hdf5_hl_fortrandll\debug\hdf5_hl_fortranddll.lib hdf5lib\debug\dll

+copy proj\hdf5_hl_fortrandll\debug\hdf5_hl_fortranddll.dll hdf5lib\debug\dll

+

+copy proj\hdf5_hl_f90cstubdll\debug\hdf5_hl_f90cstubddll.lib hdf5lib\debug\dll

+copy proj\hdf5_hl_f90cstubdll\debug\hdf5_hl_f90cstubddll.dll hdf5lib\debug\dll

+

+copy hl\src\*.h hdf5lib\release\include

+copy "hl\c++\src\*.h" hdf5lib\release\include

+copy proj\hdf5_hl_fortran\release\*.mod  hdf5lib\release\include

+copy proj\hdf5_hl_fortrandll\release\*.mod  hdf5lib\release\modsdll

+

+copy proj\hdf5_hl\release\hdf5_hl.lib hdf5lib\release\lib

+copy proj\hdf5_hl_cpp\release\hdf5_hl_cpp.lib hdf5lib\release\lib

+copy proj\hdf5_hl_fortran\release\hdf5_hl_fortran.lib hdf5lib\release\lib

+copy proj\hdf5_hl_f90cstub\release\hdf5_hl_f90cstub.lib hdf5lib\release\lib

+

+copy proj\hdf5_hldll\release\hdf5_hldll.lib hdf5lib\release\dll

+copy proj\hdf5_hldll\release\hdf5_hldll.dll hdf5lib\release\dll

+

+copy proj\hdf5_hl_cppdll\release\hdf5_hl_cppdll.lib hdf5lib\release\dll

+copy proj\hdf5_hl_cppdll\release\hdf5_hl_cppdll.dll hdf5lib\release\dll

+

+copy proj\hdf5_hl_fortrandll\release\hdf5_hl_fortrandll.lib hdf5lib\release\dll

+copy proj\hdf5_hl_fortrandll\release\hdf5_hl_fortrandll.dll hdf5lib\release\dll

+

+copy proj\hdf5_hl_f90cstubdll\release\hdf5_hl_f90cstubdll.lib hdf5lib\release\dll

+copy proj\hdf5_hl_f90cstubdll\release\hdf5_hl_f90cstubdll.dll hdf5lib\release\dll

+

+@REM Install C++ libraries and tools

+rename c++ cpp

+

+copy cpp\src\*.h hdf5lib\debug\include

+copy proj\hdf5_cpp\debug\hdf5_cppd.lib hdf5lib\debug\lib

+copy proj\hdf5_cppdll\debug\hdf5_cppddll.lib hdf5lib\debug\dll

+copy proj\hdf5_cppdll\debug\hdf5_cppddll.dll hdf5lib\debug\dll

+

+

+copy cpp\src\*.h hdf5lib\release\include

+copy proj\hdf5_cpp\release\hdf5_cpp.lib hdf5lib\release\lib

+copy proj\hdf5_cppdll\release\hdf5_cppdll.lib hdf5lib\release\dll

+copy proj\hdf5_cppdll\release\hdf5_cppdll.dll hdf5lib\release\dll

+

+rename cpp c++

+

+@REM Install Fortran libraries and tools

+copy proj\hdf5_fortran\debug\*.mod hdf5lib\debug\include

+copy proj\hdf5_fortran\debug\hdf5_fortrand.lib hdf5lib\debug\lib

+copy proj\hdf5_f90cstub\debug\hdf5_f90cstubd.lib hdf5lib\debug\lib

+copy proj\hdf5_fortrandll\debug\*.mod hdf5lib\debug\modsdll

+copy proj\hdf5_fortrandll\debug\hdf5_fortranddll.lib hdf5lib\debug\dll

+copy proj\hdf5_fortrandll\debug\hdf5_fortranddll.dll hdf5lib\debug\dll

+copy proj\hdf5_f90cstubdll\debug\hdf5_f90cstubddll.lib hdf5lib\debug\dll

+copy proj\hdf5_f90cstubdll\debug\hdf5_f90cstubddll.dll hdf5lib\debug\dll

+

+copy proj\hdf5_fortran\release\*.mod hdf5lib\release\include

+copy proj\hdf5_fortran\release\hdf5_fortran.lib hdf5lib\release\lib

+copy proj\hdf5_f90cstub\release\hdf5_f90cstub.lib hdf5lib\release\lib

+copy proj\hdf5_fortrandll\release\*.mod hdf5lib\release\modsdll

+copy proj\hdf5_fortrandll\release\hdf5_fortrandll.lib hdf5lib\release\dll

+copy proj\hdf5_fortrandll\release\hdf5_fortrandll.dll hdf5lib\release\dll

+copy proj\hdf5_f90cstubdll\release\hdf5_f90cstubdll.lib hdf5lib\release\dll

+copy proj\hdf5_f90cstubdll\release\hdf5_f90cstubdll.dll hdf5lib\release\dll

diff --git a/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj b/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj
index 2fc488c..2ef3da7 100644
--- a/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj
+++ b/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/H5fortran_detect.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/H5fortran_detect.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/H5fortran_detect.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/H5fortran_detect.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 		<File RelativePath="..\..\..\..\fortran\src\H5fortran_detect.f90"/></Filter>

diff --git a/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj b/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj
index 5dbe52f..282ae5f 100644
--- a/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj
+++ b/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/h5fortran_detect.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/h5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/h5fortran_detect.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/h5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/h5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/h5fortran_detect.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/h5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/h5fortran_detect.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/h5fortran_detect.pdb" SubSystem="subSystemConsole" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 		<File RelativePath="..\..\..\..\fortran\src\H5test_kind.f90"/></Filter>

diff --git a/windows/misc/typegen/h5match_types/h5match_types.vcproj b/windows/misc/typegen/h5match_types/h5match_types.vcproj
index fe38e9e..242a60b 100644
--- a/windows/misc/typegen/h5match_types/h5match_types.vcproj
+++ b/windows/misc/typegen/h5match_types/h5match_types.vcproj
@@ -22,7 +22,7 @@
 			OutputDirectory="..\..\..\..\fortran\src"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +75,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\Debug/H5match_types.pdb"

@@ -114,7 +114,7 @@
 			OutputDirectory="..\..\..\..\fortran\src"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +168,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\Debug/H5match_types.pdb"

@@ -207,7 +207,7 @@
 			OutputDirectory="..\..\..\..\fortran\src"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +260,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\Release/H5match_types.pdb"

 				SubSystem="1"

@@ -298,7 +298,7 @@
 			OutputDirectory="..\..\..\..\fortran\src"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +352,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\Release/H5match_types.pdb"

 				SubSystem="1"

diff --git a/windows/misc/typegen/h5tinit/h5tinit.vcproj b/windows/misc/typegen/h5tinit/h5tinit.vcproj
index 6921de5..288e7fe 100644
--- a/windows/misc/typegen/h5tinit/h5tinit.vcproj
+++ b/windows/misc/typegen/h5tinit/h5tinit.vcproj
@@ -22,7 +22,7 @@
 			OutputDirectory="..\..\..\..\src"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -74,7 +74,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\Release/h5tinit.pdb"

 				SubSystem="1"

@@ -112,7 +112,7 @@
 			OutputDirectory="..\..\..\..\src"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -165,7 +165,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\Release/h5tinit.pdb"

 				SubSystem="1"

@@ -203,7 +203,7 @@
 			OutputDirectory="..\..\..\..\src"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -255,7 +255,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\Debug/h5tinit.pdb"

@@ -294,7 +294,7 @@
 			OutputDirectory="..\..\..\..\src"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -347,7 +347,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\Debug/h5tinit.pdb"

diff --git a/windows/proj/all/all.sln b/windows/proj/all/all.sln
index a38fa7c..cc2466a 100755
--- a/windows/proj/all/all.sln
+++ b/windows/proj/all/all.sln
@@ -2,168 +2,169 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcproj", "{24E5C6DF-1FA4-49AD-AE75-1D9347966CC5}"

 	ProjectSection(ProjectDependencies) = postProject

-		{E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF} = {E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF}

-		{0A33B4FE-A2C9-4B7F-ACEC-D251308182ED} = {0A33B4FE-A2C9-4B7F-ACEC-D251308182ED}

-		{BA86B1FE-8CA7-4A96-9FD0-11941F885589} = {BA86B1FE-8CA7-4A96-9FD0-11941F885589}

-		{EB5DE4FB-CC65-47BF-9D94-AC96B01B6A33} = {EB5DE4FB-CC65-47BF-9D94-AC96B01B6A33}

-		{34C0FDFA-81D6-4652-B841-894BD1A15FB0} = {34C0FDFA-81D6-4652-B841-894BD1A15FB0}

-		{309CE6F8-4658-44CB-8E99-0B86DCA77EFC} = {309CE6F8-4658-44CB-8E99-0B86DCA77EFC}

-		{D1FD44F8-8263-4B29-985D-21CE26F45A76} = {D1FD44F8-8263-4B29-985D-21CE26F45A76}

-		{3BBA31F8-2679-4655-975D-52FDA5ABD5C4} = {3BBA31F8-2679-4655-975D-52FDA5ABD5C4}

-		{1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4} = {1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4}

-		{76FFD0F6-3D5F-4826-A3BA-DEE92084FA27} = {76FFD0F6-3D5F-4826-A3BA-DEE92084FA27}

-		{0CB176F2-1FA9-467A-986D-512FAD8144B0} = {0CB176F2-1FA9-467A-986D-512FAD8144B0}

-		{4E8105F2-56D4-45D6-9017-706F804052E7} = {4E8105F2-56D4-45D6-9017-706F804052E7}

-		{E8896FEE-8601-4AFC-91EA-6F9698574174} = {E8896FEE-8601-4AFC-91EA-6F9698574174}

-		{685666ED-4640-47EE-AEA5-35B9602CA541} = {685666ED-4640-47EE-AEA5-35B9602CA541}

-		{1B298EEC-0B47-4145-88AA-C6558E0BD993} = {1B298EEC-0B47-4145-88AA-C6558E0BD993}

-		{1AB767EA-546C-4F72-BC1F-6AA0458512D8} = {1AB767EA-546C-4F72-BC1F-6AA0458512D8}

-		{A26C50E9-D3FB-4490-9CD7-606EB2E77D21} = {A26C50E9-D3FB-4490-9CD7-606EB2E77D21}

-		{CAC1F1E8-55D5-4CC6-857E-F01E59FB8098} = {CAC1F1E8-55D5-4CC6-857E-F01E59FB8098}

-		{E6A9BFE8-84DE-46C0-A372-72087598018E} = {E6A9BFE8-84DE-46C0-A372-72087598018E}

-		{43069CE7-E7CB-4EBF-A6CC-31E7A06D3835} = {43069CE7-E7CB-4EBF-A6CC-31E7A06D3835}

-		{2FC5DAE1-36D6-4783-A0F9-96D0B37687A8} = {2FC5DAE1-36D6-4783-A0F9-96D0B37687A8}

-		{744EA5E0-18C8-4757-82DE-2D0CF11DBDDE} = {744EA5E0-18C8-4757-82DE-2D0CF11DBDDE}

-		{9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2} = {9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2}

-		{55894CDC-C220-40FE-B403-D74EAC6EBACF} = {55894CDC-C220-40FE-B403-D74EAC6EBACF}

-		{40EBF7DB-330C-4F56-AE68-9FC7D75CB5D5} = {40EBF7DB-330C-4F56-AE68-9FC7D75CB5D5}

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

-		{9E588AD8-14BD-4BA3-B4EA-16D1D882C700} = {9E588AD8-14BD-4BA3-B4EA-16D1D882C700}

-		{0CB771D6-9CAB-4799-A7B1-5D89E436E6AF} = {0CB771D6-9CAB-4799-A7B1-5D89E436E6AF}

-		{7ABA5DD5-77E7-42D3-9C29-84A13B0CAA91} = {7ABA5DD5-77E7-42D3-9C29-84A13B0CAA91}

-		{4EE91AD5-8332-4FD3-A5E3-BF4C145BB53A} = {4EE91AD5-8332-4FD3-A5E3-BF4C145BB53A}

-		{6410E6D2-EDBF-439D-8C43-1AB0C37AC851} = {6410E6D2-EDBF-439D-8C43-1AB0C37AC851}

-		{165195D1-B742-4030-8B12-3FE94B829D45} = {165195D1-B742-4030-8B12-3FE94B829D45}

-		{B36344D1-122C-4BC6-A292-CC82F74CBB0A} = {B36344D1-122C-4BC6-A292-CC82F74CBB0A}

-		{D10F67D0-8057-49C2-A62A-12D0C512288E} = {D10F67D0-8057-49C2-A62A-12D0C512288E}

-		{5CC7FFCE-2612-41B6-AF83-C1B61F67949B} = {5CC7FFCE-2612-41B6-AF83-C1B61F67949B}

-		{E81413CC-046C-42B0-B862-0BB81AED2854} = {E81413CC-046C-42B0-B862-0BB81AED2854}

-		{F4386ECB-D688-4C18-A091-673F1F8A96E7} = {F4386ECB-D688-4C18-A091-673F1F8A96E7}

-		{009F2CC9-B131-4C51-BCFD-CEBDEFCB32C7} = {009F2CC9-B131-4C51-BCFD-CEBDEFCB32C7}

-		{1C5A9EC8-F882-4A8A-B773-E79CD46369AF} = {1C5A9EC8-F882-4A8A-B773-E79CD46369AF}

-		{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05} = {DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}

-		{9321B2C5-74B3-4743-9D87-B0FDCB47373B} = {9321B2C5-74B3-4743-9D87-B0FDCB47373B}

-		{8F4417C5-2F4A-4070-88F9-0AFDB0F8EA14} = {8F4417C5-2F4A-4070-88F9-0AFDB0F8EA14}

-		{17DC13C3-78E0-4EF5-B7B1-87EB1A379D2A} = {17DC13C3-78E0-4EF5-B7B1-87EB1A379D2A}

-		{18FBE8C2-CD20-4D99-9E0B-63B408CE4850} = {18FBE8C2-CD20-4D99-9E0B-63B408CE4850}

-		{4F8B23C1-9832-4C3B-A836-2FBB53F628A0} = {4F8B23C1-9832-4C3B-A836-2FBB53F628A0}

-		{DBA493BD-3AF1-4616-8A80-F6FD41B70392} = {DBA493BD-3AF1-4616-8A80-F6FD41B70392}

-		{9A9D7ABC-ED3A-462E-9ED1-CB55F14174F3} = {9A9D7ABC-ED3A-462E-9ED1-CB55F14174F3}

-		{AE50F8BA-5FAC-47CC-A5A0-7F1E55C413E3} = {AE50F8BA-5FAC-47CC-A5A0-7F1E55C413E3}

-		{265C41B2-30D7-4FF8-A08C-B997363DA763} = {265C41B2-30D7-4FF8-A08C-B997363DA763}

-		{5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30} = {5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30}

-		{EC6B5EAD-D938-4211-A7B1-01C9D2C15160} = {EC6B5EAD-D938-4211-A7B1-01C9D2C15160}

-		{E02CDAAC-05F4-436B-B245-2A402FFA131F} = {E02CDAAC-05F4-436B-B245-2A402FFA131F}

-		{D1AADCA9-FB5A-4F44-8E11-8232941E2C33} = {D1AADCA9-FB5A-4F44-8E11-8232941E2C33}

-		{7C30B2A4-A24D-4796-9754-CABBDB46D0F8} = {7C30B2A4-A24D-4796-9754-CABBDB46D0F8}

-		{AA7A40A2-A837-4557-AB3D-D64980F6F8E4} = {AA7A40A2-A837-4557-AB3D-D64980F6F8E4}

-		{8CE6FF9D-8A14-4A45-971A-18972109AC9D} = {8CE6FF9D-8A14-4A45-971A-18972109AC9D}

-		{53022A9D-F5B2-407C-9A29-3AC71B3E6DDC} = {53022A9D-F5B2-407C-9A29-3AC71B3E6DDC}

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

-		{4941199C-EB11-460D-8EF7-9F68293AE202} = {4941199C-EB11-460D-8EF7-9F68293AE202}

-		{3E41969B-D69B-4235-B192-A94F7853D869} = {3E41969B-D69B-4235-B192-A94F7853D869}

-		{D15E5D9B-A1A6-4935-889C-D880FD0068CE} = {D15E5D9B-A1A6-4935-889C-D880FD0068CE}

-		{0E0F449A-7998-4113-BDD2-A74E0B6D3466} = {0E0F449A-7998-4113-BDD2-A74E0B6D3466}

-		{34EEE194-B77E-453E-9C59-252C0421188A} = {34EEE194-B77E-453E-9C59-252C0421188A}

-		{7F1AFE93-97E7-4905-A2CF-5C845D7FDD4F} = {7F1AFE93-97E7-4905-A2CF-5C845D7FDD4F}

-		{9A226D92-9326-4907-A462-25997D5C9427} = {9A226D92-9326-4907-A462-25997D5C9427}

-		{EFA04391-B35B-44C0-AB27-1383D4C9E358} = {EFA04391-B35B-44C0-AB27-1383D4C9E358}

-		{14DB1F8E-0BF6-4E9D-8372-5EA9ED48347F} = {14DB1F8E-0BF6-4E9D-8372-5EA9ED48347F}

-		{FD8B058E-F53A-4197-B75E-849904E5AA79} = {FD8B058E-F53A-4197-B75E-849904E5AA79}

-		{D0CEF98C-07B5-4A8A-9153-43FDF6B5F169} = {D0CEF98C-07B5-4A8A-9153-43FDF6B5F169}

-		{7CF4F18C-3C74-4EBB-AD76-F41575D7A5A0} = {7CF4F18C-3C74-4EBB-AD76-F41575D7A5A0}

-		{8708E58C-F990-4B6C-AD83-745CA9582E92} = {8708E58C-F990-4B6C-AD83-745CA9582E92}

-		{F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF} = {F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF}

-		{BE4FFA8B-2988-4888-A9B9-DD108BCBA8A6} = {BE4FFA8B-2988-4888-A9B9-DD108BCBA8A6}

-		{98AE818A-E887-414B-985F-85F8411916C9} = {98AE818A-E887-414B-985F-85F8411916C9}

-		{A90ADD88-DA1B-4642-A97B-37DF89433858} = {A90ADD88-DA1B-4642-A97B-37DF89433858}

-		{DFE42486-47A2-487C-81B9-DDCDA9F07BF0} = {DFE42486-47A2-487C-81B9-DDCDA9F07BF0}

-		{E9F8FC85-8508-4FE7-9BB0-C0494A71BA1B} = {E9F8FC85-8508-4FE7-9BB0-C0494A71BA1B}

-		{7693B383-C2CB-43FD-A428-598F73D214F7} = {7693B383-C2CB-43FD-A428-598F73D214F7}

-		{71A1C081-FF1C-452B-B938-95551D565302} = {71A1C081-FF1C-452B-B938-95551D565302}

-		{EBF7C380-5F58-462D-993D-75B53F83FA81} = {EBF7C380-5F58-462D-993D-75B53F83FA81}

-		{CEBB9980-4B77-4105-BFEB-4DCDBB1F5E35} = {CEBB9980-4B77-4105-BFEB-4DCDBB1F5E35}

-		{E3B02B7C-6CF5-42C5-8AF5-48D2B6D8F94B} = {E3B02B7C-6CF5-42C5-8AF5-48D2B6D8F94B}

-		{9AAC897A-70FA-4E5E-BF48-F664C12B05C7} = {9AAC897A-70FA-4E5E-BF48-F664C12B05C7}

-		{2DCDB978-79B7-4A3A-B24A-D908A49B7D50} = {2DCDB978-79B7-4A3A-B24A-D908A49B7D50}

-		{8792D377-8105-4C67-87F1-115E48D0178F} = {8792D377-8105-4C67-87F1-115E48D0178F}

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

-		{958A5473-0E7C-4FA1-9C2F-AEA0925EF5AD} = {958A5473-0E7C-4FA1-9C2F-AEA0925EF5AD}

-		{D1518671-CB9D-471F-8BCE-A03DE67F26B1} = {D1518671-CB9D-471F-8BCE-A03DE67F26B1}

-		{0DA16B6F-0156-417A-9093-589D55BB066C} = {0DA16B6F-0156-417A-9093-589D55BB066C}

-		{C2E6106F-1450-4F62-8D8E-17A93E986B26} = {C2E6106F-1450-4F62-8D8E-17A93E986B26}

-		{4BAFED6D-07B4-465D-8C93-81A1C2EF02E0} = {4BAFED6D-07B4-465D-8C93-81A1C2EF02E0}

-		{8C97CA6D-2210-4D1F-AEF2-5D56FFBCE767} = {8C97CA6D-2210-4D1F-AEF2-5D56FFBCE767}

-		{7E207F6A-DC28-4DEB-8454-7977092131DC} = {7E207F6A-DC28-4DEB-8454-7977092131DC}

-		{CE7C4168-68A6-43B2-BAE7-B2CF857C8F03} = {CE7C4168-68A6-43B2-BAE7-B2CF857C8F03}

-		{C325E167-DBC3-4611-8AC8-2A118432E35B} = {C325E167-DBC3-4611-8AC8-2A118432E35B}

-		{76858167-F4DB-476C-A2B6-A3069D60D9E2} = {76858167-F4DB-476C-A2B6-A3069D60D9E2}

-		{AE5D4766-9668-4EB5-B801-5DF8F53363FC} = {AE5D4766-9668-4EB5-B801-5DF8F53363FC}

-		{C4BA3E66-2310-43E7-B30A-ABDCCF44D823} = {C4BA3E66-2310-43E7-B30A-ABDCCF44D823}

-		{6312B365-AA53-43AA-BD00-848C1323CA8B} = {6312B365-AA53-43AA-BD00-848C1323CA8B}

-		{BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB} = {BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB}

-		{68A52165-E0EF-4019-B658-1AC734649955} = {68A52165-E0EF-4019-B658-1AC734649955}

-		{5A90FD64-6EED-45E1-A147-D9FE72788570} = {5A90FD64-6EED-45E1-A147-D9FE72788570}

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

-		{3B4A4A62-FDAC-4219-98BD-80C4FE5D4B2F} = {3B4A4A62-FDAC-4219-98BD-80C4FE5D4B2F}

-		{57A5C559-F1BD-49F1-9B5E-13591D22FD75} = {57A5C559-F1BD-49F1-9B5E-13591D22FD75}

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

-		{37605955-FA00-41C9-9D39-D078CF270376} = {37605955-FA00-41C9-9D39-D078CF270376}

-		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

-		{F5109F4B-5869-40A7-BC6A-8130CA4BB987} = {F5109F4B-5869-40A7-BC6A-8130CA4BB987}

-		{03359B45-E43D-44B3-BDE5-8B14D9F0D827} = {03359B45-E43D-44B3-BDE5-8B14D9F0D827}

-		{CEA44545-33C8-4C63-9F8C-85BA48F45637} = {CEA44545-33C8-4C63-9F8C-85BA48F45637}

-		{D8D53F43-41EE-486A-8DBD-956D8CD072E8} = {D8D53F43-41EE-486A-8DBD-956D8CD072E8}

-		{ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF} = {ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF}

-		{9ADAE03A-2060-471E-A7B5-9D8F6995223A} = {9ADAE03A-2060-471E-A7B5-9D8F6995223A}

-		{80892339-F6CE-4E96-B61B-131095F2612D} = {80892339-F6CE-4E96-B61B-131095F2612D}

-		{AACD0537-E8F3-4F0F-A0E6-B99C0F4EF892} = {AACD0537-E8F3-4F0F-A0E6-B99C0F4EF892}

-		{0C5E3F36-3338-4B2C-A956-4D577B6119E7} = {0C5E3F36-3338-4B2C-A956-4D577B6119E7}

-		{27CCFE35-61A5-434F-8B83-9A40AE2AE8C5} = {27CCFE35-61A5-434F-8B83-9A40AE2AE8C5}

-		{E5C9E235-E10F-4F46-A94F-A112CD8D867E} = {E5C9E235-E10F-4F46-A94F-A112CD8D867E}

-		{196F5935-2391-49A7-B6A2-410DF8149F0D} = {196F5935-2391-49A7-B6A2-410DF8149F0D}

-		{69952435-F01F-46A7-B907-A78EBC864ED7} = {69952435-F01F-46A7-B907-A78EBC864ED7}

-		{3EDEB434-F59E-4C50-8884-F0BB29845619} = {3EDEB434-F59E-4C50-8884-F0BB29845619}

-		{AF696934-5004-4C1D-90C3-B434E92AFB89} = {AF696934-5004-4C1D-90C3-B434E92AFB89}

-		{834DD32C-D078-441F-95F4-9CDE108B60AE} = {834DD32C-D078-441F-95F4-9CDE108B60AE}

-		{2248C52C-75DC-465B-A598-6E89CC93E00D} = {2248C52C-75DC-465B-A598-6E89CC93E00D}

-		{AC4C582B-B27D-4E57-A59F-6FF0E833C6E5} = {AC4C582B-B27D-4E57-A59F-6FF0E833C6E5}

-		{802B922A-E813-438E-A180-4A8839A11A55} = {802B922A-E813-438E-A180-4A8839A11A55}

-		{BE1A0022-708E-4CC2-B01C-26BD99AB6576} = {BE1A0022-708E-4CC2-B01C-26BD99AB6576}

-		{7D293021-0601-498B-91B8-C49580EFB08D} = {7D293021-0601-498B-91B8-C49580EFB08D}

-		{794B7E1E-E6AD-456D-9F33-FCE317325EC4} = {794B7E1E-E6AD-456D-9F33-FCE317325EC4}

-		{411D221C-9FA1-417E-8A2B-DF746F4C7E07} = {411D221C-9FA1-417E-8A2B-DF746F4C7E07}

-		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

-		{357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0} = {357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0}

-		{52E83C17-2B68-44B5-881D-4F6338FB14C7} = {52E83C17-2B68-44B5-881D-4F6338FB14C7}

-		{9FCBE814-3818-4F1A-975D-05BAF6FF432F} = {9FCBE814-3818-4F1A-975D-05BAF6FF432F}

-		{B21CA611-6DAE-4051-8B4C-989E135711B1} = {B21CA611-6DAE-4051-8B4C-989E135711B1}

-		{73B78F11-3DCC-4A00-B4A6-E5A8FAE9DD90} = {73B78F11-3DCC-4A00-B4A6-E5A8FAE9DD90}

-		{0D18A50F-52B3-4322-AC0D-F15CD657CEC4} = {0D18A50F-52B3-4322-AC0D-F15CD657CEC4}

-		{89DA820B-7A3B-46FA-AE09-971A739BEEFD} = {89DA820B-7A3B-46FA-AE09-971A739BEEFD}

-		{405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5} = {405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5}

-		{854F7E09-CEB5-44CD-B924-3FFAC7936323} = {854F7E09-CEB5-44CD-B924-3FFAC7936323}

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{364FF608-7969-4ED1-95B2-8592872F8264} = {364FF608-7969-4ED1-95B2-8592872F8264}

-		{E1F98D07-4724-46CB-B327-5677C1C9266D} = {E1F98D07-4724-46CB-B327-5677C1C9266D}

-		{4AC79406-D6E0-43B3-82B0-7A032FABB52A} = {4AC79406-D6E0-43B3-82B0-7A032FABB52A}

-		{6FFCE804-EF4A-468F-A174-561934C153A1} = {6FFCE804-EF4A-468F-A174-561934C153A1}

-		{0A049202-6533-413E-89D6-5D6866AAE703} = {0A049202-6533-413E-89D6-5D6866AAE703}

 		{8C6D9C00-44A9-432F-B695-F56439C1B288} = {8C6D9C00-44A9-432F-B695-F56439C1B288}

+		{0A049202-6533-413E-89D6-5D6866AAE703} = {0A049202-6533-413E-89D6-5D6866AAE703}

+		{6FFCE804-EF4A-468F-A174-561934C153A1} = {6FFCE804-EF4A-468F-A174-561934C153A1}

+		{4AC79406-D6E0-43B3-82B0-7A032FABB52A} = {4AC79406-D6E0-43B3-82B0-7A032FABB52A}

+		{E1F98D07-4724-46CB-B327-5677C1C9266D} = {E1F98D07-4724-46CB-B327-5677C1C9266D}

+		{364FF608-7969-4ED1-95B2-8592872F8264} = {364FF608-7969-4ED1-95B2-8592872F8264}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{854F7E09-CEB5-44CD-B924-3FFAC7936323} = {854F7E09-CEB5-44CD-B924-3FFAC7936323}

+		{405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5} = {405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5}

+		{89DA820B-7A3B-46FA-AE09-971A739BEEFD} = {89DA820B-7A3B-46FA-AE09-971A739BEEFD}

+		{0D18A50F-52B3-4322-AC0D-F15CD657CEC4} = {0D18A50F-52B3-4322-AC0D-F15CD657CEC4}

+		{73B78F11-3DCC-4A00-B4A6-E5A8FAE9DD90} = {73B78F11-3DCC-4A00-B4A6-E5A8FAE9DD90}

+		{B21CA611-6DAE-4051-8B4C-989E135711B1} = {B21CA611-6DAE-4051-8B4C-989E135711B1}

+		{9FCBE814-3818-4F1A-975D-05BAF6FF432F} = {9FCBE814-3818-4F1A-975D-05BAF6FF432F}

+		{52E83C17-2B68-44B5-881D-4F6338FB14C7} = {52E83C17-2B68-44B5-881D-4F6338FB14C7}

+		{357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0} = {357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0}

+		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

+		{411D221C-9FA1-417E-8A2B-DF746F4C7E07} = {411D221C-9FA1-417E-8A2B-DF746F4C7E07}

+		{794B7E1E-E6AD-456D-9F33-FCE317325EC4} = {794B7E1E-E6AD-456D-9F33-FCE317325EC4}

+		{7D293021-0601-498B-91B8-C49580EFB08D} = {7D293021-0601-498B-91B8-C49580EFB08D}

+		{BE1A0022-708E-4CC2-B01C-26BD99AB6576} = {BE1A0022-708E-4CC2-B01C-26BD99AB6576}

+		{802B922A-E813-438E-A180-4A8839A11A55} = {802B922A-E813-438E-A180-4A8839A11A55}

+		{AC4C582B-B27D-4E57-A59F-6FF0E833C6E5} = {AC4C582B-B27D-4E57-A59F-6FF0E833C6E5}

+		{2248C52C-75DC-465B-A598-6E89CC93E00D} = {2248C52C-75DC-465B-A598-6E89CC93E00D}

+		{834DD32C-D078-441F-95F4-9CDE108B60AE} = {834DD32C-D078-441F-95F4-9CDE108B60AE}

+		{AF696934-5004-4C1D-90C3-B434E92AFB89} = {AF696934-5004-4C1D-90C3-B434E92AFB89}

+		{3EDEB434-F59E-4C50-8884-F0BB29845619} = {3EDEB434-F59E-4C50-8884-F0BB29845619}

+		{69952435-F01F-46A7-B907-A78EBC864ED7} = {69952435-F01F-46A7-B907-A78EBC864ED7}

+		{196F5935-2391-49A7-B6A2-410DF8149F0D} = {196F5935-2391-49A7-B6A2-410DF8149F0D}

+		{E5C9E235-E10F-4F46-A94F-A112CD8D867E} = {E5C9E235-E10F-4F46-A94F-A112CD8D867E}

+		{27CCFE35-61A5-434F-8B83-9A40AE2AE8C5} = {27CCFE35-61A5-434F-8B83-9A40AE2AE8C5}

+		{0C5E3F36-3338-4B2C-A956-4D577B6119E7} = {0C5E3F36-3338-4B2C-A956-4D577B6119E7}

+		{AACD0537-E8F3-4F0F-A0E6-B99C0F4EF892} = {AACD0537-E8F3-4F0F-A0E6-B99C0F4EF892}

+		{80892339-F6CE-4E96-B61B-131095F2612D} = {80892339-F6CE-4E96-B61B-131095F2612D}

+		{9ADAE03A-2060-471E-A7B5-9D8F6995223A} = {9ADAE03A-2060-471E-A7B5-9D8F6995223A}

+		{ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF} = {ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF}

+		{D8D53F43-41EE-486A-8DBD-956D8CD072E8} = {D8D53F43-41EE-486A-8DBD-956D8CD072E8}

+		{CEA44545-33C8-4C63-9F8C-85BA48F45637} = {CEA44545-33C8-4C63-9F8C-85BA48F45637}

+		{03359B45-E43D-44B3-BDE5-8B14D9F0D827} = {03359B45-E43D-44B3-BDE5-8B14D9F0D827}

+		{F5109F4B-5869-40A7-BC6A-8130CA4BB987} = {F5109F4B-5869-40A7-BC6A-8130CA4BB987}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

+		{37605955-FA00-41C9-9D39-D078CF270376} = {37605955-FA00-41C9-9D39-D078CF270376}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{57A5C559-F1BD-49F1-9B5E-13591D22FD75} = {57A5C559-F1BD-49F1-9B5E-13591D22FD75}

+		{400D995A-CFC8-4D39-A449-88BE067834F8} = {400D995A-CFC8-4D39-A449-88BE067834F8}

+		{3B4A4A62-FDAC-4219-98BD-80C4FE5D4B2F} = {3B4A4A62-FDAC-4219-98BD-80C4FE5D4B2F}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{5A90FD64-6EED-45E1-A147-D9FE72788570} = {5A90FD64-6EED-45E1-A147-D9FE72788570}

+		{68A52165-E0EF-4019-B658-1AC734649955} = {68A52165-E0EF-4019-B658-1AC734649955}

+		{BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB} = {BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB}

+		{6312B365-AA53-43AA-BD00-848C1323CA8B} = {6312B365-AA53-43AA-BD00-848C1323CA8B}

+		{C4BA3E66-2310-43E7-B30A-ABDCCF44D823} = {C4BA3E66-2310-43E7-B30A-ABDCCF44D823}

+		{AE5D4766-9668-4EB5-B801-5DF8F53363FC} = {AE5D4766-9668-4EB5-B801-5DF8F53363FC}

+		{76858167-F4DB-476C-A2B6-A3069D60D9E2} = {76858167-F4DB-476C-A2B6-A3069D60D9E2}

+		{C325E167-DBC3-4611-8AC8-2A118432E35B} = {C325E167-DBC3-4611-8AC8-2A118432E35B}

+		{CE7C4168-68A6-43B2-BAE7-B2CF857C8F03} = {CE7C4168-68A6-43B2-BAE7-B2CF857C8F03}

+		{7E207F6A-DC28-4DEB-8454-7977092131DC} = {7E207F6A-DC28-4DEB-8454-7977092131DC}

+		{8C97CA6D-2210-4D1F-AEF2-5D56FFBCE767} = {8C97CA6D-2210-4D1F-AEF2-5D56FFBCE767}

+		{4BAFED6D-07B4-465D-8C93-81A1C2EF02E0} = {4BAFED6D-07B4-465D-8C93-81A1C2EF02E0}

+		{C2E6106F-1450-4F62-8D8E-17A93E986B26} = {C2E6106F-1450-4F62-8D8E-17A93E986B26}

+		{0DA16B6F-0156-417A-9093-589D55BB066C} = {0DA16B6F-0156-417A-9093-589D55BB066C}

+		{D1518671-CB9D-471F-8BCE-A03DE67F26B1} = {D1518671-CB9D-471F-8BCE-A03DE67F26B1}

+		{958A5473-0E7C-4FA1-9C2F-AEA0925EF5AD} = {958A5473-0E7C-4FA1-9C2F-AEA0925EF5AD}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{8792D377-8105-4C67-87F1-115E48D0178F} = {8792D377-8105-4C67-87F1-115E48D0178F}

+		{2DCDB978-79B7-4A3A-B24A-D908A49B7D50} = {2DCDB978-79B7-4A3A-B24A-D908A49B7D50}

+		{9AAC897A-70FA-4E5E-BF48-F664C12B05C7} = {9AAC897A-70FA-4E5E-BF48-F664C12B05C7}

+		{E3B02B7C-6CF5-42C5-8AF5-48D2B6D8F94B} = {E3B02B7C-6CF5-42C5-8AF5-48D2B6D8F94B}

+		{CEBB9980-4B77-4105-BFEB-4DCDBB1F5E35} = {CEBB9980-4B77-4105-BFEB-4DCDBB1F5E35}

+		{EBF7C380-5F58-462D-993D-75B53F83FA81} = {EBF7C380-5F58-462D-993D-75B53F83FA81}

+		{71A1C081-FF1C-452B-B938-95551D565302} = {71A1C081-FF1C-452B-B938-95551D565302}

+		{7693B383-C2CB-43FD-A428-598F73D214F7} = {7693B383-C2CB-43FD-A428-598F73D214F7}

+		{E9F8FC85-8508-4FE7-9BB0-C0494A71BA1B} = {E9F8FC85-8508-4FE7-9BB0-C0494A71BA1B}

+		{DFE42486-47A2-487C-81B9-DDCDA9F07BF0} = {DFE42486-47A2-487C-81B9-DDCDA9F07BF0}

+		{A90ADD88-DA1B-4642-A97B-37DF89433858} = {A90ADD88-DA1B-4642-A97B-37DF89433858}

+		{98AE818A-E887-414B-985F-85F8411916C9} = {98AE818A-E887-414B-985F-85F8411916C9}

+		{BE4FFA8B-2988-4888-A9B9-DD108BCBA8A6} = {BE4FFA8B-2988-4888-A9B9-DD108BCBA8A6}

+		{F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF} = {F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF}

+		{8708E58C-F990-4B6C-AD83-745CA9582E92} = {8708E58C-F990-4B6C-AD83-745CA9582E92}

+		{7CF4F18C-3C74-4EBB-AD76-F41575D7A5A0} = {7CF4F18C-3C74-4EBB-AD76-F41575D7A5A0}

+		{D0CEF98C-07B5-4A8A-9153-43FDF6B5F169} = {D0CEF98C-07B5-4A8A-9153-43FDF6B5F169}

+		{FD8B058E-F53A-4197-B75E-849904E5AA79} = {FD8B058E-F53A-4197-B75E-849904E5AA79}

+		{14DB1F8E-0BF6-4E9D-8372-5EA9ED48347F} = {14DB1F8E-0BF6-4E9D-8372-5EA9ED48347F}

+		{EFA04391-B35B-44C0-AB27-1383D4C9E358} = {EFA04391-B35B-44C0-AB27-1383D4C9E358}

+		{9A226D92-9326-4907-A462-25997D5C9427} = {9A226D92-9326-4907-A462-25997D5C9427}

+		{7F1AFE93-97E7-4905-A2CF-5C845D7FDD4F} = {7F1AFE93-97E7-4905-A2CF-5C845D7FDD4F}

+		{34EEE194-B77E-453E-9C59-252C0421188A} = {34EEE194-B77E-453E-9C59-252C0421188A}

+		{0E0F449A-7998-4113-BDD2-A74E0B6D3466} = {0E0F449A-7998-4113-BDD2-A74E0B6D3466}

+		{D15E5D9B-A1A6-4935-889C-D880FD0068CE} = {D15E5D9B-A1A6-4935-889C-D880FD0068CE}

+		{3E41969B-D69B-4235-B192-A94F7853D869} = {3E41969B-D69B-4235-B192-A94F7853D869}

+		{4941199C-EB11-460D-8EF7-9F68293AE202} = {4941199C-EB11-460D-8EF7-9F68293AE202}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{53022A9D-F5B2-407C-9A29-3AC71B3E6DDC} = {53022A9D-F5B2-407C-9A29-3AC71B3E6DDC}

+		{8CE6FF9D-8A14-4A45-971A-18972109AC9D} = {8CE6FF9D-8A14-4A45-971A-18972109AC9D}

+		{AA7A40A2-A837-4557-AB3D-D64980F6F8E4} = {AA7A40A2-A837-4557-AB3D-D64980F6F8E4}

+		{7C30B2A4-A24D-4796-9754-CABBDB46D0F8} = {7C30B2A4-A24D-4796-9754-CABBDB46D0F8}

+		{D1AADCA9-FB5A-4F44-8E11-8232941E2C33} = {D1AADCA9-FB5A-4F44-8E11-8232941E2C33}

+		{E02CDAAC-05F4-436B-B245-2A402FFA131F} = {E02CDAAC-05F4-436B-B245-2A402FFA131F}

+		{EC6B5EAD-D938-4211-A7B1-01C9D2C15160} = {EC6B5EAD-D938-4211-A7B1-01C9D2C15160}

+		{5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30} = {5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30}

+		{265C41B2-30D7-4FF8-A08C-B997363DA763} = {265C41B2-30D7-4FF8-A08C-B997363DA763}

+		{AE50F8BA-5FAC-47CC-A5A0-7F1E55C413E3} = {AE50F8BA-5FAC-47CC-A5A0-7F1E55C413E3}

+		{9A9D7ABC-ED3A-462E-9ED1-CB55F14174F3} = {9A9D7ABC-ED3A-462E-9ED1-CB55F14174F3}

+		{DBA493BD-3AF1-4616-8A80-F6FD41B70392} = {DBA493BD-3AF1-4616-8A80-F6FD41B70392}

+		{4F8B23C1-9832-4C3B-A836-2FBB53F628A0} = {4F8B23C1-9832-4C3B-A836-2FBB53F628A0}

+		{18FBE8C2-CD20-4D99-9E0B-63B408CE4850} = {18FBE8C2-CD20-4D99-9E0B-63B408CE4850}

+		{17DC13C3-78E0-4EF5-B7B1-87EB1A379D2A} = {17DC13C3-78E0-4EF5-B7B1-87EB1A379D2A}

+		{8F4417C5-2F4A-4070-88F9-0AFDB0F8EA14} = {8F4417C5-2F4A-4070-88F9-0AFDB0F8EA14}

+		{9321B2C5-74B3-4743-9D87-B0FDCB47373B} = {9321B2C5-74B3-4743-9D87-B0FDCB47373B}

+		{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05} = {DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}

+		{1C5A9EC8-F882-4A8A-B773-E79CD46369AF} = {1C5A9EC8-F882-4A8A-B773-E79CD46369AF}

+		{009F2CC9-B131-4C51-BCFD-CEBDEFCB32C7} = {009F2CC9-B131-4C51-BCFD-CEBDEFCB32C7}

+		{F4386ECB-D688-4C18-A091-673F1F8A96E7} = {F4386ECB-D688-4C18-A091-673F1F8A96E7}

+		{E81413CC-046C-42B0-B862-0BB81AED2854} = {E81413CC-046C-42B0-B862-0BB81AED2854}

+		{5CC7FFCE-2612-41B6-AF83-C1B61F67949B} = {5CC7FFCE-2612-41B6-AF83-C1B61F67949B}

+		{D10F67D0-8057-49C2-A62A-12D0C512288E} = {D10F67D0-8057-49C2-A62A-12D0C512288E}

+		{B36344D1-122C-4BC6-A292-CC82F74CBB0A} = {B36344D1-122C-4BC6-A292-CC82F74CBB0A}

+		{165195D1-B742-4030-8B12-3FE94B829D45} = {165195D1-B742-4030-8B12-3FE94B829D45}

+		{6410E6D2-EDBF-439D-8C43-1AB0C37AC851} = {6410E6D2-EDBF-439D-8C43-1AB0C37AC851}

+		{4EE91AD5-8332-4FD3-A5E3-BF4C145BB53A} = {4EE91AD5-8332-4FD3-A5E3-BF4C145BB53A}

+		{7ABA5DD5-77E7-42D3-9C29-84A13B0CAA91} = {7ABA5DD5-77E7-42D3-9C29-84A13B0CAA91}

+		{0CB771D6-9CAB-4799-A7B1-5D89E436E6AF} = {0CB771D6-9CAB-4799-A7B1-5D89E436E6AF}

+		{9E588AD8-14BD-4BA3-B4EA-16D1D882C700} = {9E588AD8-14BD-4BA3-B4EA-16D1D882C700}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{40EBF7DB-330C-4F56-AE68-9FC7D75CB5D5} = {40EBF7DB-330C-4F56-AE68-9FC7D75CB5D5}

+		{55894CDC-C220-40FE-B403-D74EAC6EBACF} = {55894CDC-C220-40FE-B403-D74EAC6EBACF}

+		{9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2} = {9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2}

+		{744EA5E0-18C8-4757-82DE-2D0CF11DBDDE} = {744EA5E0-18C8-4757-82DE-2D0CF11DBDDE}

+		{2FC5DAE1-36D6-4783-A0F9-96D0B37687A8} = {2FC5DAE1-36D6-4783-A0F9-96D0B37687A8}

+		{43069CE7-E7CB-4EBF-A6CC-31E7A06D3835} = {43069CE7-E7CB-4EBF-A6CC-31E7A06D3835}

+		{E6A9BFE8-84DE-46C0-A372-72087598018E} = {E6A9BFE8-84DE-46C0-A372-72087598018E}

+		{CAC1F1E8-55D5-4CC6-857E-F01E59FB8098} = {CAC1F1E8-55D5-4CC6-857E-F01E59FB8098}

+		{A26C50E9-D3FB-4490-9CD7-606EB2E77D21} = {A26C50E9-D3FB-4490-9CD7-606EB2E77D21}

+		{1AB767EA-546C-4F72-BC1F-6AA0458512D8} = {1AB767EA-546C-4F72-BC1F-6AA0458512D8}

+		{1B298EEC-0B47-4145-88AA-C6558E0BD993} = {1B298EEC-0B47-4145-88AA-C6558E0BD993}

+		{685666ED-4640-47EE-AEA5-35B9602CA541} = {685666ED-4640-47EE-AEA5-35B9602CA541}

+		{E8896FEE-8601-4AFC-91EA-6F9698574174} = {E8896FEE-8601-4AFC-91EA-6F9698574174}

+		{4E8105F2-56D4-45D6-9017-706F804052E7} = {4E8105F2-56D4-45D6-9017-706F804052E7}

+		{0CB176F2-1FA9-467A-986D-512FAD8144B0} = {0CB176F2-1FA9-467A-986D-512FAD8144B0}

+		{76FFD0F6-3D5F-4826-A3BA-DEE92084FA27} = {76FFD0F6-3D5F-4826-A3BA-DEE92084FA27}

+		{1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4} = {1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4}

+		{3BBA31F8-2679-4655-975D-52FDA5ABD5C4} = {3BBA31F8-2679-4655-975D-52FDA5ABD5C4}

+		{D1FD44F8-8263-4B29-985D-21CE26F45A76} = {D1FD44F8-8263-4B29-985D-21CE26F45A76}

+		{309CE6F8-4658-44CB-8E99-0B86DCA77EFC} = {309CE6F8-4658-44CB-8E99-0B86DCA77EFC}

+		{34C0FDFA-81D6-4652-B841-894BD1A15FB0} = {34C0FDFA-81D6-4652-B841-894BD1A15FB0}

+		{EB5DE4FB-CC65-47BF-9D94-AC96B01B6A33} = {EB5DE4FB-CC65-47BF-9D94-AC96B01B6A33}

+		{BA86B1FE-8CA7-4A96-9FD0-11941F885589} = {BA86B1FE-8CA7-4A96-9FD0-11941F885589}

+		{0A33B4FE-A2C9-4B7F-ACEC-D251308182ED} = {0A33B4FE-A2C9-4B7F-ACEC-D251308182ED}

+		{E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF} = {E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "big", "..\..\test\big\big.vcproj", "{009F2CC9-B131-4C51-BCFD-CEBDEFCB32C7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bigdll", "..\..\test\bigdll\bigdll.vcproj", "{8C97CA6D-2210-4D1F-AEF2-5D56FFBCE767}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "binread", "..\..\tools\testfiles\binread\binread.vcproj", "{BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB}"

@@ -180,38 +181,38 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bittestsdll", "..\..\test\b
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btree2", "..\..\test\btree2\btree2.vcproj", "{8CE6FF9D-8A14-4A45-971A-18972109AC9D}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btree2dll", "..\..\test\btree2dll\btree2dll.vcproj", "{34EEE194-B77E-453E-9C59-252C0421188A}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cache", "..\..\test\cache\cache.vcproj", "{4BAFED6D-07B4-465D-8C93-81A1C2EF02E0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cache_api", "..\..\test\cache_api\cache_api.vcproj", "{4F8B23C1-9832-4C3B-A836-2FBB53F628A0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cache_apidll", "..\..\test\cache_apidll\cache_apidll.vcproj", "{EB5DE4FB-CC65-47BF-9D94-AC96B01B6A33}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cachedll", "..\..\test\cachedll\cachedll.vcproj", "{D0CEF98C-07B5-4A8A-9153-43FDF6B5F169}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk", "..\..\test\chunk\chunk.vcproj", "{57A5C559-F1BD-49F1-9B5E-13591D22FD75}"

@@ -226,270 +227,270 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunkdll", "..\..\test\chun
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmpd_dset", "..\..\test\cmpd_dset\cmpd_dset.vcproj", "{BA86B1FE-8CA7-4A96-9FD0-11941F885589}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmpd_dsetdll", "..\..\test\cmpd_dsetdll\cmpd_dsetdll.vcproj", "{8F4417C5-2F4A-4070-88F9-0AFDB0F8EA14}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_read", "..\..\test\cross_read\cross_read.vcproj", "{68A52165-E0EF-4019-B658-1AC734649955}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_readdll", "..\..\test\cross_readdll\cross_readdll.vcproj", "{E1F98D07-4724-46CB-B327-5677C1C9266D}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dangle", "..\..\test\dangle\dangle.vcproj", "{8C6D9C00-44A9-432F-B695-F56439C1B288}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dangledll", "..\..\test\dangledll\dangledll.vcproj", "{D15E5D9B-A1A6-4935-889C-D880FD0068CE}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsets", "..\..\test\dsets\dsets.vcproj", "{A90ADD88-DA1B-4642-A97B-37DF89433858}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsets_cpp", "..\..\c++\test\dsets_cpp\dsets_cpp.vcproj", "{802B922A-E813-438E-A180-4A8839A11A55}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsets_cppdll", "..\..\c++\test\dsets_cppdll\dsets_cppdll.vcproj", "{76858167-F4DB-476C-A2B6-A3069D60D9E2}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsetsdll", "..\..\test\dsetsdll\dsetsdll.vcproj", "{1B298EEC-0B47-4145-88AA-C6558E0BD993}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dt_arith", "..\..\test\dt_arith\dt_arith.vcproj", "{AE5D4766-9668-4EB5-B801-5DF8F53363FC}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dt_arithdll", "..\..\test\dt_arithdll\dt_arithdll.vcproj", "{3E41969B-D69B-4235-B192-A94F7853D869}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtransform", "..\..\test\dtransform\dtransform.vcproj", "{F5109F4B-5869-40A7-BC6A-8130CA4BB987}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtransformdll", "..\..\test\dtransformdll\dtransformdll.vcproj", "{0E0F449A-7998-4113-BDD2-A74E0B6D3466}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtypes", "..\..\test\dtypes\dtypes.vcproj", "{4AC79406-D6E0-43B3-82B0-7A032FABB52A}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtypesdll", "..\..\test\dtypesdll\dtypesdll.vcproj", "{AE50F8BA-5FAC-47CC-A5A0-7F1E55C413E3}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enum", "..\..\test\enum\enum.vcproj", "{FD8B058E-F53A-4197-B75E-849904E5AA79}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enumdll", "..\..\test\enumdll\enumdll.vcproj", "{D8D53F43-41EE-486A-8DBD-956D8CD072E8}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "error_test", "..\..\test\error_test\error_test.vcproj", "{7ABA5DD5-77E7-42D3-9C29-84A13B0CAA91}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "error_testdll", "..\..\test\error_testdll\error_testdll.vcproj", "{55894CDC-C220-40FE-B403-D74EAC6EBACF}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "err_compat", "..\..\test\err_compat\err_compat.vcproj", "{265C41B2-30D7-4FF8-A08C-B997363DA763}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "err_compatdll", "..\..\test\err_compatdll\err_compatdll.vcproj", "{309CE6F8-4658-44CB-8E99-0B86DCA77EFC}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extend", "..\..\test\extend\extend.vcproj", "{8708E58C-F990-4B6C-AD83-745CA9582E92}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extenddll", "..\..\test\extenddll\extenddll.vcproj", "{76FFD0F6-3D5F-4826-A3BA-DEE92084FA27}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "..\..\test\external\external.vcproj", "{7D293021-0601-498B-91B8-C49580EFB08D}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "externaldll", "..\..\test\externaldll\externaldll.vcproj", "{0CB771D6-9CAB-4799-A7B1-5D89E436E6AF}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fheap", "..\..\test\fheap\fheap.vcproj", "{AACD0537-E8F3-4F0F-A0E6-B99C0F4EF892}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fheapdll", "..\..\test\fheapdll\fheapdll.vcproj", "{CEBB9980-4B77-4105-BFEB-4DCDBB1F5E35}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fillval", "..\..\test\fillval\fillval.vcproj", "{CAC1F1E8-55D5-4CC6-857E-F01E59FB8098}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fillvaldll", "..\..\test\fillvaldll\fillvaldll.vcproj", "{0CB176F2-1FA9-467A-986D-512FAD8144B0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush1", "..\..\test\flush1\flush1.vcproj", "{364FF608-7969-4ED1-95B2-8592872F8264}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush1dll", "..\..\test\flush1dll\flush1dll.vcproj", "{B36344D1-122C-4BC6-A292-CC82F74CBB0A}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush2", "..\..\test\flush2\flush2.vcproj", "{E9F8FC85-8508-4FE7-9BB0-C0494A71BA1B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush2dll", "..\..\test\flush2dll\flush2dll.vcproj", "{F4386ECB-D688-4C18-A091-673F1F8A96E7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getname", "..\..\test\getname\getname.vcproj", "{B21CA611-6DAE-4051-8B4C-989E135711B1}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getnamedll", "..\..\test\getnamedll\getnamedll.vcproj", "{80892339-F6CE-4E96-B61B-131095F2612D}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getub", "..\..\test\getub\getub.vcproj", "{2FC5DAE1-36D6-4783-A0F9-96D0B37687A8}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gheap", "..\..\test\gheap\gheap.vcproj", "{9FCBE814-3818-4F1A-975D-05BAF6FF432F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gheapdll", "..\..\test\gheapdll\gheapdll.vcproj", "{0DA16B6F-0156-417A-9093-589D55BB066C}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gif2h5", "..\..\hl\tools\gifconv\gif2h5.vcproj", "{7C30B2A4-A24D-4796-9754-CABBDB46D0F8}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gif2h5dll", "..\..\hl\tools\gifconvdll\gif2h5dll.vcproj", "{C325E167-DBC3-4611-8AC8-2A118432E35B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h52gif", "..\..\hl\tools\gifconv\h52gif.vcproj", "{AA7A40A2-A837-4557-AB3D-D64980F6F8E4}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h52gifdll", "..\..\hl\tools\gifconvdll\h52gifdll.vcproj", "{834DD32C-D078-441F-95F4-9CDE108B60AE}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5copy", "..\..\tools\h5copy\h5copy.vcproj", "{69952435-F01F-46A7-B907-A78EBC864ED7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5debug", "..\..\tools\h5debug\h5debug.vcproj", "{BE1A0022-708E-4CC2-B01C-26BD99AB6576}"

@@ -504,14 +505,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5debugdll", "..\..\tools\h
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5diff", "..\..\tools\h5diff\h5diff.vcproj", "{1C5A9EC8-F882-4A8A-B773-E79CD46369AF}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5diffdll", "..\..\tools\h5diffdll\h5diffdll.vcproj", "{EC6B5EAD-D938-4211-A7B1-01C9D2C15160}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5difftst", "..\..\tools\TESTFILES\h5difftst\h5difftst.vcproj", "{1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4}"

@@ -521,32 +522,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5difftst", "..\..\tools\TE
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5dump", "..\..\tools\h5dump\h5dump.vcproj", "{9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5dumpdll", "..\..\tools\h5dumpdll\h5dumpdll.vcproj", "{7E207F6A-DC28-4DEB-8454-7977092131DC}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5dumptst", "..\..\tools\testfiles\h5dumptst\h5dumptst.vcproj", "{0A33B4FE-A2C9-4B7F-ACEC-D251308182ED}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5import", "..\..\tools\h5import\h5import.vcproj", "{9E588AD8-14BD-4BA3-B4EA-16D1D882C700}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5importdll", "..\..\tools\h5importdll\h5importdll.vcproj", "{2DCDB978-79B7-4A3A-B24A-D908A49B7D50}"

 	ProjectSection(ProjectDependencies) = postProject

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5importtst", "..\..\tools\TESTFILES\h5importtst\h5importtst.vcproj", "{AF696934-5004-4C1D-90C3-B434E92AFB89}"

@@ -556,8 +557,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5importtst", "..\..\tools\
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5jam", "..\..\tools\h5jam\h5jam.vcproj", "{196F5935-2391-49A7-B6A2-410DF8149F0D}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5jamtst", "..\..\tools\TESTFILES\h5jamtst\h5jamtst.vcproj", "{E8896FEE-8601-4AFC-91EA-6F9698574174}"

@@ -567,39 +568,39 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5jamtst", "..\..\tools\TES
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5ls", "..\..\tools\h5ls\h5ls.vcproj", "{357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5lsdll", "..\..\tools\h5lsdll\h5lsdll.vcproj", "{18FBE8C2-CD20-4D99-9E0B-63B408CE4850}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5mkgrp", "..\..\tools\h5mkgrp\h5mkgrp.vcproj", "{ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repack", "..\..\tools\h5repack\h5repack.vcproj", "{411D221C-9FA1-417E-8A2B-DF746F4C7E07}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repackdll", "..\..\tools\h5repackdll\h5repackdll.vcproj", "{854F7E09-CEB5-44CD-B924-3FFAC7936323}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repacktst", "..\..\tools\testfiles\h5repacktst\h5repacktst.vcproj", "{AC4C582B-B27D-4E57-A59F-6FF0E833C6E5}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repart", "..\..\tools\h5repart\h5repart.vcproj", "{F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF}"

@@ -624,20 +625,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5reparttst", "..\..\tools\
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5stat", "..\..\tools\h5stat\h5stat.vcproj", "{405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5statdll", "..\..\tools\h5statdll\h5statdll.vcproj", "{165195D1-B742-4030-8B12-3FE94B829D45}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5unjam", "..\..\tools\h5unjam\h5unjam.vcproj", "{52E83C17-2B68-44B5-881D-4F6338FB14C7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "..\hdf5\hdf5.vcproj", "{26346A09-C500-49E7-963A-D22A8E09AAB7}"

@@ -656,14 +657,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_cppdll", "..\hdf5_cppd
 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl", "..\hdf5_hl\hdf5_hl.vcproj", "{9A124450-EC54-4813-B0B1-2CA96B695009}"

-	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl_cpp", "..\hdf5_hl_cpp\hdf5_hl_cpp.vcproj", "{7693B383-C2CB-43FD-A428-598F73D214F7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

 		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl_cppdll", "..\hdf5_hl_cppdll\hdf5_hl_cppdll.vcproj", "{3EDEB434-F59E-4C50-8884-F0BB29845619}"

@@ -683,85 +681,85 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5dll", "..\hdf5dll\hdf5d
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_ds", "..\..\hl\test\hl_test_ds\hl_test_ds.vcproj", "{6410E6D2-EDBF-439D-8C43-1AB0C37AC851}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_dsdll", "..\..\hl\test\hl_test_dsdll\hl_test_dsdll.vcproj", "{3B4A4A62-FDAC-4219-98BD-80C4FE5D4B2F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_image", "..\..\hl\test\hl_test_image\hl_test_image.vcproj", "{03359B45-E43D-44B3-BDE5-8B14D9F0D827}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_imagedll", "..\..\hl\test\hl_test_imagedll\hl_test_imagedll.vcproj", "{9A226D92-9326-4907-A462-25997D5C9427}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_lite", "..\..\hl\test\hl_test_lite\hl_test_lite.vcproj", "{6FFCE804-EF4A-468F-A174-561934C153A1}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_litedll", "..\..\hl\test\hl_test_litedll\hl_test_litedll.vcproj", "{98AE818A-E887-414B-985F-85F8411916C9}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_packet", "..\..\hl\test\hl_test_packet\hl_test_packet.vcproj", "{5CC7FFCE-2612-41B6-AF83-C1B61F67949B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_packetdll", "..\..\hl\test\hl_test_packetdll\hl_test_packetdll.vcproj", "{E3B02B7C-6CF5-42C5-8AF5-48D2B6D8F94B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_table", "..\..\hl\test\hl_test_table\hl_test_table.vcproj", "{43069CE7-E7CB-4EBF-A6CC-31E7A06D3835}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_table_cpp", "..\..\hl\c++\test\hl_test_table_cpp\hl_test_table_cpp.vcproj", "{6312B365-AA53-43AA-BD00-848C1323CA8B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{7693B383-C2CB-43FD-A428-598F73D214F7} = {7693B383-C2CB-43FD-A428-598F73D214F7}

 		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

+		{7693B383-C2CB-43FD-A428-598F73D214F7} = {7693B383-C2CB-43FD-A428-598F73D214F7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_table_cppdll", "..\..\hl\c++\test\hl_test_table_cppdll\hl_test_table_cppdll.vcproj", "{0D18A50F-52B3-4322-AC0D-F15CD657CEC4}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

-		{3EDEB434-F59E-4C50-8884-F0BB29845619} = {3EDEB434-F59E-4C50-8884-F0BB29845619}

 		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

+		{3EDEB434-F59E-4C50-8884-F0BB29845619} = {3EDEB434-F59E-4C50-8884-F0BB29845619}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_tabledll", "..\..\hl\test\hl_test_tabledll\hl_test_tabledll.vcproj", "{D1AADCA9-FB5A-4F44-8E11-8232941E2C33}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hyperslab", "..\..\test\hyperslab\hyperslab.vcproj", "{1AB767EA-546C-4F72-BC1F-6AA0458512D8}"

@@ -786,26 +784,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iopipedll", "..\..\test\iop
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "istore", "..\..\test\istore\istore.vcproj", "{C4BA3E66-2310-43E7-B30A-ABDCCF44D823}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "istoredll", "..\..\test\istoredll\istoredll.vcproj", "{BE4FFA8B-2988-4888-A9B9-DD108BCBA8A6}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lheap", "..\..\test\lheap\lheap.vcproj", "{5A90FD64-6EED-45E1-A147-D9FE72788570}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lheapdll", "..\..\test\lheapdll\lheapdll.vcproj", "{E02CDAAC-05F4-436B-B245-2A402FFA131F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtest", "..\..\test\libtest\libtest.vcproj", "{A80D439C-37B4-4619-A122-1C69F567733B}"

@@ -820,74 +818,79 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtestdll", "..\..\test\li
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "links", "..\..\test\links\links.vcproj", "{8792D377-8105-4C67-87F1-115E48D0178F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linksdll", "..\..\test\linksdll\linksdll.vcproj", "{27CCFE35-61A5-434F-8B83-9A40AE2AE8C5}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mount", "..\..\test\mount\mount.vcproj", "{4EE91AD5-8332-4FD3-A5E3-BF4C145BB53A}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mountdll", "..\..\test\mountdll\mountdll.vcproj", "{CE7C4168-68A6-43B2-BAE7-B2CF857C8F03}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mtime", "..\..\test\mtime\mtime.vcproj", "{40EBF7DB-330C-4F56-AE68-9FC7D75CB5D5}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mtimedll", "..\..\test\mtimedll\mtimedll.vcproj", "{7F1AFE93-97E7-4905-A2CF-5C845D7FDD4F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntypes", "..\..\test\ntypes\ntypes.vcproj", "{0A049202-6533-413E-89D6-5D6866AAE703}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntypesdll", "..\..\test\ntypesdll\ntypesdll.vcproj", "{9AAC897A-70FA-4E5E-BF48-F664C12B05C7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "objcopy", "..\..\test\objcopy\objcopy.vcproj", "{34C0FDFA-81D6-4652-B841-894BD1A15FB0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "objcopydll", "..\..\test\objcopydll\objcopydll.vcproj", "{794B7E1E-E6AD-456D-9F33-FCE317325EC4}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdr", "..\..\test\ohdr\ohdr.vcproj", "{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}"

 	ProjectSection(ProjectDependencies) = postProject

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdr_gentst", "..\..\test\ohdr_gentst\ohdr_gentst.vcproj", "{400D995A-CFC8-4D39-A449-88BE067834F8}"

+	ProjectSection(ProjectDependencies) = postProject

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdrdll", "..\..\test\ohdrdll\ohdrdll.vcproj", "{37605955-FA00-41C9-9D39-D078CF270376}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "overhead", "..\..\test\overhead\overhead.vcproj", "{9A9D7ABC-ED3A-462E-9ED1-CB55F14174F3}"

@@ -902,104 +905,104 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "overheaddll", "..\..\test\o
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pool", "..\..\test\pool\pool.vcproj", "{9ADAE03A-2060-471E-A7B5-9D8F6995223A}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pooldll", "..\..\test\pooldll\pooldll.vcproj", "{DFE42486-47A2-487C-81B9-DDCDA9F07BF0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reserved", "..\..\test\reserved\reserved.vcproj", "{2248C52C-75DC-465B-A598-6E89CC93E00D}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reserveddll", "..\..\test\reserveddll\reserveddll.vcproj", "{C2E6106F-1450-4F62-8D8E-17A93E986B26}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "set_extent", "..\..\test\set_extent\set_extent.vcproj", "{E81413CC-046C-42B0-B862-0BB81AED2854}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "set_extentdll", "..\..\test\set_extentdll\set_extentdll.vcproj", "{14DB1F8E-0BF6-4E9D-8372-5EA9ED48347F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stab", "..\..\test\stab\stab.vcproj", "{17DC13C3-78E0-4EF5-B7B1-87EB1A379D2A}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stabdll", "..\..\test\stabdll\stabdll.vcproj", "{7CF4F18C-3C74-4EBB-AD76-F41575D7A5A0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "talign", "..\..\tools\talign\talign.vcproj", "{E6A9BFE8-84DE-46C0-A372-72087598018E}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "taligndll", "..\..\tools\taligndll\taligndll.vcproj", "{3BBA31F8-2679-4655-975D-52FDA5ABD5C4}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tellub", "..\..\test\tellub\tellub.vcproj", "{A26C50E9-D3FB-4490-9CD7-606EB2E77D21}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testh5repack_detect_szip", "..\..\tools\TESTFILES\testh5repack_detect_szip\testh5repack_detect_szip.vcproj", "{5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testh5repack_detect_szipdll", "..\..\tools\TESTFILES\testh5repack_detect_szipdll\testh5repack_detect_szipdll.vcproj", "{E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhdf5", "..\..\test\testhdf5\testhdf5.vcproj", "{D1518671-CB9D-471F-8BCE-A03DE67F26B1}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhdf5_cpp", "..\..\c++\test\testhdf5_cpp\testhdf5_cpp.vcproj", "{EFA04391-B35B-44C0-AB27-1383D4C9E358}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhdf5_cppdll", "..\..\c++\test\testhdf5_cppdll\testhdf5_cppdll.vcproj", "{DBA493BD-3AF1-4616-8A80-F6FD41B70392}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhdf5dll", "..\..\test\testhdf5dll\testhdf5dll.vcproj", "{D1FD44F8-8263-4B29-985D-21CE26F45A76}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolslib", "..\..\tools\toolslib\toolslib.vcproj", "{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}"

@@ -1008,48 +1011,36 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolslibdll", "..\..\tools\
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttsafedll", "..\..\test\ttsafedll\ttsafedll.vcproj", "{DDDFC0AC-2ECB-4930-9C83-788AC7C1343E}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unlink", "..\..\test\unlink\unlink.vcproj", "{9321B2C5-74B3-4743-9D87-B0FDCB47373B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unlinkdll", "..\..\test\unlinkdll\unlinkdll.vcproj", "{685666ED-4640-47EE-AEA5-35B9602CA541}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfd", "..\..\test\vfd\vfd.vcproj", "{744EA5E0-18C8-4757-82DE-2D0CF11DBDDE}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfddll", "..\..\test\vfddll\vfddll.vcproj", "{0C5E3F36-3338-4B2C-A956-4D577B6119E7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5tinit", "..\..\misc\typegen\h5tinit\h5tinit.vcproj", "{B123D196-2F43-4FEB-80B5-990F06DED319}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk_info", "..\..\test\chunk_info\chunk_info.vcproj", "{E3B24219-DEB9-4ECB-809C-AD98EE51974E}"

-	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk_infodll", "..\..\test\chunk_infodll\chunk_infodll.vcproj", "{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}"

-	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

-	EndProjectSection

-EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -2058,6 +2049,14 @@ Global
 		{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}.Release|Win32.Build.0 = Release|Win32

 		{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}.Release|x64.ActiveCfg = Release|x64

 		{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}.Release|x64.Build.0 = Release|x64

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Debug|Win32.ActiveCfg = Debug|Win32

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Debug|Win32.Build.0 = Debug|Win32

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Debug|x64.ActiveCfg = Debug|x64

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Debug|x64.Build.0 = Debug|x64

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Release|Win32.ActiveCfg = Release|Win32

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Release|Win32.Build.0 = Release|Win32

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Release|x64.ActiveCfg = Release|x64

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Release|x64.Build.0 = Release|x64

 		{37605955-FA00-41C9-9D39-D078CF270376}.Debug|Win32.ActiveCfg = Debug|Win32

 		{37605955-FA00-41C9-9D39-D078CF270376}.Debug|Win32.Build.0 = Debug|Win32

 		{37605955-FA00-41C9-9D39-D078CF270376}.Debug|x64.ActiveCfg = Debug|x64

@@ -2278,22 +2277,6 @@ Global
 		{B123D196-2F43-4FEB-80B5-990F06DED319}.Release|Win32.Build.0 = Release|Win32

 		{B123D196-2F43-4FEB-80B5-990F06DED319}.Release|x64.ActiveCfg = Release|x64

 		{B123D196-2F43-4FEB-80B5-990F06DED319}.Release|x64.Build.0 = Release|x64

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Debug|Win32.Build.0 = Debug|Win32

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Debug|x64.ActiveCfg = Debug|x64

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Debug|x64.Build.0 = Debug|x64

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Release|Win32.ActiveCfg = Release|Win32

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Release|Win32.Build.0 = Release|Win32

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Release|x64.ActiveCfg = Release|x64

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Release|x64.Build.0 = Release|x64

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Debug|Win32.Build.0 = Debug|Win32

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Debug|x64.ActiveCfg = Debug|x64

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Debug|x64.Build.0 = Debug|x64

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Release|Win32.ActiveCfg = Release|Win32

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Release|Win32.Build.0 = Release|Win32

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Release|x64.ActiveCfg = Release|x64

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/windows/proj/all_fortran/all_fortran.sln b/windows/proj/all_fortran/all_fortran.sln
index 0393e5d..cad93fe 100644
--- a/windows/proj/all_fortran/all_fortran.sln
+++ b/windows/proj/all_fortran/all_fortran.sln
@@ -2,192 +2,193 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all_fortran", "all_fortran.vcproj", "{24E5C6DF-1FA4-49AD-AE75-1D9347966CC5}"

 	ProjectSection(ProjectDependencies) = postProject

-		{8C6D9C00-44A9-432F-B695-F56439C1B288} = {8C6D9C00-44A9-432F-B695-F56439C1B288}

-		{0A049202-6533-413E-89D6-5D6866AAE703} = {0A049202-6533-413E-89D6-5D6866AAE703}

-		{6FFCE804-EF4A-468F-A174-561934C153A1} = {6FFCE804-EF4A-468F-A174-561934C153A1}

-		{4AC79406-D6E0-43B3-82B0-7A032FABB52A} = {4AC79406-D6E0-43B3-82B0-7A032FABB52A}

-		{E1F98D07-4724-46CB-B327-5677C1C9266D} = {E1F98D07-4724-46CB-B327-5677C1C9266D}

-		{364FF608-7969-4ED1-95B2-8592872F8264} = {364FF608-7969-4ED1-95B2-8592872F8264}

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{854F7E09-CEB5-44CD-B924-3FFAC7936323} = {854F7E09-CEB5-44CD-B924-3FFAC7936323}

-		{405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5} = {405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5}

-		{89DA820B-7A3B-46FA-AE09-971A739BEEFD} = {89DA820B-7A3B-46FA-AE09-971A739BEEFD}

-		{0D18A50F-52B3-4322-AC0D-F15CD657CEC4} = {0D18A50F-52B3-4322-AC0D-F15CD657CEC4}

-		{73B78F11-3DCC-4A00-B4A6-E5A8FAE9DD90} = {73B78F11-3DCC-4A00-B4A6-E5A8FAE9DD90}

-		{B21CA611-6DAE-4051-8B4C-989E135711B1} = {B21CA611-6DAE-4051-8B4C-989E135711B1}

-		{F04E2D13-2096-4C67-AA4C-63C9015474B1} = {F04E2D13-2096-4C67-AA4C-63C9015474B1}

-		{9FCBE814-3818-4F1A-975D-05BAF6FF432F} = {9FCBE814-3818-4F1A-975D-05BAF6FF432F}

-		{52E83C17-2B68-44B5-881D-4F6338FB14C7} = {52E83C17-2B68-44B5-881D-4F6338FB14C7}

-		{DB6C7D17-28B1-4E5A-A61E-C53FEB545937} = {DB6C7D17-28B1-4E5A-A61E-C53FEB545937}

-		{357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0} = {357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0}

-		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

-		{411D221C-9FA1-417E-8A2B-DF746F4C7E07} = {411D221C-9FA1-417E-8A2B-DF746F4C7E07}

-		{794B7E1E-E6AD-456D-9F33-FCE317325EC4} = {794B7E1E-E6AD-456D-9F33-FCE317325EC4}

-		{7D293021-0601-498B-91B8-C49580EFB08D} = {7D293021-0601-498B-91B8-C49580EFB08D}

-		{BE1A0022-708E-4CC2-B01C-26BD99AB6576} = {BE1A0022-708E-4CC2-B01C-26BD99AB6576}

-		{01DA0D22-D220-4ACE-9EB0-EA3906098C0A} = {01DA0D22-D220-4ACE-9EB0-EA3906098C0A}

-		{802B922A-E813-438E-A180-4A8839A11A55} = {802B922A-E813-438E-A180-4A8839A11A55}

-		{AC4C582B-B27D-4E57-A59F-6FF0E833C6E5} = {AC4C582B-B27D-4E57-A59F-6FF0E833C6E5}

-		{2248C52C-75DC-465B-A598-6E89CC93E00D} = {2248C52C-75DC-465B-A598-6E89CC93E00D}

-		{834DD32C-D078-441F-95F4-9CDE108B60AE} = {834DD32C-D078-441F-95F4-9CDE108B60AE}

-		{AF696934-5004-4C1D-90C3-B434E92AFB89} = {AF696934-5004-4C1D-90C3-B434E92AFB89}

-		{3EDEB434-F59E-4C50-8884-F0BB29845619} = {3EDEB434-F59E-4C50-8884-F0BB29845619}

-		{69952435-F01F-46A7-B907-A78EBC864ED7} = {69952435-F01F-46A7-B907-A78EBC864ED7}

-		{196F5935-2391-49A7-B6A2-410DF8149F0D} = {196F5935-2391-49A7-B6A2-410DF8149F0D}

-		{E5C9E235-E10F-4F46-A94F-A112CD8D867E} = {E5C9E235-E10F-4F46-A94F-A112CD8D867E}

-		{27CCFE35-61A5-434F-8B83-9A40AE2AE8C5} = {27CCFE35-61A5-434F-8B83-9A40AE2AE8C5}

-		{0C5E3F36-3338-4B2C-A956-4D577B6119E7} = {0C5E3F36-3338-4B2C-A956-4D577B6119E7}

-		{AACD0537-E8F3-4F0F-A0E6-B99C0F4EF892} = {AACD0537-E8F3-4F0F-A0E6-B99C0F4EF892}

-		{80892339-F6CE-4E96-B61B-131095F2612D} = {80892339-F6CE-4E96-B61B-131095F2612D}

-		{9ADAE03A-2060-471E-A7B5-9D8F6995223A} = {9ADAE03A-2060-471E-A7B5-9D8F6995223A}

-		{ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF} = {ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF}

-		{D8D53F43-41EE-486A-8DBD-956D8CD072E8} = {D8D53F43-41EE-486A-8DBD-956D8CD072E8}

-		{CEA44545-33C8-4C63-9F8C-85BA48F45637} = {CEA44545-33C8-4C63-9F8C-85BA48F45637}

-		{03359B45-E43D-44B3-BDE5-8B14D9F0D827} = {03359B45-E43D-44B3-BDE5-8B14D9F0D827}

-		{F5109F4B-5869-40A7-BC6A-8130CA4BB987} = {F5109F4B-5869-40A7-BC6A-8130CA4BB987}

-		{71C6994C-3102-4A2A-B0AE-88A590CB36CE} = {71C6994C-3102-4A2A-B0AE-88A590CB36CE}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

-		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

-		{37605955-FA00-41C9-9D39-D078CF270376} = {37605955-FA00-41C9-9D39-D078CF270376}

-		{5E617A56-25B2-41E8-8D69-109600819716} = {5E617A56-25B2-41E8-8D69-109600819716}

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

-		{57A5C559-F1BD-49F1-9B5E-13591D22FD75} = {57A5C559-F1BD-49F1-9B5E-13591D22FD75}

-		{84571A5E-D9A6-4672-9F86-3F8E32C93FDF} = {84571A5E-D9A6-4672-9F86-3F8E32C93FDF}

-		{3B4A4A62-FDAC-4219-98BD-80C4FE5D4B2F} = {3B4A4A62-FDAC-4219-98BD-80C4FE5D4B2F}

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

-		{5A90FD64-6EED-45E1-A147-D9FE72788570} = {5A90FD64-6EED-45E1-A147-D9FE72788570}

-		{68A52165-E0EF-4019-B658-1AC734649955} = {68A52165-E0EF-4019-B658-1AC734649955}

-		{BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB} = {BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB}

-		{6312B365-AA53-43AA-BD00-848C1323CA8B} = {6312B365-AA53-43AA-BD00-848C1323CA8B}

-		{C4BA3E66-2310-43E7-B30A-ABDCCF44D823} = {C4BA3E66-2310-43E7-B30A-ABDCCF44D823}

-		{AE5D4766-9668-4EB5-B801-5DF8F53363FC} = {AE5D4766-9668-4EB5-B801-5DF8F53363FC}

-		{F9428466-5FA2-47C9-BB02-288EDE7016A4} = {F9428466-5FA2-47C9-BB02-288EDE7016A4}

-		{76858167-F4DB-476C-A2B6-A3069D60D9E2} = {76858167-F4DB-476C-A2B6-A3069D60D9E2}

-		{C325E167-DBC3-4611-8AC8-2A118432E35B} = {C325E167-DBC3-4611-8AC8-2A118432E35B}

-		{CE7C4168-68A6-43B2-BAE7-B2CF857C8F03} = {CE7C4168-68A6-43B2-BAE7-B2CF857C8F03}

-		{7E207F6A-DC28-4DEB-8454-7977092131DC} = {7E207F6A-DC28-4DEB-8454-7977092131DC}

-		{8C97CA6D-2210-4D1F-AEF2-5D56FFBCE767} = {8C97CA6D-2210-4D1F-AEF2-5D56FFBCE767}

-		{4BAFED6D-07B4-465D-8C93-81A1C2EF02E0} = {4BAFED6D-07B4-465D-8C93-81A1C2EF02E0}

-		{C865016E-1FE1-4FD7-959D-62E795206E76} = {C865016E-1FE1-4FD7-959D-62E795206E76}

-		{C2E6106F-1450-4F62-8D8E-17A93E986B26} = {C2E6106F-1450-4F62-8D8E-17A93E986B26}

-		{0DA16B6F-0156-417A-9093-589D55BB066C} = {0DA16B6F-0156-417A-9093-589D55BB066C}

-		{6923D270-FB9F-4F40-8268-9C542ADABD88} = {6923D270-FB9F-4F40-8268-9C542ADABD88}

-		{487B4E71-1CB9-49A1-920C-1F505D8B76F8} = {487B4E71-1CB9-49A1-920C-1F505D8B76F8}

-		{D1518671-CB9D-471F-8BCE-A03DE67F26B1} = {D1518671-CB9D-471F-8BCE-A03DE67F26B1}

-		{958A5473-0E7C-4FA1-9C2F-AEA0925EF5AD} = {958A5473-0E7C-4FA1-9C2F-AEA0925EF5AD}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

-		{F445FB75-3390-47BE-8179-6A9222A9ACD8} = {F445FB75-3390-47BE-8179-6A9222A9ACD8}

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

-		{8792D377-8105-4C67-87F1-115E48D0178F} = {8792D377-8105-4C67-87F1-115E48D0178F}

-		{2DCDB978-79B7-4A3A-B24A-D908A49B7D50} = {2DCDB978-79B7-4A3A-B24A-D908A49B7D50}

-		{9AAC897A-70FA-4E5E-BF48-F664C12B05C7} = {9AAC897A-70FA-4E5E-BF48-F664C12B05C7}

-		{E3B02B7C-6CF5-42C5-8AF5-48D2B6D8F94B} = {E3B02B7C-6CF5-42C5-8AF5-48D2B6D8F94B}

-		{CEBB9980-4B77-4105-BFEB-4DCDBB1F5E35} = {CEBB9980-4B77-4105-BFEB-4DCDBB1F5E35}

-		{EBF7C380-5F58-462D-993D-75B53F83FA81} = {EBF7C380-5F58-462D-993D-75B53F83FA81}

-		{71A1C081-FF1C-452B-B938-95551D565302} = {71A1C081-FF1C-452B-B938-95551D565302}

-		{7693B383-C2CB-43FD-A428-598F73D214F7} = {7693B383-C2CB-43FD-A428-598F73D214F7}

-		{C8202A85-1F3A-4B34-869C-B1E8CA829299} = {C8202A85-1F3A-4B34-869C-B1E8CA829299}

-		{E9F8FC85-8508-4FE7-9BB0-C0494A71BA1B} = {E9F8FC85-8508-4FE7-9BB0-C0494A71BA1B}

-		{DFE42486-47A2-487C-81B9-DDCDA9F07BF0} = {DFE42486-47A2-487C-81B9-DDCDA9F07BF0}

-		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

-		{A90ADD88-DA1B-4642-A97B-37DF89433858} = {A90ADD88-DA1B-4642-A97B-37DF89433858}

-		{98AE818A-E887-414B-985F-85F8411916C9} = {98AE818A-E887-414B-985F-85F8411916C9}

-		{BE4FFA8B-2988-4888-A9B9-DD108BCBA8A6} = {BE4FFA8B-2988-4888-A9B9-DD108BCBA8A6}

-		{F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF} = {F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF}

-		{8708E58C-F990-4B6C-AD83-745CA9582E92} = {8708E58C-F990-4B6C-AD83-745CA9582E92}

-		{7CF4F18C-3C74-4EBB-AD76-F41575D7A5A0} = {7CF4F18C-3C74-4EBB-AD76-F41575D7A5A0}

-		{D0CEF98C-07B5-4A8A-9153-43FDF6B5F169} = {D0CEF98C-07B5-4A8A-9153-43FDF6B5F169}

-		{2B93688D-D766-4295-ABFA-003CF905F8D8} = {2B93688D-D766-4295-ABFA-003CF905F8D8}

-		{FD8B058E-F53A-4197-B75E-849904E5AA79} = {FD8B058E-F53A-4197-B75E-849904E5AA79}

-		{14DB1F8E-0BF6-4E9D-8372-5EA9ED48347F} = {14DB1F8E-0BF6-4E9D-8372-5EA9ED48347F}

-		{EFA04391-B35B-44C0-AB27-1383D4C9E358} = {EFA04391-B35B-44C0-AB27-1383D4C9E358}

-		{9A226D92-9326-4907-A462-25997D5C9427} = {9A226D92-9326-4907-A462-25997D5C9427}

-		{7F1AFE93-97E7-4905-A2CF-5C845D7FDD4F} = {7F1AFE93-97E7-4905-A2CF-5C845D7FDD4F}

-		{34EEE194-B77E-453E-9C59-252C0421188A} = {34EEE194-B77E-453E-9C59-252C0421188A}

-		{0E0F449A-7998-4113-BDD2-A74E0B6D3466} = {0E0F449A-7998-4113-BDD2-A74E0B6D3466}

-		{D15E5D9B-A1A6-4935-889C-D880FD0068CE} = {D15E5D9B-A1A6-4935-889C-D880FD0068CE}

-		{3E41969B-D69B-4235-B192-A94F7853D869} = {3E41969B-D69B-4235-B192-A94F7853D869}

-		{4941199C-EB11-460D-8EF7-9F68293AE202} = {4941199C-EB11-460D-8EF7-9F68293AE202}

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

-		{53022A9D-F5B2-407C-9A29-3AC71B3E6DDC} = {53022A9D-F5B2-407C-9A29-3AC71B3E6DDC}

-		{8CE6FF9D-8A14-4A45-971A-18972109AC9D} = {8CE6FF9D-8A14-4A45-971A-18972109AC9D}

-		{AA7A40A2-A837-4557-AB3D-D64980F6F8E4} = {AA7A40A2-A837-4557-AB3D-D64980F6F8E4}

-		{7C30B2A4-A24D-4796-9754-CABBDB46D0F8} = {7C30B2A4-A24D-4796-9754-CABBDB46D0F8}

-		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

-		{D1AADCA9-FB5A-4F44-8E11-8232941E2C33} = {D1AADCA9-FB5A-4F44-8E11-8232941E2C33}

-		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

-		{E02CDAAC-05F4-436B-B245-2A402FFA131F} = {E02CDAAC-05F4-436B-B245-2A402FFA131F}

-		{EC6B5EAD-D938-4211-A7B1-01C9D2C15160} = {EC6B5EAD-D938-4211-A7B1-01C9D2C15160}

-		{5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30} = {5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30}

-		{265C41B2-30D7-4FF8-A08C-B997363DA763} = {265C41B2-30D7-4FF8-A08C-B997363DA763}

-		{1C2FF3B6-639A-4047-90DE-327B82BF3ACB} = {1C2FF3B6-639A-4047-90DE-327B82BF3ACB}

-		{AE50F8BA-5FAC-47CC-A5A0-7F1E55C413E3} = {AE50F8BA-5FAC-47CC-A5A0-7F1E55C413E3}

-		{9A9D7ABC-ED3A-462E-9ED1-CB55F14174F3} = {9A9D7ABC-ED3A-462E-9ED1-CB55F14174F3}

-		{DBA493BD-3AF1-4616-8A80-F6FD41B70392} = {DBA493BD-3AF1-4616-8A80-F6FD41B70392}

-		{4F8B23C1-9832-4C3B-A836-2FBB53F628A0} = {4F8B23C1-9832-4C3B-A836-2FBB53F628A0}

-		{A4C4D9C2-DFB5-4A09-8C6D-968113C58247} = {A4C4D9C2-DFB5-4A09-8C6D-968113C58247}

-		{18FBE8C2-CD20-4D99-9E0B-63B408CE4850} = {18FBE8C2-CD20-4D99-9E0B-63B408CE4850}

-		{17DC13C3-78E0-4EF5-B7B1-87EB1A379D2A} = {17DC13C3-78E0-4EF5-B7B1-87EB1A379D2A}

-		{8F4417C5-2F4A-4070-88F9-0AFDB0F8EA14} = {8F4417C5-2F4A-4070-88F9-0AFDB0F8EA14}

-		{9321B2C5-74B3-4743-9D87-B0FDCB47373B} = {9321B2C5-74B3-4743-9D87-B0FDCB47373B}

-		{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05} = {DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}

-		{1C5A9EC8-F882-4A8A-B773-E79CD46369AF} = {1C5A9EC8-F882-4A8A-B773-E79CD46369AF}

-		{009F2CC9-B131-4C51-BCFD-CEBDEFCB32C7} = {009F2CC9-B131-4C51-BCFD-CEBDEFCB32C7}

-		{F4386ECB-D688-4C18-A091-673F1F8A96E7} = {F4386ECB-D688-4C18-A091-673F1F8A96E7}

-		{3F8103CC-1DB2-4C23-9ABC-430434244D40} = {3F8103CC-1DB2-4C23-9ABC-430434244D40}

-		{E81413CC-046C-42B0-B862-0BB81AED2854} = {E81413CC-046C-42B0-B862-0BB81AED2854}

-		{8D4599CD-B4B1-4ABB-9AB0-45002AAFEA7E} = {8D4599CD-B4B1-4ABB-9AB0-45002AAFEA7E}

-		{5CC7FFCE-2612-41B6-AF83-C1B61F67949B} = {5CC7FFCE-2612-41B6-AF83-C1B61F67949B}

-		{D10F67D0-8057-49C2-A62A-12D0C512288E} = {D10F67D0-8057-49C2-A62A-12D0C512288E}

-		{B36344D1-122C-4BC6-A292-CC82F74CBB0A} = {B36344D1-122C-4BC6-A292-CC82F74CBB0A}

-		{165195D1-B742-4030-8B12-3FE94B829D45} = {165195D1-B742-4030-8B12-3FE94B829D45}

-		{6410E6D2-EDBF-439D-8C43-1AB0C37AC851} = {6410E6D2-EDBF-439D-8C43-1AB0C37AC851}

-		{4EE91AD5-8332-4FD3-A5E3-BF4C145BB53A} = {4EE91AD5-8332-4FD3-A5E3-BF4C145BB53A}

-		{7ABA5DD5-77E7-42D3-9C29-84A13B0CAA91} = {7ABA5DD5-77E7-42D3-9C29-84A13B0CAA91}

-		{0CB771D6-9CAB-4799-A7B1-5D89E436E6AF} = {0CB771D6-9CAB-4799-A7B1-5D89E436E6AF}

-		{9E588AD8-14BD-4BA3-B4EA-16D1D882C700} = {9E588AD8-14BD-4BA3-B4EA-16D1D882C700}

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

-		{40EBF7DB-330C-4F56-AE68-9FC7D75CB5D5} = {40EBF7DB-330C-4F56-AE68-9FC7D75CB5D5}

-		{55894CDC-C220-40FE-B403-D74EAC6EBACF} = {55894CDC-C220-40FE-B403-D74EAC6EBACF}

-		{9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2} = {9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2}

-		{744EA5E0-18C8-4757-82DE-2D0CF11DBDDE} = {744EA5E0-18C8-4757-82DE-2D0CF11DBDDE}

-		{8659AEE0-2C9A-4666-B70F-C2B8280FD909} = {8659AEE0-2C9A-4666-B70F-C2B8280FD909}

-		{2FC5DAE1-36D6-4783-A0F9-96D0B37687A8} = {2FC5DAE1-36D6-4783-A0F9-96D0B37687A8}

-		{1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C} = {1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C}

-		{43069CE7-E7CB-4EBF-A6CC-31E7A06D3835} = {43069CE7-E7CB-4EBF-A6CC-31E7A06D3835}

-		{E6A9BFE8-84DE-46C0-A372-72087598018E} = {E6A9BFE8-84DE-46C0-A372-72087598018E}

-		{CAC1F1E8-55D5-4CC6-857E-F01E59FB8098} = {CAC1F1E8-55D5-4CC6-857E-F01E59FB8098}

-		{A26C50E9-D3FB-4490-9CD7-606EB2E77D21} = {A26C50E9-D3FB-4490-9CD7-606EB2E77D21}

-		{CF055FEA-4433-439A-9688-BFD73D260706} = {CF055FEA-4433-439A-9688-BFD73D260706}

-		{1AB767EA-546C-4F72-BC1F-6AA0458512D8} = {1AB767EA-546C-4F72-BC1F-6AA0458512D8}

-		{1B298EEC-0B47-4145-88AA-C6558E0BD993} = {1B298EEC-0B47-4145-88AA-C6558E0BD993}

-		{685666ED-4640-47EE-AEA5-35B9602CA541} = {685666ED-4640-47EE-AEA5-35B9602CA541}

-		{E8896FEE-8601-4AFC-91EA-6F9698574174} = {E8896FEE-8601-4AFC-91EA-6F9698574174}

-		{4E8105F2-56D4-45D6-9017-706F804052E7} = {4E8105F2-56D4-45D6-9017-706F804052E7}

-		{0CB176F2-1FA9-467A-986D-512FAD8144B0} = {0CB176F2-1FA9-467A-986D-512FAD8144B0}

-		{76FFD0F6-3D5F-4826-A3BA-DEE92084FA27} = {76FFD0F6-3D5F-4826-A3BA-DEE92084FA27}

-		{1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4} = {1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4}

-		{3BBA31F8-2679-4655-975D-52FDA5ABD5C4} = {3BBA31F8-2679-4655-975D-52FDA5ABD5C4}

-		{D1FD44F8-8263-4B29-985D-21CE26F45A76} = {D1FD44F8-8263-4B29-985D-21CE26F45A76}

-		{309CE6F8-4658-44CB-8E99-0B86DCA77EFC} = {309CE6F8-4658-44CB-8E99-0B86DCA77EFC}

-		{34C0FDFA-81D6-4652-B841-894BD1A15FB0} = {34C0FDFA-81D6-4652-B841-894BD1A15FB0}

-		{EB5DE4FB-CC65-47BF-9D94-AC96B01B6A33} = {EB5DE4FB-CC65-47BF-9D94-AC96B01B6A33}

-		{BA86B1FE-8CA7-4A96-9FD0-11941F885589} = {BA86B1FE-8CA7-4A96-9FD0-11941F885589}

-		{0A33B4FE-A2C9-4B7F-ACEC-D251308182ED} = {0A33B4FE-A2C9-4B7F-ACEC-D251308182ED}

-		{E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF} = {E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF}

 		{3F645EFF-3A91-4CF3-9B60-76E0C33686A7} = {3F645EFF-3A91-4CF3-9B60-76E0C33686A7}

+		{E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF} = {E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF}

+		{0A33B4FE-A2C9-4B7F-ACEC-D251308182ED} = {0A33B4FE-A2C9-4B7F-ACEC-D251308182ED}

+		{BA86B1FE-8CA7-4A96-9FD0-11941F885589} = {BA86B1FE-8CA7-4A96-9FD0-11941F885589}

+		{EB5DE4FB-CC65-47BF-9D94-AC96B01B6A33} = {EB5DE4FB-CC65-47BF-9D94-AC96B01B6A33}

+		{34C0FDFA-81D6-4652-B841-894BD1A15FB0} = {34C0FDFA-81D6-4652-B841-894BD1A15FB0}

+		{309CE6F8-4658-44CB-8E99-0B86DCA77EFC} = {309CE6F8-4658-44CB-8E99-0B86DCA77EFC}

+		{D1FD44F8-8263-4B29-985D-21CE26F45A76} = {D1FD44F8-8263-4B29-985D-21CE26F45A76}

+		{3BBA31F8-2679-4655-975D-52FDA5ABD5C4} = {3BBA31F8-2679-4655-975D-52FDA5ABD5C4}

+		{1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4} = {1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4}

+		{76FFD0F6-3D5F-4826-A3BA-DEE92084FA27} = {76FFD0F6-3D5F-4826-A3BA-DEE92084FA27}

+		{0CB176F2-1FA9-467A-986D-512FAD8144B0} = {0CB176F2-1FA9-467A-986D-512FAD8144B0}

+		{4E8105F2-56D4-45D6-9017-706F804052E7} = {4E8105F2-56D4-45D6-9017-706F804052E7}

+		{E8896FEE-8601-4AFC-91EA-6F9698574174} = {E8896FEE-8601-4AFC-91EA-6F9698574174}

+		{685666ED-4640-47EE-AEA5-35B9602CA541} = {685666ED-4640-47EE-AEA5-35B9602CA541}

+		{1B298EEC-0B47-4145-88AA-C6558E0BD993} = {1B298EEC-0B47-4145-88AA-C6558E0BD993}

+		{1AB767EA-546C-4F72-BC1F-6AA0458512D8} = {1AB767EA-546C-4F72-BC1F-6AA0458512D8}

+		{CF055FEA-4433-439A-9688-BFD73D260706} = {CF055FEA-4433-439A-9688-BFD73D260706}

+		{A26C50E9-D3FB-4490-9CD7-606EB2E77D21} = {A26C50E9-D3FB-4490-9CD7-606EB2E77D21}

+		{CAC1F1E8-55D5-4CC6-857E-F01E59FB8098} = {CAC1F1E8-55D5-4CC6-857E-F01E59FB8098}

+		{E6A9BFE8-84DE-46C0-A372-72087598018E} = {E6A9BFE8-84DE-46C0-A372-72087598018E}

+		{43069CE7-E7CB-4EBF-A6CC-31E7A06D3835} = {43069CE7-E7CB-4EBF-A6CC-31E7A06D3835}

+		{1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C} = {1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C}

+		{2FC5DAE1-36D6-4783-A0F9-96D0B37687A8} = {2FC5DAE1-36D6-4783-A0F9-96D0B37687A8}

+		{8659AEE0-2C9A-4666-B70F-C2B8280FD909} = {8659AEE0-2C9A-4666-B70F-C2B8280FD909}

+		{744EA5E0-18C8-4757-82DE-2D0CF11DBDDE} = {744EA5E0-18C8-4757-82DE-2D0CF11DBDDE}

+		{9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2} = {9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2}

+		{55894CDC-C220-40FE-B403-D74EAC6EBACF} = {55894CDC-C220-40FE-B403-D74EAC6EBACF}

+		{40EBF7DB-330C-4F56-AE68-9FC7D75CB5D5} = {40EBF7DB-330C-4F56-AE68-9FC7D75CB5D5}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{9E588AD8-14BD-4BA3-B4EA-16D1D882C700} = {9E588AD8-14BD-4BA3-B4EA-16D1D882C700}

+		{0CB771D6-9CAB-4799-A7B1-5D89E436E6AF} = {0CB771D6-9CAB-4799-A7B1-5D89E436E6AF}

+		{7ABA5DD5-77E7-42D3-9C29-84A13B0CAA91} = {7ABA5DD5-77E7-42D3-9C29-84A13B0CAA91}

+		{4EE91AD5-8332-4FD3-A5E3-BF4C145BB53A} = {4EE91AD5-8332-4FD3-A5E3-BF4C145BB53A}

+		{6410E6D2-EDBF-439D-8C43-1AB0C37AC851} = {6410E6D2-EDBF-439D-8C43-1AB0C37AC851}

+		{165195D1-B742-4030-8B12-3FE94B829D45} = {165195D1-B742-4030-8B12-3FE94B829D45}

+		{B36344D1-122C-4BC6-A292-CC82F74CBB0A} = {B36344D1-122C-4BC6-A292-CC82F74CBB0A}

+		{D10F67D0-8057-49C2-A62A-12D0C512288E} = {D10F67D0-8057-49C2-A62A-12D0C512288E}

+		{5CC7FFCE-2612-41B6-AF83-C1B61F67949B} = {5CC7FFCE-2612-41B6-AF83-C1B61F67949B}

+		{8D4599CD-B4B1-4ABB-9AB0-45002AAFEA7E} = {8D4599CD-B4B1-4ABB-9AB0-45002AAFEA7E}

+		{E81413CC-046C-42B0-B862-0BB81AED2854} = {E81413CC-046C-42B0-B862-0BB81AED2854}

+		{3F8103CC-1DB2-4C23-9ABC-430434244D40} = {3F8103CC-1DB2-4C23-9ABC-430434244D40}

+		{F4386ECB-D688-4C18-A091-673F1F8A96E7} = {F4386ECB-D688-4C18-A091-673F1F8A96E7}

+		{009F2CC9-B131-4C51-BCFD-CEBDEFCB32C7} = {009F2CC9-B131-4C51-BCFD-CEBDEFCB32C7}

+		{1C5A9EC8-F882-4A8A-B773-E79CD46369AF} = {1C5A9EC8-F882-4A8A-B773-E79CD46369AF}

+		{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05} = {DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}

+		{9321B2C5-74B3-4743-9D87-B0FDCB47373B} = {9321B2C5-74B3-4743-9D87-B0FDCB47373B}

+		{8F4417C5-2F4A-4070-88F9-0AFDB0F8EA14} = {8F4417C5-2F4A-4070-88F9-0AFDB0F8EA14}

+		{17DC13C3-78E0-4EF5-B7B1-87EB1A379D2A} = {17DC13C3-78E0-4EF5-B7B1-87EB1A379D2A}

+		{18FBE8C2-CD20-4D99-9E0B-63B408CE4850} = {18FBE8C2-CD20-4D99-9E0B-63B408CE4850}

+		{A4C4D9C2-DFB5-4A09-8C6D-968113C58247} = {A4C4D9C2-DFB5-4A09-8C6D-968113C58247}

+		{4F8B23C1-9832-4C3B-A836-2FBB53F628A0} = {4F8B23C1-9832-4C3B-A836-2FBB53F628A0}

+		{DBA493BD-3AF1-4616-8A80-F6FD41B70392} = {DBA493BD-3AF1-4616-8A80-F6FD41B70392}

+		{9A9D7ABC-ED3A-462E-9ED1-CB55F14174F3} = {9A9D7ABC-ED3A-462E-9ED1-CB55F14174F3}

+		{AE50F8BA-5FAC-47CC-A5A0-7F1E55C413E3} = {AE50F8BA-5FAC-47CC-A5A0-7F1E55C413E3}

+		{1C2FF3B6-639A-4047-90DE-327B82BF3ACB} = {1C2FF3B6-639A-4047-90DE-327B82BF3ACB}

+		{265C41B2-30D7-4FF8-A08C-B997363DA763} = {265C41B2-30D7-4FF8-A08C-B997363DA763}

+		{5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30} = {5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30}

+		{EC6B5EAD-D938-4211-A7B1-01C9D2C15160} = {EC6B5EAD-D938-4211-A7B1-01C9D2C15160}

+		{E02CDAAC-05F4-436B-B245-2A402FFA131F} = {E02CDAAC-05F4-436B-B245-2A402FFA131F}

+		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

+		{D1AADCA9-FB5A-4F44-8E11-8232941E2C33} = {D1AADCA9-FB5A-4F44-8E11-8232941E2C33}

+		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

+		{7C30B2A4-A24D-4796-9754-CABBDB46D0F8} = {7C30B2A4-A24D-4796-9754-CABBDB46D0F8}

+		{AA7A40A2-A837-4557-AB3D-D64980F6F8E4} = {AA7A40A2-A837-4557-AB3D-D64980F6F8E4}

+		{8CE6FF9D-8A14-4A45-971A-18972109AC9D} = {8CE6FF9D-8A14-4A45-971A-18972109AC9D}

+		{53022A9D-F5B2-407C-9A29-3AC71B3E6DDC} = {53022A9D-F5B2-407C-9A29-3AC71B3E6DDC}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{4941199C-EB11-460D-8EF7-9F68293AE202} = {4941199C-EB11-460D-8EF7-9F68293AE202}

+		{3E41969B-D69B-4235-B192-A94F7853D869} = {3E41969B-D69B-4235-B192-A94F7853D869}

+		{D15E5D9B-A1A6-4935-889C-D880FD0068CE} = {D15E5D9B-A1A6-4935-889C-D880FD0068CE}

+		{0E0F449A-7998-4113-BDD2-A74E0B6D3466} = {0E0F449A-7998-4113-BDD2-A74E0B6D3466}

+		{34EEE194-B77E-453E-9C59-252C0421188A} = {34EEE194-B77E-453E-9C59-252C0421188A}

+		{7F1AFE93-97E7-4905-A2CF-5C845D7FDD4F} = {7F1AFE93-97E7-4905-A2CF-5C845D7FDD4F}

+		{9A226D92-9326-4907-A462-25997D5C9427} = {9A226D92-9326-4907-A462-25997D5C9427}

+		{EFA04391-B35B-44C0-AB27-1383D4C9E358} = {EFA04391-B35B-44C0-AB27-1383D4C9E358}

+		{14DB1F8E-0BF6-4E9D-8372-5EA9ED48347F} = {14DB1F8E-0BF6-4E9D-8372-5EA9ED48347F}

+		{FD8B058E-F53A-4197-B75E-849904E5AA79} = {FD8B058E-F53A-4197-B75E-849904E5AA79}

+		{2B93688D-D766-4295-ABFA-003CF905F8D8} = {2B93688D-D766-4295-ABFA-003CF905F8D8}

+		{D0CEF98C-07B5-4A8A-9153-43FDF6B5F169} = {D0CEF98C-07B5-4A8A-9153-43FDF6B5F169}

+		{7CF4F18C-3C74-4EBB-AD76-F41575D7A5A0} = {7CF4F18C-3C74-4EBB-AD76-F41575D7A5A0}

+		{8708E58C-F990-4B6C-AD83-745CA9582E92} = {8708E58C-F990-4B6C-AD83-745CA9582E92}

+		{F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF} = {F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF}

+		{BE4FFA8B-2988-4888-A9B9-DD108BCBA8A6} = {BE4FFA8B-2988-4888-A9B9-DD108BCBA8A6}

+		{98AE818A-E887-414B-985F-85F8411916C9} = {98AE818A-E887-414B-985F-85F8411916C9}

+		{A90ADD88-DA1B-4642-A97B-37DF89433858} = {A90ADD88-DA1B-4642-A97B-37DF89433858}

+		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

+		{DFE42486-47A2-487C-81B9-DDCDA9F07BF0} = {DFE42486-47A2-487C-81B9-DDCDA9F07BF0}

+		{E9F8FC85-8508-4FE7-9BB0-C0494A71BA1B} = {E9F8FC85-8508-4FE7-9BB0-C0494A71BA1B}

+		{C8202A85-1F3A-4B34-869C-B1E8CA829299} = {C8202A85-1F3A-4B34-869C-B1E8CA829299}

+		{7693B383-C2CB-43FD-A428-598F73D214F7} = {7693B383-C2CB-43FD-A428-598F73D214F7}

+		{71A1C081-FF1C-452B-B938-95551D565302} = {71A1C081-FF1C-452B-B938-95551D565302}

+		{EBF7C380-5F58-462D-993D-75B53F83FA81} = {EBF7C380-5F58-462D-993D-75B53F83FA81}

+		{CEBB9980-4B77-4105-BFEB-4DCDBB1F5E35} = {CEBB9980-4B77-4105-BFEB-4DCDBB1F5E35}

+		{E3B02B7C-6CF5-42C5-8AF5-48D2B6D8F94B} = {E3B02B7C-6CF5-42C5-8AF5-48D2B6D8F94B}

+		{9AAC897A-70FA-4E5E-BF48-F664C12B05C7} = {9AAC897A-70FA-4E5E-BF48-F664C12B05C7}

+		{2DCDB978-79B7-4A3A-B24A-D908A49B7D50} = {2DCDB978-79B7-4A3A-B24A-D908A49B7D50}

+		{8792D377-8105-4C67-87F1-115E48D0178F} = {8792D377-8105-4C67-87F1-115E48D0178F}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{F445FB75-3390-47BE-8179-6A9222A9ACD8} = {F445FB75-3390-47BE-8179-6A9222A9ACD8}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{958A5473-0E7C-4FA1-9C2F-AEA0925EF5AD} = {958A5473-0E7C-4FA1-9C2F-AEA0925EF5AD}

+		{D1518671-CB9D-471F-8BCE-A03DE67F26B1} = {D1518671-CB9D-471F-8BCE-A03DE67F26B1}

+		{487B4E71-1CB9-49A1-920C-1F505D8B76F8} = {487B4E71-1CB9-49A1-920C-1F505D8B76F8}

+		{6923D270-FB9F-4F40-8268-9C542ADABD88} = {6923D270-FB9F-4F40-8268-9C542ADABD88}

+		{0DA16B6F-0156-417A-9093-589D55BB066C} = {0DA16B6F-0156-417A-9093-589D55BB066C}

+		{C2E6106F-1450-4F62-8D8E-17A93E986B26} = {C2E6106F-1450-4F62-8D8E-17A93E986B26}

+		{C865016E-1FE1-4FD7-959D-62E795206E76} = {C865016E-1FE1-4FD7-959D-62E795206E76}

+		{4BAFED6D-07B4-465D-8C93-81A1C2EF02E0} = {4BAFED6D-07B4-465D-8C93-81A1C2EF02E0}

+		{8C97CA6D-2210-4D1F-AEF2-5D56FFBCE767} = {8C97CA6D-2210-4D1F-AEF2-5D56FFBCE767}

+		{7E207F6A-DC28-4DEB-8454-7977092131DC} = {7E207F6A-DC28-4DEB-8454-7977092131DC}

+		{CE7C4168-68A6-43B2-BAE7-B2CF857C8F03} = {CE7C4168-68A6-43B2-BAE7-B2CF857C8F03}

+		{C325E167-DBC3-4611-8AC8-2A118432E35B} = {C325E167-DBC3-4611-8AC8-2A118432E35B}

+		{76858167-F4DB-476C-A2B6-A3069D60D9E2} = {76858167-F4DB-476C-A2B6-A3069D60D9E2}

+		{F9428466-5FA2-47C9-BB02-288EDE7016A4} = {F9428466-5FA2-47C9-BB02-288EDE7016A4}

+		{AE5D4766-9668-4EB5-B801-5DF8F53363FC} = {AE5D4766-9668-4EB5-B801-5DF8F53363FC}

+		{C4BA3E66-2310-43E7-B30A-ABDCCF44D823} = {C4BA3E66-2310-43E7-B30A-ABDCCF44D823}

+		{6312B365-AA53-43AA-BD00-848C1323CA8B} = {6312B365-AA53-43AA-BD00-848C1323CA8B}

+		{BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB} = {BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB}

+		{68A52165-E0EF-4019-B658-1AC734649955} = {68A52165-E0EF-4019-B658-1AC734649955}

+		{5A90FD64-6EED-45E1-A147-D9FE72788570} = {5A90FD64-6EED-45E1-A147-D9FE72788570}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{3B4A4A62-FDAC-4219-98BD-80C4FE5D4B2F} = {3B4A4A62-FDAC-4219-98BD-80C4FE5D4B2F}

+		{84571A5E-D9A6-4672-9F86-3F8E32C93FDF} = {84571A5E-D9A6-4672-9F86-3F8E32C93FDF}

+		{400D995A-CFC8-4D39-A449-88BE067834F8} = {400D995A-CFC8-4D39-A449-88BE067834F8}

+		{57A5C559-F1BD-49F1-9B5E-13591D22FD75} = {57A5C559-F1BD-49F1-9B5E-13591D22FD75}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{5E617A56-25B2-41E8-8D69-109600819716} = {5E617A56-25B2-41E8-8D69-109600819716}

+		{37605955-FA00-41C9-9D39-D078CF270376} = {37605955-FA00-41C9-9D39-D078CF270376}

+		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{71C6994C-3102-4A2A-B0AE-88A590CB36CE} = {71C6994C-3102-4A2A-B0AE-88A590CB36CE}

+		{F5109F4B-5869-40A7-BC6A-8130CA4BB987} = {F5109F4B-5869-40A7-BC6A-8130CA4BB987}

+		{03359B45-E43D-44B3-BDE5-8B14D9F0D827} = {03359B45-E43D-44B3-BDE5-8B14D9F0D827}

+		{CEA44545-33C8-4C63-9F8C-85BA48F45637} = {CEA44545-33C8-4C63-9F8C-85BA48F45637}

+		{D8D53F43-41EE-486A-8DBD-956D8CD072E8} = {D8D53F43-41EE-486A-8DBD-956D8CD072E8}

+		{ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF} = {ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF}

+		{9ADAE03A-2060-471E-A7B5-9D8F6995223A} = {9ADAE03A-2060-471E-A7B5-9D8F6995223A}

+		{80892339-F6CE-4E96-B61B-131095F2612D} = {80892339-F6CE-4E96-B61B-131095F2612D}

+		{AACD0537-E8F3-4F0F-A0E6-B99C0F4EF892} = {AACD0537-E8F3-4F0F-A0E6-B99C0F4EF892}

+		{0C5E3F36-3338-4B2C-A956-4D577B6119E7} = {0C5E3F36-3338-4B2C-A956-4D577B6119E7}

+		{27CCFE35-61A5-434F-8B83-9A40AE2AE8C5} = {27CCFE35-61A5-434F-8B83-9A40AE2AE8C5}

+		{E5C9E235-E10F-4F46-A94F-A112CD8D867E} = {E5C9E235-E10F-4F46-A94F-A112CD8D867E}

+		{196F5935-2391-49A7-B6A2-410DF8149F0D} = {196F5935-2391-49A7-B6A2-410DF8149F0D}

+		{69952435-F01F-46A7-B907-A78EBC864ED7} = {69952435-F01F-46A7-B907-A78EBC864ED7}

+		{3EDEB434-F59E-4C50-8884-F0BB29845619} = {3EDEB434-F59E-4C50-8884-F0BB29845619}

+		{AF696934-5004-4C1D-90C3-B434E92AFB89} = {AF696934-5004-4C1D-90C3-B434E92AFB89}

+		{834DD32C-D078-441F-95F4-9CDE108B60AE} = {834DD32C-D078-441F-95F4-9CDE108B60AE}

+		{2248C52C-75DC-465B-A598-6E89CC93E00D} = {2248C52C-75DC-465B-A598-6E89CC93E00D}

+		{AC4C582B-B27D-4E57-A59F-6FF0E833C6E5} = {AC4C582B-B27D-4E57-A59F-6FF0E833C6E5}

+		{802B922A-E813-438E-A180-4A8839A11A55} = {802B922A-E813-438E-A180-4A8839A11A55}

+		{01DA0D22-D220-4ACE-9EB0-EA3906098C0A} = {01DA0D22-D220-4ACE-9EB0-EA3906098C0A}

+		{BE1A0022-708E-4CC2-B01C-26BD99AB6576} = {BE1A0022-708E-4CC2-B01C-26BD99AB6576}

+		{7D293021-0601-498B-91B8-C49580EFB08D} = {7D293021-0601-498B-91B8-C49580EFB08D}

+		{794B7E1E-E6AD-456D-9F33-FCE317325EC4} = {794B7E1E-E6AD-456D-9F33-FCE317325EC4}

+		{411D221C-9FA1-417E-8A2B-DF746F4C7E07} = {411D221C-9FA1-417E-8A2B-DF746F4C7E07}

+		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

+		{357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0} = {357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0}

+		{DB6C7D17-28B1-4E5A-A61E-C53FEB545937} = {DB6C7D17-28B1-4E5A-A61E-C53FEB545937}

+		{52E83C17-2B68-44B5-881D-4F6338FB14C7} = {52E83C17-2B68-44B5-881D-4F6338FB14C7}

+		{9FCBE814-3818-4F1A-975D-05BAF6FF432F} = {9FCBE814-3818-4F1A-975D-05BAF6FF432F}

+		{F04E2D13-2096-4C67-AA4C-63C9015474B1} = {F04E2D13-2096-4C67-AA4C-63C9015474B1}

+		{B21CA611-6DAE-4051-8B4C-989E135711B1} = {B21CA611-6DAE-4051-8B4C-989E135711B1}

+		{73B78F11-3DCC-4A00-B4A6-E5A8FAE9DD90} = {73B78F11-3DCC-4A00-B4A6-E5A8FAE9DD90}

+		{0D18A50F-52B3-4322-AC0D-F15CD657CEC4} = {0D18A50F-52B3-4322-AC0D-F15CD657CEC4}

+		{89DA820B-7A3B-46FA-AE09-971A739BEEFD} = {89DA820B-7A3B-46FA-AE09-971A739BEEFD}

+		{405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5} = {405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5}

+		{854F7E09-CEB5-44CD-B924-3FFAC7936323} = {854F7E09-CEB5-44CD-B924-3FFAC7936323}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{364FF608-7969-4ED1-95B2-8592872F8264} = {364FF608-7969-4ED1-95B2-8592872F8264}

+		{E1F98D07-4724-46CB-B327-5677C1C9266D} = {E1F98D07-4724-46CB-B327-5677C1C9266D}

+		{4AC79406-D6E0-43B3-82B0-7A032FABB52A} = {4AC79406-D6E0-43B3-82B0-7A032FABB52A}

+		{6FFCE804-EF4A-468F-A174-561934C153A1} = {6FFCE804-EF4A-468F-A174-561934C153A1}

+		{0A049202-6533-413E-89D6-5D6866AAE703} = {0A049202-6533-413E-89D6-5D6866AAE703}

+		{8C6D9C00-44A9-432F-B695-F56439C1B288} = {8C6D9C00-44A9-432F-B695-F56439C1B288}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "big", "..\..\test\big\big.vcproj", "{009F2CC9-B131-4C51-BCFD-CEBDEFCB32C7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bigdll", "..\..\test\bigdll\bigdll.vcproj", "{8C97CA6D-2210-4D1F-AEF2-5D56FFBCE767}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "binread", "..\..\tools\testfiles\binread\binread.vcproj", "{BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB}"

@@ -204,38 +205,38 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bittestsdll", "..\..\test\b
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btree2", "..\..\test\btree2\btree2.vcproj", "{8CE6FF9D-8A14-4A45-971A-18972109AC9D}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btree2dll", "..\..\test\btree2dll\btree2dll.vcproj", "{34EEE194-B77E-453E-9C59-252C0421188A}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cache", "..\..\test\cache\cache.vcproj", "{4BAFED6D-07B4-465D-8C93-81A1C2EF02E0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cache_api", "..\..\test\cache_api\cache_api.vcproj", "{4F8B23C1-9832-4C3B-A836-2FBB53F628A0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cache_apidll", "..\..\test\cache_apidll\cache_apidll.vcproj", "{EB5DE4FB-CC65-47BF-9D94-AC96B01B6A33}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cachedll", "..\..\test\cachedll\cachedll.vcproj", "{D0CEF98C-07B5-4A8A-9153-43FDF6B5F169}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk", "..\..\test\chunk\chunk.vcproj", "{57A5C559-F1BD-49F1-9B5E-13591D22FD75}"

@@ -250,270 +251,270 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunkdll", "..\..\test\chun
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmpd_dset", "..\..\test\cmpd_dset\cmpd_dset.vcproj", "{BA86B1FE-8CA7-4A96-9FD0-11941F885589}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmpd_dsetdll", "..\..\test\cmpd_dsetdll\cmpd_dsetdll.vcproj", "{8F4417C5-2F4A-4070-88F9-0AFDB0F8EA14}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_read", "..\..\test\cross_read\cross_read.vcproj", "{68A52165-E0EF-4019-B658-1AC734649955}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_readdll", "..\..\test\cross_readdll\cross_readdll.vcproj", "{E1F98D07-4724-46CB-B327-5677C1C9266D}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dangle", "..\..\test\dangle\dangle.vcproj", "{8C6D9C00-44A9-432F-B695-F56439C1B288}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dangledll", "..\..\test\dangledll\dangledll.vcproj", "{D15E5D9B-A1A6-4935-889C-D880FD0068CE}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsets", "..\..\test\dsets\dsets.vcproj", "{A90ADD88-DA1B-4642-A97B-37DF89433858}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsets_cpp", "..\..\c++\test\dsets_cpp\dsets_cpp.vcproj", "{802B922A-E813-438E-A180-4A8839A11A55}"

 	ProjectSection(ProjectDependencies) = postProject

-		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsets_cppdll", "..\..\c++\test\dsets_cppdll\dsets_cppdll.vcproj", "{76858167-F4DB-476C-A2B6-A3069D60D9E2}"

 	ProjectSection(ProjectDependencies) = postProject

-		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsetsdll", "..\..\test\dsetsdll\dsetsdll.vcproj", "{1B298EEC-0B47-4145-88AA-C6558E0BD993}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dt_arith", "..\..\test\dt_arith\dt_arith.vcproj", "{AE5D4766-9668-4EB5-B801-5DF8F53363FC}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dt_arithdll", "..\..\test\dt_arithdll\dt_arithdll.vcproj", "{3E41969B-D69B-4235-B192-A94F7853D869}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtransform", "..\..\test\dtransform\dtransform.vcproj", "{F5109F4B-5869-40A7-BC6A-8130CA4BB987}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtransformdll", "..\..\test\dtransformdll\dtransformdll.vcproj", "{0E0F449A-7998-4113-BDD2-A74E0B6D3466}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtypes", "..\..\test\dtypes\dtypes.vcproj", "{4AC79406-D6E0-43B3-82B0-7A032FABB52A}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtypesdll", "..\..\test\dtypesdll\dtypesdll.vcproj", "{AE50F8BA-5FAC-47CC-A5A0-7F1E55C413E3}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enum", "..\..\test\enum\enum.vcproj", "{FD8B058E-F53A-4197-B75E-849904E5AA79}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enumdll", "..\..\test\enumdll\enumdll.vcproj", "{D8D53F43-41EE-486A-8DBD-956D8CD072E8}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "error_test", "..\..\test\error_test\error_test.vcproj", "{7ABA5DD5-77E7-42D3-9C29-84A13B0CAA91}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "error_testdll", "..\..\test\error_testdll\error_testdll.vcproj", "{55894CDC-C220-40FE-B403-D74EAC6EBACF}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "err_compat", "..\..\test\err_compat\err_compat.vcproj", "{265C41B2-30D7-4FF8-A08C-B997363DA763}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "err_compatdll", "..\..\test\err_compatdll\err_compatdll.vcproj", "{309CE6F8-4658-44CB-8E99-0B86DCA77EFC}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extend", "..\..\test\extend\extend.vcproj", "{8708E58C-F990-4B6C-AD83-745CA9582E92}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extenddll", "..\..\test\extenddll\extenddll.vcproj", "{76FFD0F6-3D5F-4826-A3BA-DEE92084FA27}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "..\..\test\external\external.vcproj", "{7D293021-0601-498B-91B8-C49580EFB08D}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "externaldll", "..\..\test\externaldll\externaldll.vcproj", "{0CB771D6-9CAB-4799-A7B1-5D89E436E6AF}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fheap", "..\..\test\fheap\fheap.vcproj", "{AACD0537-E8F3-4F0F-A0E6-B99C0F4EF892}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fheapdll", "..\..\test\fheapdll\fheapdll.vcproj", "{CEBB9980-4B77-4105-BFEB-4DCDBB1F5E35}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fillval", "..\..\test\fillval\fillval.vcproj", "{CAC1F1E8-55D5-4CC6-857E-F01E59FB8098}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fillvaldll", "..\..\test\fillvaldll\fillvaldll.vcproj", "{0CB176F2-1FA9-467A-986D-512FAD8144B0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush1", "..\..\test\flush1\flush1.vcproj", "{364FF608-7969-4ED1-95B2-8592872F8264}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush1dll", "..\..\test\flush1dll\flush1dll.vcproj", "{B36344D1-122C-4BC6-A292-CC82F74CBB0A}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush2", "..\..\test\flush2\flush2.vcproj", "{E9F8FC85-8508-4FE7-9BB0-C0494A71BA1B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush2dll", "..\..\test\flush2dll\flush2dll.vcproj", "{F4386ECB-D688-4C18-A091-673F1F8A96E7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getname", "..\..\test\getname\getname.vcproj", "{B21CA611-6DAE-4051-8B4C-989E135711B1}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getnamedll", "..\..\test\getnamedll\getnamedll.vcproj", "{80892339-F6CE-4E96-B61B-131095F2612D}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getub", "..\..\test\getub\getub.vcproj", "{2FC5DAE1-36D6-4783-A0F9-96D0B37687A8}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gheap", "..\..\test\gheap\gheap.vcproj", "{9FCBE814-3818-4F1A-975D-05BAF6FF432F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gheapdll", "..\..\test\gheapdll\gheapdll.vcproj", "{0DA16B6F-0156-417A-9093-589D55BB066C}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gif2h5", "..\..\hl\tools\gifconv\gif2h5.vcproj", "{7C30B2A4-A24D-4796-9754-CABBDB46D0F8}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gif2h5dll", "..\..\hl\tools\gifconvdll\gif2h5dll.vcproj", "{C325E167-DBC3-4611-8AC8-2A118432E35B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h52gif", "..\..\hl\tools\gifconv\h52gif.vcproj", "{AA7A40A2-A837-4557-AB3D-D64980F6F8E4}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h52gifdll", "..\..\hl\tools\gifconvdll\h52gifdll.vcproj", "{834DD32C-D078-441F-95F4-9CDE108B60AE}"

 	ProjectSection(ProjectDependencies) = postProject

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5copy", "..\..\tools\h5copy\h5copy.vcproj", "{69952435-F01F-46A7-B907-A78EBC864ED7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5debug", "..\..\tools\h5debug\h5debug.vcproj", "{BE1A0022-708E-4CC2-B01C-26BD99AB6576}"

@@ -528,14 +529,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5debugdll", "..\..\tools\h
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5diff", "..\..\tools\h5diff\h5diff.vcproj", "{1C5A9EC8-F882-4A8A-B773-E79CD46369AF}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5diffdll", "..\..\tools\h5diffdll\h5diffdll.vcproj", "{EC6B5EAD-D938-4211-A7B1-01C9D2C15160}"

 	ProjectSection(ProjectDependencies) = postProject

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5difftst", "..\..\tools\TESTFILES\h5difftst\h5difftst.vcproj", "{1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4}"

@@ -545,32 +546,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5difftst", "..\..\tools\TE
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5dump", "..\..\tools\h5dump\h5dump.vcproj", "{9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5dumpdll", "..\..\tools\h5dumpdll\h5dumpdll.vcproj", "{7E207F6A-DC28-4DEB-8454-7977092131DC}"

 	ProjectSection(ProjectDependencies) = postProject

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5dumptst", "..\..\tools\testfiles\h5dumptst\h5dumptst.vcproj", "{0A33B4FE-A2C9-4B7F-ACEC-D251308182ED}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5import", "..\..\tools\h5import\h5import.vcproj", "{9E588AD8-14BD-4BA3-B4EA-16D1D882C700}"

 	ProjectSection(ProjectDependencies) = postProject

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5importdll", "..\..\tools\h5importdll\h5importdll.vcproj", "{2DCDB978-79B7-4A3A-B24A-D908A49B7D50}"

 	ProjectSection(ProjectDependencies) = postProject

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5importtst", "..\..\tools\TESTFILES\h5importtst\h5importtst.vcproj", "{AF696934-5004-4C1D-90C3-B434E92AFB89}"

@@ -580,8 +581,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5importtst", "..\..\tools\
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5jam", "..\..\tools\h5jam\h5jam.vcproj", "{196F5935-2391-49A7-B6A2-410DF8149F0D}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5jamtst", "..\..\tools\TESTFILES\h5jamtst\h5jamtst.vcproj", "{E8896FEE-8601-4AFC-91EA-6F9698574174}"

@@ -591,39 +592,39 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5jamtst", "..\..\tools\TES
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5ls", "..\..\tools\h5ls\h5ls.vcproj", "{357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5lsdll", "..\..\tools\h5lsdll\h5lsdll.vcproj", "{18FBE8C2-CD20-4D99-9E0B-63B408CE4850}"

 	ProjectSection(ProjectDependencies) = postProject

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5mkgrp", "..\..\tools\h5mkgrp\h5mkgrp.vcproj", "{ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repack", "..\..\tools\h5repack\h5repack.vcproj", "{411D221C-9FA1-417E-8A2B-DF746F4C7E07}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repackdll", "..\..\tools\h5repackdll\h5repackdll.vcproj", "{854F7E09-CEB5-44CD-B924-3FFAC7936323}"

 	ProjectSection(ProjectDependencies) = postProject

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repacktst", "..\..\tools\testfiles\h5repacktst\h5repacktst.vcproj", "{AC4C582B-B27D-4E57-A59F-6FF0E833C6E5}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repart", "..\..\tools\h5repart\h5repart.vcproj", "{F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF}"

@@ -648,20 +649,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5reparttst", "..\..\tools\
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5stat", "..\..\tools\h5stat\h5stat.vcproj", "{405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5statdll", "..\..\tools\h5statdll\h5statdll.vcproj", "{165195D1-B742-4030-8B12-3FE94B829D45}"

 	ProjectSection(ProjectDependencies) = postProject

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5unjam", "..\..\tools\h5unjam\h5unjam.vcproj", "{52E83C17-2B68-44B5-881D-4F6338FB14C7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "..\hdf5\hdf5.vcproj", "{26346A09-C500-49E7-963A-D22A8E09AAB7}"

@@ -681,8 +682,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_cppdll", "..\hdf5_cppd
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_f90cstub", "..\hdf5_f90cstub\hdf5_f90cstub.vcproj", "{CF055FEA-4433-439A-9688-BFD73D260706}"

 	ProjectSection(ProjectDependencies) = postProject

-		{B6430FB3-3BEF-48C3-84DD-98106C6F6113} = {B6430FB3-3BEF-48C3-84DD-98106C6F6113}

 		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+		{B6430FB3-3BEF-48C3-84DD-98106C6F6113} = {B6430FB3-3BEF-48C3-84DD-98106C6F6113}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_f90cstubdll", "..\hdf5_f90cstubdll\hdf5_f90cstubdll.vcproj", "{668327AB-1F82-46EE-A157-CD79AB8BF323}"

@@ -691,14 +692,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_f90cstubdll", "..\hdf5
 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl", "..\hdf5_hl\hdf5_hl.vcproj", "{9A124450-EC54-4813-B0B1-2CA96B695009}"

-	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl_cpp", "..\hdf5_hl_cpp\hdf5_hl_cpp.vcproj", "{7693B383-C2CB-43FD-A428-598F73D214F7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl_cppdll", "..\hdf5_hl_cppdll\hdf5_hl_cppdll.vcproj", "{3EDEB434-F59E-4C50-8884-F0BB29845619}"

@@ -708,9 +706,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl_cppdll", "..\hdf5_h
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl_f90cstubdll", "..\hdf5_hl_f90cstubdll\hdf5_hl_f90cstubdll.vcproj", "{DB6C7D17-28B1-4E5A-A61E-C53FEB545937}"

 	ProjectSection(ProjectDependencies) = postProject

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

-		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl_f90cstub", "..\hdf5_hl_fortran\hdf5_hl_f90cstub.vcproj", "{01DA0D22-D220-4ACE-9EB0-EA3906098C0A}"

@@ -730,85 +728,85 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5dll", "..\hdf5dll\hdf5d
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_ds", "..\..\hl\test\hl_test_ds\hl_test_ds.vcproj", "{6410E6D2-EDBF-439D-8C43-1AB0C37AC851}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_dsdll", "..\..\hl\test\hl_test_dsdll\hl_test_dsdll.vcproj", "{3B4A4A62-FDAC-4219-98BD-80C4FE5D4B2F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_image", "..\..\hl\test\hl_test_image\hl_test_image.vcproj", "{03359B45-E43D-44B3-BDE5-8B14D9F0D827}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_imagedll", "..\..\hl\test\hl_test_imagedll\hl_test_imagedll.vcproj", "{9A226D92-9326-4907-A462-25997D5C9427}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_lite", "..\..\hl\test\hl_test_lite\hl_test_lite.vcproj", "{6FFCE804-EF4A-468F-A174-561934C153A1}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_litedll", "..\..\hl\test\hl_test_litedll\hl_test_litedll.vcproj", "{98AE818A-E887-414B-985F-85F8411916C9}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_packet", "..\..\hl\test\hl_test_packet\hl_test_packet.vcproj", "{5CC7FFCE-2612-41B6-AF83-C1B61F67949B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_packetdll", "..\..\hl\test\hl_test_packetdll\hl_test_packetdll.vcproj", "{E3B02B7C-6CF5-42C5-8AF5-48D2B6D8F94B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_table", "..\..\hl\test\hl_test_table\hl_test_table.vcproj", "{43069CE7-E7CB-4EBF-A6CC-31E7A06D3835}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_table_cpp", "..\..\hl\c++\test\hl_test_table_cpp\hl_test_table_cpp.vcproj", "{6312B365-AA53-43AA-BD00-848C1323CA8B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

 		{7693B383-C2CB-43FD-A428-598F73D214F7} = {7693B383-C2CB-43FD-A428-598F73D214F7}

+		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_table_cppdll", "..\..\hl\c++\test\hl_test_table_cppdll\hl_test_table_cppdll.vcproj", "{0D18A50F-52B3-4322-AC0D-F15CD657CEC4}"

 	ProjectSection(ProjectDependencies) = postProject

-		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

-		{3EDEB434-F59E-4C50-8884-F0BB29845619} = {3EDEB434-F59E-4C50-8884-F0BB29845619}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{3EDEB434-F59E-4C50-8884-F0BB29845619} = {3EDEB434-F59E-4C50-8884-F0BB29845619}

+		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_tabledll", "..\..\hl\test\hl_test_tabledll\hl_test_tabledll.vcproj", "{D1AADCA9-FB5A-4F44-8E11-8232941E2C33}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hyperslab", "..\..\test\hyperslab\hyperslab.vcproj", "{1AB767EA-546C-4F72-BC1F-6AA0458512D8}"

@@ -833,26 +831,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iopipedll", "..\..\test\iop
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "istore", "..\..\test\istore\istore.vcproj", "{C4BA3E66-2310-43E7-B30A-ABDCCF44D823}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "istoredll", "..\..\test\istoredll\istoredll.vcproj", "{BE4FFA8B-2988-4888-A9B9-DD108BCBA8A6}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lheap", "..\..\test\lheap\lheap.vcproj", "{5A90FD64-6EED-45E1-A147-D9FE72788570}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lheapdll", "..\..\test\lheapdll\lheapdll.vcproj", "{E02CDAAC-05F4-436B-B245-2A402FFA131F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtest", "..\..\test\libtest\libtest.vcproj", "{A80D439C-37B4-4619-A122-1C69F567733B}"

@@ -874,74 +872,79 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtest_cstub", "..\..\fort
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "links", "..\..\test\links\links.vcproj", "{8792D377-8105-4C67-87F1-115E48D0178F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linksdll", "..\..\test\linksdll\linksdll.vcproj", "{27CCFE35-61A5-434F-8B83-9A40AE2AE8C5}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mount", "..\..\test\mount\mount.vcproj", "{4EE91AD5-8332-4FD3-A5E3-BF4C145BB53A}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mountdll", "..\..\test\mountdll\mountdll.vcproj", "{CE7C4168-68A6-43B2-BAE7-B2CF857C8F03}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mtime", "..\..\test\mtime\mtime.vcproj", "{40EBF7DB-330C-4F56-AE68-9FC7D75CB5D5}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mtimedll", "..\..\test\mtimedll\mtimedll.vcproj", "{7F1AFE93-97E7-4905-A2CF-5C845D7FDD4F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntypes", "..\..\test\ntypes\ntypes.vcproj", "{0A049202-6533-413E-89D6-5D6866AAE703}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntypesdll", "..\..\test\ntypesdll\ntypesdll.vcproj", "{9AAC897A-70FA-4E5E-BF48-F664C12B05C7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "objcopy", "..\..\test\objcopy\objcopy.vcproj", "{34C0FDFA-81D6-4652-B841-894BD1A15FB0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "objcopydll", "..\..\test\objcopydll\objcopydll.vcproj", "{794B7E1E-E6AD-456D-9F33-FCE317325EC4}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdr", "..\..\test\ohdr\ohdr.vcproj", "{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdr_gentst", "..\..\test\ohdr_gentst\ohdr_gentst.vcproj", "{400D995A-CFC8-4D39-A449-88BE067834F8}"

+	ProjectSection(ProjectDependencies) = postProject

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdrdll", "..\..\test\ohdrdll\ohdrdll.vcproj", "{37605955-FA00-41C9-9D39-D078CF270376}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "overhead", "..\..\test\overhead\overhead.vcproj", "{9A9D7ABC-ED3A-462E-9ED1-CB55F14174F3}"

@@ -956,104 +959,104 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "overheaddll", "..\..\test\o
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pool", "..\..\test\pool\pool.vcproj", "{9ADAE03A-2060-471E-A7B5-9D8F6995223A}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pooldll", "..\..\test\pooldll\pooldll.vcproj", "{DFE42486-47A2-487C-81B9-DDCDA9F07BF0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reserved", "..\..\test\reserved\reserved.vcproj", "{2248C52C-75DC-465B-A598-6E89CC93E00D}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reserveddll", "..\..\test\reserveddll\reserveddll.vcproj", "{C2E6106F-1450-4F62-8D8E-17A93E986B26}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "set_extent", "..\..\test\set_extent\set_extent.vcproj", "{E81413CC-046C-42B0-B862-0BB81AED2854}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "set_extentdll", "..\..\test\set_extentdll\set_extentdll.vcproj", "{14DB1F8E-0BF6-4E9D-8372-5EA9ED48347F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stab", "..\..\test\stab\stab.vcproj", "{17DC13C3-78E0-4EF5-B7B1-87EB1A379D2A}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stabdll", "..\..\test\stabdll\stabdll.vcproj", "{7CF4F18C-3C74-4EBB-AD76-F41575D7A5A0}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "talign", "..\..\tools\talign\talign.vcproj", "{E6A9BFE8-84DE-46C0-A372-72087598018E}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "taligndll", "..\..\tools\taligndll\taligndll.vcproj", "{3BBA31F8-2679-4655-975D-52FDA5ABD5C4}"

 	ProjectSection(ProjectDependencies) = postProject

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tellub", "..\..\test\tellub\tellub.vcproj", "{A26C50E9-D3FB-4490-9CD7-606EB2E77D21}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testh5repack_detect_szip", "..\..\tools\TESTFILES\testh5repack_detect_szip\testh5repack_detect_szip.vcproj", "{5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A} = {473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testh5repack_detect_szipdll", "..\..\tools\TESTFILES\testh5repack_detect_szipdll\testh5repack_detect_szipdll.vcproj", "{E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF}"

 	ProjectSection(ProjectDependencies) = postProject

-		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{832DD776-BC7F-40B5-90D0-E6448014CA5B} = {832DD776-BC7F-40B5-90D0-E6448014CA5B}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhdf5", "..\..\test\testhdf5\testhdf5.vcproj", "{D1518671-CB9D-471F-8BCE-A03DE67F26B1}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhdf5_cpp", "..\..\c++\test\testhdf5_cpp\testhdf5_cpp.vcproj", "{EFA04391-B35B-44C0-AB27-1383D4C9E358}"

 	ProjectSection(ProjectDependencies) = postProject

-		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{FB74E351-0C4E-4173-B0D3-10DD12F2DCA5} = {FB74E351-0C4E-4173-B0D3-10DD12F2DCA5}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhdf5_cppdll", "..\..\c++\test\testhdf5_cppdll\testhdf5_cppdll.vcproj", "{DBA493BD-3AF1-4616-8A80-F6FD41B70392}"

 	ProjectSection(ProjectDependencies) = postProject

-		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

 		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{D279901A-8E21-47D3-B7EA-A572EE12F2E6} = {D279901A-8E21-47D3-B7EA-A572EE12F2E6}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhdf5dll", "..\..\test\testhdf5dll\testhdf5dll.vcproj", "{D1FD44F8-8263-4B29-985D-21CE26F45A76}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolslib", "..\..\tools\toolslib\toolslib.vcproj", "{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}"

@@ -1062,189 +1065,187 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolslibdll", "..\..\tools\
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttsafedll", "..\..\test\ttsafedll\ttsafedll.vcproj", "{DDDFC0AC-2ECB-4930-9C83-788AC7C1343E}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unlink", "..\..\test\unlink\unlink.vcproj", "{9321B2C5-74B3-4743-9D87-B0FDCB47373B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unlinkdll", "..\..\test\unlinkdll\unlinkdll.vcproj", "{685666ED-4640-47EE-AEA5-35B9602CA541}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfd", "..\..\test\vfd\vfd.vcproj", "{744EA5E0-18C8-4757-82DE-2D0CF11DBDDE}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfddll", "..\..\test\vfddll\vfddll.vcproj", "{0C5E3F36-3338-4B2C-A956-4D577B6119E7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "flush1_fortran", "..\..\fortran\test\flush1_fortran\flush1_fortran.vfproj", "{F445FB75-3390-47BE-8179-6A9222A9ACD8}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{84571A5E-D9A6-4672-9F86-3F8E32C93FDF} = {84571A5E-D9A6-4672-9F86-3F8E32C93FDF}

-		{2B93688D-D766-4295-ABFA-003CF905F8D8} = {2B93688D-D766-4295-ABFA-003CF905F8D8}

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

-		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

 		{CF055FEA-4433-439A-9688-BFD73D260706} = {CF055FEA-4433-439A-9688-BFD73D260706}

+		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{2B93688D-D766-4295-ABFA-003CF905F8D8} = {2B93688D-D766-4295-ABFA-003CF905F8D8}

+		{84571A5E-D9A6-4672-9F86-3F8E32C93FDF} = {84571A5E-D9A6-4672-9F86-3F8E32C93FDF}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "flush1_fortrandll", "..\..\fortran\test\flush1_fortrandll\flush1_fortrandll.vfproj", "{8D4599CD-B4B1-4ABB-9AB0-45002AAFEA7E}"

 	ProjectSection(ProjectDependencies) = postProject

-		{71C6994C-3102-4A2A-B0AE-88A590CB36CE} = {71C6994C-3102-4A2A-B0AE-88A590CB36CE}

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

-		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

-		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C} = {1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

+		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{71C6994C-3102-4A2A-B0AE-88A590CB36CE} = {71C6994C-3102-4A2A-B0AE-88A590CB36CE}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "flush2_fortran", "..\..\fortran\test\flush2_fortran\flush2_fortran.vfproj", "{A4C4D9C2-DFB5-4A09-8C6D-968113C58247}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{84571A5E-D9A6-4672-9F86-3F8E32C93FDF} = {84571A5E-D9A6-4672-9F86-3F8E32C93FDF}

-		{2B93688D-D766-4295-ABFA-003CF905F8D8} = {2B93688D-D766-4295-ABFA-003CF905F8D8}

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

-		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

 		{CF055FEA-4433-439A-9688-BFD73D260706} = {CF055FEA-4433-439A-9688-BFD73D260706}

+		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

+		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{2B93688D-D766-4295-ABFA-003CF905F8D8} = {2B93688D-D766-4295-ABFA-003CF905F8D8}

+		{84571A5E-D9A6-4672-9F86-3F8E32C93FDF} = {84571A5E-D9A6-4672-9F86-3F8E32C93FDF}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "flush2_fortrandll", "..\..\fortran\test\flush2_fortrandll\flush2_fortrandll.vfproj", "{C865016E-1FE1-4FD7-959D-62E795206E76}"

 	ProjectSection(ProjectDependencies) = postProject

-		{71C6994C-3102-4A2A-B0AE-88A590CB36CE} = {71C6994C-3102-4A2A-B0AE-88A590CB36CE}

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

-		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

-		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

 		{1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C} = {1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C}

+		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

+		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

+		{71C6994C-3102-4A2A-B0AE-88A590CB36CE} = {71C6994C-3102-4A2A-B0AE-88A590CB36CE}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "hdf5_fortran", "..\hdf5_fortran\hdf5_fortran.vfproj", "{26F2FDA4-17DC-4E1A-B9AC-124C460A4391}"

 	ProjectSection(ProjectDependencies) = postProject

-		{B6430FB3-3BEF-48C3-84DD-98106C6F6113} = {B6430FB3-3BEF-48C3-84DD-98106C6F6113}

 		{CF055FEA-4433-439A-9688-BFD73D260706} = {CF055FEA-4433-439A-9688-BFD73D260706}

+		{B6430FB3-3BEF-48C3-84DD-98106C6F6113} = {B6430FB3-3BEF-48C3-84DD-98106C6F6113}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "hdf5_fortrandll", "..\hdf5_fortrandll\hdf5_fortrandll.vfproj", "{1063E387-0167-411C-85B9-96B043C4BDB3}"

 	ProjectSection(ProjectDependencies) = postProject

-		{B6430FB3-3BEF-48C3-84DD-98106C6F6113} = {B6430FB3-3BEF-48C3-84DD-98106C6F6113}

 		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

+		{B6430FB3-3BEF-48C3-84DD-98106C6F6113} = {B6430FB3-3BEF-48C3-84DD-98106C6F6113}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "hdf5_hl_fortran", "..\hdf5_hl_fortran\hdf5_hl_fortran.vfproj", "{F9428466-5FA2-47C9-BB02-288EDE7016A4}"

 	ProjectSection(ProjectDependencies) = postProject

 		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

 		{01DA0D22-D220-4ACE-9EB0-EA3906098C0A} = {01DA0D22-D220-4ACE-9EB0-EA3906098C0A}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "hdf5_hl_fortrandll", "..\hdf5_hl_fortrandll\hdf5_hl_fortrandll.vfproj", "{487B4E71-1CB9-49A1-920C-1F505D8B76F8}"

 	ProjectSection(ProjectDependencies) = postProject

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

-		{DB6C7D17-28B1-4E5A-A61E-C53FEB545937} = {DB6C7D17-28B1-4E5A-A61E-C53FEB545937}

-		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

 		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

+		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

+		{DB6C7D17-28B1-4E5A-A61E-C53FEB545937} = {DB6C7D17-28B1-4E5A-A61E-C53FEB545937}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "hl_test_image_fortran", "..\..\hl\fortran\test\hl_test_image_fortran\hl_test_image_fortran.vfproj", "{1C2FF3B6-639A-4047-90DE-327B82BF3ACB}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{01DA0D22-D220-4ACE-9EB0-EA3906098C0A} = {01DA0D22-D220-4ACE-9EB0-EA3906098C0A}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

-		{F9428466-5FA2-47C9-BB02-288EDE7016A4} = {F9428466-5FA2-47C9-BB02-288EDE7016A4}

-		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

 		{CF055FEA-4433-439A-9688-BFD73D260706} = {CF055FEA-4433-439A-9688-BFD73D260706}

+		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

+		{F9428466-5FA2-47C9-BB02-288EDE7016A4} = {F9428466-5FA2-47C9-BB02-288EDE7016A4}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{01DA0D22-D220-4ACE-9EB0-EA3906098C0A} = {01DA0D22-D220-4ACE-9EB0-EA3906098C0A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "hl_test_image_fortrandll", "..\..\hl\fortran\test\hl_test_image_fortrandll\hl_test_image_fortrandll.vfproj", "{8659AEE0-2C9A-4666-B70F-C2B8280FD909}"

 	ProjectSection(ProjectDependencies) = postProject

-		{DB6C7D17-28B1-4E5A-A61E-C53FEB545937} = {DB6C7D17-28B1-4E5A-A61E-C53FEB545937}

-		{487B4E71-1CB9-49A1-920C-1F505D8B76F8} = {487B4E71-1CB9-49A1-920C-1F505D8B76F8}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

-		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

-		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

+		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{487B4E71-1CB9-49A1-920C-1F505D8B76F8} = {487B4E71-1CB9-49A1-920C-1F505D8B76F8}

+		{DB6C7D17-28B1-4E5A-A61E-C53FEB545937} = {DB6C7D17-28B1-4E5A-A61E-C53FEB545937}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "hl_test_lite_fortran", "..\..\hl\fortran\test\hl_test_lite_fortran\hl_test_lite_fortran.vfproj", "{3F8103CC-1DB2-4C23-9ABC-430434244D40}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{01DA0D22-D220-4ACE-9EB0-EA3906098C0A} = {01DA0D22-D220-4ACE-9EB0-EA3906098C0A}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

-		{F9428466-5FA2-47C9-BB02-288EDE7016A4} = {F9428466-5FA2-47C9-BB02-288EDE7016A4}

-		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

 		{CF055FEA-4433-439A-9688-BFD73D260706} = {CF055FEA-4433-439A-9688-BFD73D260706}

+		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

+		{F9428466-5FA2-47C9-BB02-288EDE7016A4} = {F9428466-5FA2-47C9-BB02-288EDE7016A4}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{01DA0D22-D220-4ACE-9EB0-EA3906098C0A} = {01DA0D22-D220-4ACE-9EB0-EA3906098C0A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "hl_test_lite_fortrandll", "..\..\hl\fortran\test\hl_test_lite_fortrandll\hl_test_lite_fortrandll.vfproj", "{5E617A56-25B2-41E8-8D69-109600819716}"

 	ProjectSection(ProjectDependencies) = postProject

-		{DB6C7D17-28B1-4E5A-A61E-C53FEB545937} = {DB6C7D17-28B1-4E5A-A61E-C53FEB545937}

-		{487B4E71-1CB9-49A1-920C-1F505D8B76F8} = {487B4E71-1CB9-49A1-920C-1F505D8B76F8}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

-		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

-		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

+		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{487B4E71-1CB9-49A1-920C-1F505D8B76F8} = {487B4E71-1CB9-49A1-920C-1F505D8B76F8}

+		{DB6C7D17-28B1-4E5A-A61E-C53FEB545937} = {DB6C7D17-28B1-4E5A-A61E-C53FEB545937}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "hl_test_table_fortran", "..\..\hl\fortran\test\hl_test_table_fortran\hl_test_table_fortran.vfproj", "{C8202A85-1F3A-4B34-869C-B1E8CA829299}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{01DA0D22-D220-4ACE-9EB0-EA3906098C0A} = {01DA0D22-D220-4ACE-9EB0-EA3906098C0A}

-		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

-		{F9428466-5FA2-47C9-BB02-288EDE7016A4} = {F9428466-5FA2-47C9-BB02-288EDE7016A4}

-		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

 		{CF055FEA-4433-439A-9688-BFD73D260706} = {CF055FEA-4433-439A-9688-BFD73D260706}

+		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

+		{F9428466-5FA2-47C9-BB02-288EDE7016A4} = {F9428466-5FA2-47C9-BB02-288EDE7016A4}

+		{9A124450-EC54-4813-B0B1-2CA96B695009} = {9A124450-EC54-4813-B0B1-2CA96B695009}

+		{01DA0D22-D220-4ACE-9EB0-EA3906098C0A} = {01DA0D22-D220-4ACE-9EB0-EA3906098C0A}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "hl_test_table_fortrandll", "..\..\hl\fortran\test\hl_test_table_fortrandll\hl_test_table_fortrandll.vfproj", "{3F645EFF-3A91-4CF3-9B60-76E0C33686A7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{DB6C7D17-28B1-4E5A-A61E-C53FEB545937} = {DB6C7D17-28B1-4E5A-A61E-C53FEB545937}

-		{487B4E71-1CB9-49A1-920C-1F505D8B76F8} = {487B4E71-1CB9-49A1-920C-1F505D8B76F8}

-		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

-		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

-		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

 		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

+		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

+		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

+		{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C} = {CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}

+		{487B4E71-1CB9-49A1-920C-1F505D8B76F8} = {487B4E71-1CB9-49A1-920C-1F505D8B76F8}

+		{DB6C7D17-28B1-4E5A-A61E-C53FEB545937} = {DB6C7D17-28B1-4E5A-A61E-C53FEB545937}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "libtest_fortran", "..\..\fortran\test\libtest_fortran\libtest_fortran.vfproj", "{84571A5E-D9A6-4672-9F86-3F8E32C93FDF}"

 	ProjectSection(ProjectDependencies) = postProject

-		{2B93688D-D766-4295-ABFA-003CF905F8D8} = {2B93688D-D766-4295-ABFA-003CF905F8D8}

 		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

+		{2B93688D-D766-4295-ABFA-003CF905F8D8} = {2B93688D-D766-4295-ABFA-003CF905F8D8}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "libtest_fortrandll", "..\..\fortran\test\libtest_fortrandll\libtest_fortrandll.vfproj", "{71C6994C-3102-4A2A-B0AE-88A590CB36CE}"

 	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

-		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

 		{1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C} = {1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C}

+		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

+		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "testhdf5_fortran", "..\..\fortran\test\testhdf5_fortran\testhdf5_fortran.vfproj", "{F04E2D13-2096-4C67-AA4C-63C9015474B1}"

 	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{84571A5E-D9A6-4672-9F86-3F8E32C93FDF} = {84571A5E-D9A6-4672-9F86-3F8E32C93FDF}

-		{2B93688D-D766-4295-ABFA-003CF905F8D8} = {2B93688D-D766-4295-ABFA-003CF905F8D8}

-		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

 		{CF055FEA-4433-439A-9688-BFD73D260706} = {CF055FEA-4433-439A-9688-BFD73D260706}

+		{26F2FDA4-17DC-4E1A-B9AC-124C460A4391} = {26F2FDA4-17DC-4E1A-B9AC-124C460A4391}

+		{2B93688D-D766-4295-ABFA-003CF905F8D8} = {2B93688D-D766-4295-ABFA-003CF905F8D8}

+		{84571A5E-D9A6-4672-9F86-3F8E32C93FDF} = {84571A5E-D9A6-4672-9F86-3F8E32C93FDF}

+		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

 	EndProjectSection

 EndProject

 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "testhdf5_fortrandll", "..\..\fortran\test\testhdf5_fortrandll\testhdf5_fortrandll.vfproj", "{6923D270-FB9F-4F40-8268-9C542ADABD88}"

 	ProjectSection(ProjectDependencies) = postProject

-		{71C6994C-3102-4A2A-B0AE-88A590CB36CE} = {71C6994C-3102-4A2A-B0AE-88A590CB36CE}

-		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

-		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

 		{1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C} = {1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C}

+		{668327AB-1F82-46EE-A157-CD79AB8BF323} = {668327AB-1F82-46EE-A157-CD79AB8BF323}

+		{1063E387-0167-411C-85B9-96B043C4BDB3} = {1063E387-0167-411C-85B9-96B043C4BDB3}

+		{71C6994C-3102-4A2A-B0AE-88A590CB36CE} = {71C6994C-3102-4A2A-B0AE-88A590CB36CE}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5tinit", "..\..\misc\typegen\h5tinit\h5tinit.vcproj", "{B123D196-2F43-4FEB-80B5-990F06DED319}"

@@ -1261,18 +1262,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "H5match_types", "..\..\misc
 		{4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10} = {4D3CE514-F22D-4FBC-82FF-7A3BE15DAE10}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk_info", "..\..\test\chunk_info\chunk_info.vcproj", "{E3B24219-DEB9-4ECB-809C-AD98EE51974E}"

-	ProjectSection(ProjectDependencies) = postProject

-		{26346A09-C500-49E7-963A-D22A8E09AAB7} = {26346A09-C500-49E7-963A-D22A8E09AAB7}

-		{A80D439C-37B4-4619-A122-1C69F567733B} = {A80D439C-37B4-4619-A122-1C69F567733B}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk_infodll", "..\..\test\chunk_infodll\chunk_infodll.vcproj", "{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}"

-	ProjectSection(ProjectDependencies) = postProject

-		{54BDA057-C716-4807-A35E-73185DCB236D} = {54BDA057-C716-4807-A35E-73185DCB236D}

-		{C9535AD9-C61D-4691-A5CE-52EF359892AF} = {C9535AD9-C61D-4691-A5CE-52EF359892AF}

-	EndProjectSection

-EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -2329,6 +2318,14 @@ Global
 		{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}.Release|Win32.Build.0 = Release|Win32

 		{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}.Release|x64.ActiveCfg = Release|x64

 		{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}.Release|x64.Build.0 = Release|x64

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Debug|Win32.ActiveCfg = Debug|Win32

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Debug|Win32.Build.0 = Debug|Win32

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Debug|x64.ActiveCfg = Debug|x64

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Debug|x64.Build.0 = Debug|x64

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Release|Win32.ActiveCfg = Release|Win32

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Release|Win32.Build.0 = Release|Win32

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Release|x64.ActiveCfg = Release|x64

+		{400D995A-CFC8-4D39-A449-88BE067834F8}.Release|x64.Build.0 = Release|x64

 		{37605955-FA00-41C9-9D39-D078CF270376}.Debug|Win32.ActiveCfg = Debug|Win32

 		{37605955-FA00-41C9-9D39-D078CF270376}.Debug|Win32.Build.0 = Debug|Win32

 		{37605955-FA00-41C9-9D39-D078CF270376}.Debug|x64.ActiveCfg = Debug|x64

@@ -2717,22 +2714,6 @@ Global
 		{B6430FB3-3BEF-48C3-84DD-98106C6F6113}.Release|Win32.Build.0 = Release|Win32

 		{B6430FB3-3BEF-48C3-84DD-98106C6F6113}.Release|x64.ActiveCfg = Release|x64

 		{B6430FB3-3BEF-48C3-84DD-98106C6F6113}.Release|x64.Build.0 = Release|x64

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Debug|Win32.Build.0 = Debug|Win32

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Debug|x64.ActiveCfg = Debug|x64

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Debug|x64.Build.0 = Debug|x64

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Release|Win32.ActiveCfg = Release|Win32

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Release|Win32.Build.0 = Release|Win32

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Release|x64.ActiveCfg = Release|x64

-		{E3B24219-DEB9-4ECB-809C-AD98EE51974E}.Release|x64.Build.0 = Release|x64

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Debug|Win32.Build.0 = Debug|Win32

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Debug|x64.ActiveCfg = Debug|x64

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Debug|x64.Build.0 = Debug|x64

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Release|Win32.ActiveCfg = Release|Win32

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Release|Win32.Build.0 = Release|Win32

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Release|x64.ActiveCfg = Release|x64

-		{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/windows/proj/all_fortran/all_fortran.vcproj b/windows/proj/all_fortran/all_fortran.vcproj
index 82b54e1..de6d3b4 100644
--- a/windows/proj/all_fortran/all_fortran.vcproj
+++ b/windows/proj/all_fortran/all_fortran.vcproj
@@ -22,7 +22,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="10"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -46,7 +46,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="10"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -71,7 +71,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="10"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -95,7 +95,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="10"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj
index 3d27547..732026b 100644
--- a/windows/proj/hdf5/hdf5.vcproj
+++ b/windows/proj/hdf5/hdf5.vcproj
@@ -22,7 +22,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -92,7 +92,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -163,7 +163,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -234,7 +234,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -1173,10 +1173,6 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dchunk.c"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\src\H5Dcompact.c"

 				>

 				<FileConfiguration

@@ -1549,10 +1545,6 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dscatgath.c"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\src\H5Dselect.c"

 				>

 				<FileConfiguration

diff --git a/windows/proj/hdf5_cpp/hdf5_cpp.vcproj b/windows/proj/hdf5_cpp/hdf5_cpp.vcproj
index d925032..c17f93f 100644
--- a/windows/proj/hdf5_cpp/hdf5_cpp.vcproj
+++ b/windows/proj/hdf5_cpp/hdf5_cpp.vcproj
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -96,7 +96,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -172,7 +172,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -246,7 +246,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

diff --git a/windows/proj/hdf5_cppdll/hdf5_cppdll.vcproj b/windows/proj/hdf5_cppdll/hdf5_cppdll.vcproj
index f8cfb63..05c0d0b 100644
--- a/windows/proj/hdf5_cppdll/hdf5_cppdll.vcproj
+++ b/windows/proj/hdf5_cppdll/hdf5_cppdll.vcproj
@@ -22,7 +22,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -80,7 +80,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_cppdll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -117,7 +117,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -175,7 +175,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_cppdll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -212,7 +212,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -269,7 +269,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_cppddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -307,7 +307,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -364,7 +364,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_cppddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -415,7 +415,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -425,7 +425,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -435,7 +435,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -446,7 +446,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -461,7 +461,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -471,7 +471,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -481,7 +481,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -492,7 +492,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -507,7 +507,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -517,7 +517,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -527,7 +527,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -538,7 +538,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -553,7 +553,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -563,7 +563,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -573,7 +573,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -584,7 +584,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -599,7 +599,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -609,7 +609,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -619,7 +619,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -630,7 +630,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -645,7 +645,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -655,7 +655,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -665,7 +665,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -676,7 +676,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -691,7 +691,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -701,7 +701,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -711,7 +711,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -722,7 +722,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -737,7 +737,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -747,7 +747,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -757,7 +757,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -768,7 +768,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -783,7 +783,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -793,7 +793,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -803,7 +803,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -814,7 +814,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -829,7 +829,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -839,7 +839,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -849,7 +849,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -860,7 +860,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -875,7 +875,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -885,7 +885,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -895,7 +895,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -906,7 +906,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -921,7 +921,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -931,7 +931,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -941,7 +941,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -952,7 +952,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -967,7 +967,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -977,7 +977,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -987,7 +987,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -998,7 +998,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1013,7 +1013,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1023,7 +1023,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1033,7 +1033,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1044,7 +1044,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1059,7 +1059,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1069,7 +1069,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1079,7 +1079,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1090,7 +1090,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1105,7 +1105,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1115,7 +1115,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1125,7 +1125,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1136,7 +1136,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1151,7 +1151,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1161,7 +1161,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1171,7 +1171,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1182,7 +1182,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1197,7 +1197,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1207,7 +1207,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1217,7 +1217,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1228,7 +1228,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1243,7 +1243,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1253,7 +1253,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1263,7 +1263,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1274,7 +1274,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1289,7 +1289,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1299,7 +1299,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1309,7 +1309,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1320,7 +1320,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1335,7 +1335,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1345,7 +1345,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1355,7 +1355,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1366,7 +1366,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1381,7 +1381,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1391,7 +1391,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1401,7 +1401,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1412,7 +1412,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1427,7 +1427,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1437,7 +1437,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1447,7 +1447,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1458,7 +1458,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1473,7 +1473,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1483,7 +1483,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1493,7 +1493,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1504,7 +1504,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1519,7 +1519,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1529,7 +1529,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1539,7 +1539,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1550,7 +1550,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1565,7 +1565,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1575,7 +1575,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1585,7 +1585,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -1596,7 +1596,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL"

+						PreprocessorDefinitions="HDF5_CPPDLL_EXPORTS;_HDF5USEDLL_;WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

diff --git a/windows/proj/hdf5_f90cstub/hdf5_f90cstub.vcproj b/windows/proj/hdf5_f90cstub/hdf5_f90cstub.vcproj
index 9485aab..116ab47 100644
--- a/windows/proj/hdf5_f90cstub/hdf5_f90cstub.vcproj
+++ b/windows/proj/hdf5_f90cstub/hdf5_f90cstub.vcproj
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -96,7 +96,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -172,7 +172,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -246,7 +246,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -693,6 +693,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\fortran\src\H5Lf.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\fortran\src\H5Pf.c"

 				>

 				<FileConfiguration

diff --git a/windows/proj/hdf5_f90cstubdll/hdf5_f90cstubdll.vcproj b/windows/proj/hdf5_f90cstubdll/hdf5_f90cstubdll.vcproj
index 8260cfd..6bfce8e 100644
--- a/windows/proj/hdf5_f90cstubdll/hdf5_f90cstubdll.vcproj
+++ b/windows/proj/hdf5_f90cstubdll/hdf5_f90cstubdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hdf5_f90cstubdll"

 	ProjectGUID="{668327AB-1F82-46EE-A157-CD79AB8BF323}"

-	RootNamespace="hdf5_f90cstubdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -79,7 +78,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_f90cstubdll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -116,7 +115,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -173,7 +172,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_f90cstubdll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -210,7 +209,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -266,7 +265,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_f90cstubddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -304,7 +303,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -360,7 +359,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_f90cstubddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -411,7 +410,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -421,7 +420,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -431,7 +430,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -442,7 +441,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -457,7 +456,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -467,7 +466,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -477,7 +476,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -488,7 +487,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -503,7 +502,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -513,7 +512,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -523,7 +522,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -534,7 +533,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -549,7 +548,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -559,7 +558,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -569,7 +568,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -580,7 +579,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -595,7 +594,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -605,7 +604,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -615,7 +614,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -626,7 +625,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -641,7 +640,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -651,7 +650,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -661,7 +660,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -672,7 +671,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -687,7 +686,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -697,7 +696,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -707,7 +706,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -718,7 +717,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -733,7 +732,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -743,7 +742,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -753,7 +752,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -764,12 +763,16 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\fortran\src\H5Lf.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\fortran\src\H5Pf.c"

 				>

 				<FileConfiguration

@@ -779,7 +782,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -789,7 +792,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -799,7 +802,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -810,7 +813,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -825,7 +828,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -835,7 +838,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -845,7 +848,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -856,7 +859,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -871,7 +874,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -881,7 +884,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -891,7 +894,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -902,7 +905,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -917,7 +920,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -927,7 +930,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -937,7 +940,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -948,7 +951,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -963,7 +966,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -973,7 +976,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -983,7 +986,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -994,7 +997,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;HDF5FORT_CSTUB_DLL_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

diff --git a/windows/proj/hdf5_fortran/hdf5_fortran.vfproj b/windows/proj/hdf5_fortran/hdf5_fortran.vfproj
index d21af88..d1adb24 100644
--- a/windows/proj/hdf5_fortran/hdf5_fortran.vfproj
+++ b/windows/proj/hdf5_fortran/hdf5_fortran.vfproj
@@ -13,15 +13,15 @@
 				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

 				<Tool Name="VFPreLinkEventTool"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" Command="$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFLibrarianTool" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

@@ -52,6 +52,7 @@
 		<File RelativePath="..\..\..\fortran\src\H5fortran_types.f90"/>

 		<File RelativePath="..\..\..\fortran\src\H5Gff.f90"/>

 		<File RelativePath="..\..\..\fortran\src\H5Iff.f90"/>

+		<File RelativePath="..\..\..\fortran\src\H5Lff.f90"/>

 		<File RelativePath="..\..\..\fortran\src\H5Pff.f90"/>

 		<File RelativePath="..\..\..\fortran\src\H5Rff.f90"/>

 		<File RelativePath="..\..\..\fortran\src\H5Sff.f90"/>

diff --git a/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj b/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj
index 4f845c9..67c299e 100644
--- a/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj
+++ b/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj
@@ -4,15 +4,15 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" Command="$(TargetPath)">

-				<Tool Name="VFMidlTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="midlTargetWin32" TypeLibraryName="$(OUTDIR)/hdf5_fortrandll.tlb"/>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="midlTargetWin32" TypeLibraryName="$(OUTDIR)/hdf5_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" FPS4Symbols="true" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" FPS4Symbols="true" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" OutputFile="$(OutDir)\hdf5_fortranddll.dll   " LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortranddll.dll   " LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

 				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="midlTargetWin32" TypeLibraryName="$(OUTDIR)/hdf5_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

@@ -52,6 +52,7 @@
 		<File RelativePath="..\..\..\fortran\src\H5fortran_types.f90"/>

 		<File RelativePath="..\..\..\fortran\src\H5Gff.f90"/>

 		<File RelativePath="..\..\..\fortran\src\H5Iff.f90"/>

+		<File RelativePath="..\..\..\fortran\src\H5Lff.f90"/>

 		<File RelativePath="..\..\..\fortran\src\H5Pff.f90"/>

 		<File RelativePath="..\..\..\fortran\src\H5Rff.f90"/>

 		<File RelativePath="..\..\..\fortran\src\H5Sff.f90"/>

diff --git a/windows/proj/hdf5_hl/hdf5_hl.vcproj b/windows/proj/hdf5_hl/hdf5_hl.vcproj
index 8753a2d..f9dd1b9 100644
--- a/windows/proj/hdf5_hl/hdf5_hl.vcproj
+++ b/windows/proj/hdf5_hl/hdf5_hl.vcproj
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -95,7 +95,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +170,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -245,7 +245,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

diff --git a/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj b/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
index b882f12..1951221 100644
--- a/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
+++ b/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -96,7 +96,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -172,7 +172,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -246,7 +246,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

diff --git a/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj b/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj
index 682cdfe..2bdaf68 100644
--- a/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj
+++ b/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hdf5_hl_cppdll"

 	ProjectGUID="{3EDEB434-F59E-4C50-8884-F0BB29845619}"

-	RootNamespace="hdf5_hl_cppdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -81,7 +80,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\hdf5_hl_cppdll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -118,7 +117,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -177,7 +176,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\hdf5_hl_cppdll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -214,7 +213,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -271,7 +270,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_hl_cppddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -309,7 +308,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -366,7 +365,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_hl_cppddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -417,7 +416,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_CPPDLL_EXPORTS;_HDF5USEHLDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_CPPDLL_EXPORTS;_HDF5USEHLDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -427,7 +426,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_CPPDLL_EXPORTS;_HDF5USEHLDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_CPPDLL_EXPORTS;_HDF5USEHLDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -437,7 +436,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_CPPDLL_EXPORTS;_HDF5USEHLDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_CPPDLL_EXPORTS;_HDF5USEHLDLL_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -448,7 +447,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_CPPDLL_EXPORTS;_HDF5USEHLDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_CPPDLL_EXPORTS;_HDF5USEHLDLL_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

diff --git a/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj b/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj
index 76463b2..596f469 100644
--- a/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj
+++ b/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hdf5_hl_f90cstubdll"

 	ProjectGUID="{DB6C7D17-28B1-4E5A-A61E-C53FEB545937}"

-	RootNamespace="hdf5_hl_f90cstubdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -80,7 +79,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_hl_f90cstubdll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -117,7 +116,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -175,7 +174,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_hl_f90cstubdll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -212,7 +211,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -269,7 +268,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_hl_f90cstubddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -307,7 +306,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -364,7 +363,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\hdf5_hl_f90cstubddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -415,7 +414,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -425,7 +424,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -435,7 +434,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -446,7 +445,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -461,7 +460,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -471,7 +470,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -481,7 +480,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -492,7 +491,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -507,7 +506,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -517,7 +516,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -527,7 +526,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -538,7 +537,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -553,7 +552,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -563,7 +562,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;_HDF5USEDLL_;HDF5FORT_CSTUB_USEDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -573,7 +572,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -584,7 +583,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;HDF5_HL_F90CSTUBDLL_EXPORTS;HDF5FORT_CSTUB_USEDLL;_HDF5USEDLL_;HDF5USE_HLF90CSTUBDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

diff --git a/windows/proj/hdf5_hl_fortran/hdf5_hl_f90cstub.vcproj b/windows/proj/hdf5_hl_fortran/hdf5_hl_f90cstub.vcproj
index 156017b..10096c8 100644
--- a/windows/proj/hdf5_hl_fortran/hdf5_hl_f90cstub.vcproj
+++ b/windows/proj/hdf5_hl_fortran/hdf5_hl_f90cstub.vcproj
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -95,7 +95,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +170,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -244,7 +244,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

diff --git a/windows/proj/hdf5_hl_fortran/hdf5_hl_fortran.vfproj b/windows/proj/hdf5_hl_fortran/hdf5_hl_fortran.vfproj
index 4d0a627..ed36bf8 100644
--- a/windows/proj/hdf5_hl_fortran/hdf5_hl_fortran.vfproj
+++ b/windows/proj/hdf5_hl_fortran/hdf5_hl_fortran.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

 				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" Command="$(TargetPath)">

-				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortran\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortran\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLibrarianTool" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortran\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

 				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortran\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 		<File RelativePath="..\..\..\hl\fortran\src\H5IMff.f90"/>

diff --git a/windows/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.vfproj b/windows/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.vfproj
index 630eb08..ef36dce 100644
--- a/windows/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.vfproj
+++ b/windows/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="midlTargetWin32" TypeLibraryName="$(OUTDIR)/hdf5_hl_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_hl_fortrandll.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" Command="$(TargetPath)">

-				<Tool Name="VFMidlTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="midlTargetWin32" TypeLibraryName="$(OUTDIR)/hdf5_hl_fortrandll.tlb"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

+				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="midlTargetWin32" TypeLibraryName="$(OUTDIR)/hdf5_hl_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" OutputFile="$(OutDir)\hdf5_hl_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_hl_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hdf5_hl_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\proj\hdf5_fortrandll\Release/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_hl_fortrandll.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hdf5_hl_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/;..\..\..\proj\hdf5_fortrandll\Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_hl_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

 	<Files>

 		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 		<File RelativePath="..\..\..\hl\fortran\src\H5IMff.f90"/>

diff --git a/windows/proj/hdf5_hldll/hdf5_hldll.vcproj b/windows/proj/hdf5_hldll/hdf5_hldll.vcproj
index 51ca44c..f309c28 100644
--- a/windows/proj/hdf5_hldll/hdf5_hldll.vcproj
+++ b/windows/proj/hdf5_hldll/hdf5_hldll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hdf5_hldll"

 	ProjectGUID="{CFB2CC74-5F03-494A-84E9-6BB8D2FBC43C}"

-	RootNamespace="hdf5_hldll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -81,7 +80,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\hdf5_hldll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -118,7 +117,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -177,7 +176,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\hdf5_hldll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -214,7 +213,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -272,7 +271,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\hdf5_hlddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -310,7 +309,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -368,7 +367,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\hdf5_hlddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -419,7 +418,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -429,7 +428,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -439,7 +438,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -450,7 +449,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -465,7 +464,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -475,7 +474,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -485,7 +484,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -496,7 +495,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -511,7 +510,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -521,7 +520,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -531,7 +530,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -542,7 +541,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -557,7 +556,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -567,7 +566,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -577,7 +576,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -588,7 +587,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -603,7 +602,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -613,7 +612,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -623,7 +622,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -634,7 +633,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -649,7 +648,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -659,7 +658,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -669,7 +668,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -680,7 +679,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -695,7 +694,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -705,7 +704,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5_HLDLL_EXPORTS_;_HDF5USEDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -715,7 +714,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -726,7 +725,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_HDF5USEDLL_;_HDF5_HLDLL_EXPORTS_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

diff --git a/windows/proj/hdf5dll/hdf5dll.vcproj b/windows/proj/hdf5dll/hdf5dll.vcproj
index d681ec7..1816939 100644
--- a/windows/proj/hdf5dll/hdf5dll.vcproj
+++ b/windows/proj/hdf5dll/hdf5dll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hdf5dll"

 	ProjectGUID="{C9535AD9-C61D-4691-A5CE-52EF359892AF}"

-	RootNamespace="hdf5dll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\hdf5ddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -115,7 +114,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\hdf5ddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -208,7 +207,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -264,7 +263,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\hdf5dll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -302,7 +301,7 @@
 			OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -358,7 +357,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\hdf5dll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -408,7 +407,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -419,7 +418,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -430,7 +429,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -441,7 +440,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -456,7 +455,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -467,7 +466,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -478,7 +477,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -489,7 +488,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -504,7 +503,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -513,7 +512,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -522,7 +521,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -531,7 +530,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -544,7 +543,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -555,7 +554,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -566,7 +565,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -577,7 +576,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -592,7 +591,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -601,7 +600,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -610,7 +609,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -619,7 +618,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -632,7 +631,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -641,7 +640,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -650,7 +649,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -659,7 +658,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -672,7 +671,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -681,7 +680,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -690,7 +689,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -699,7 +698,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -712,7 +711,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -721,7 +720,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -730,7 +729,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -739,7 +738,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -752,7 +751,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -763,7 +762,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -774,7 +773,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -785,7 +784,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -800,7 +799,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -809,7 +808,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -818,7 +817,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -827,7 +826,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -840,7 +839,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -849,7 +848,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -858,7 +857,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -867,7 +866,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -880,7 +879,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -889,7 +888,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -898,7 +897,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -907,7 +906,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -920,7 +919,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -929,7 +928,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -938,7 +937,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -947,7 +946,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -960,7 +959,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -969,7 +968,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -978,7 +977,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -987,7 +986,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -1000,7 +999,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1009,7 +1008,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1018,7 +1017,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1027,7 +1026,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -1040,7 +1039,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1049,7 +1048,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1058,7 +1057,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1067,7 +1066,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -1080,7 +1079,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1091,7 +1090,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1102,7 +1101,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1113,7 +1112,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1128,7 +1127,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1137,7 +1136,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1146,7 +1145,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1155,7 +1154,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -1168,7 +1167,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1179,7 +1178,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1190,7 +1189,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1201,7 +1200,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1216,7 +1215,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1225,7 +1224,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1234,7 +1233,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1243,15 +1242,11 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dchunk.c"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\src\H5Dcompact.c"

 				>

 				<FileConfiguration

@@ -1260,7 +1255,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1271,7 +1266,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1282,7 +1277,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1293,7 +1288,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1308,7 +1303,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1319,7 +1314,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1330,7 +1325,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1341,7 +1336,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1360,7 +1355,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1369,7 +1364,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1378,7 +1373,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1387,7 +1382,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -1400,7 +1395,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1411,7 +1406,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1422,7 +1417,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1433,7 +1428,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1456,7 +1451,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1467,7 +1462,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1478,7 +1473,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1489,7 +1484,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1504,7 +1499,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1515,7 +1510,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1526,7 +1521,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1537,7 +1532,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1552,7 +1547,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1563,7 +1558,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1574,7 +1569,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1585,7 +1580,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1600,7 +1595,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1609,7 +1604,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1618,7 +1613,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1627,15 +1622,11 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dscatgath.c"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\src\H5Dselect.c"

 				>

 				<FileConfiguration

@@ -1644,7 +1635,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1655,7 +1646,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1666,7 +1657,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1677,7 +1668,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1692,7 +1683,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1703,7 +1694,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1714,7 +1705,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1725,7 +1716,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1740,7 +1731,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1751,7 +1742,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1762,7 +1753,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1773,7 +1764,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1788,7 +1779,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1797,7 +1788,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1806,7 +1797,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1815,7 +1806,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -1828,7 +1819,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1837,7 +1828,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1846,7 +1837,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1855,7 +1846,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -1868,7 +1859,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1879,7 +1870,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1890,7 +1881,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1901,7 +1892,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1916,7 +1907,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1927,7 +1918,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1938,7 +1929,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1949,7 +1940,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1964,7 +1955,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1975,7 +1966,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -1986,7 +1977,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -1997,7 +1988,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2012,7 +2003,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2023,7 +2014,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2034,7 +2025,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2045,7 +2036,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2060,7 +2051,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2071,7 +2062,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2082,7 +2073,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2093,7 +2084,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2108,7 +2099,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2119,7 +2110,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2130,7 +2121,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2141,7 +2132,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2156,7 +2147,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2165,7 +2156,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2174,7 +2165,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2183,7 +2174,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -2196,7 +2187,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2207,7 +2198,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2218,7 +2209,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2229,7 +2220,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2244,7 +2235,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2253,7 +2244,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2262,7 +2253,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2271,7 +2262,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -2284,7 +2275,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2295,7 +2286,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2306,7 +2297,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2317,7 +2308,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2332,7 +2323,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2343,7 +2334,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2354,7 +2345,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2365,7 +2356,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2384,7 +2375,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2395,7 +2386,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2406,7 +2397,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2417,7 +2408,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2432,7 +2423,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2441,7 +2432,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2450,7 +2441,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2459,7 +2450,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -2472,7 +2463,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2481,7 +2472,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2490,7 +2481,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2499,7 +2490,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -2512,7 +2503,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2523,7 +2514,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2534,7 +2525,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2545,7 +2536,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2560,7 +2551,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2569,7 +2560,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2578,7 +2569,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2587,7 +2578,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -2600,7 +2591,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2611,7 +2602,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2622,7 +2613,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2633,7 +2624,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2648,7 +2639,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2657,7 +2648,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2666,7 +2657,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2675,7 +2666,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -2688,7 +2679,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2697,7 +2688,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2706,7 +2697,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2715,7 +2706,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -2728,7 +2719,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2737,7 +2728,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2746,7 +2737,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2755,7 +2746,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -2768,7 +2759,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2777,7 +2768,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2786,7 +2777,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2795,7 +2786,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -2808,7 +2799,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2817,7 +2808,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2826,7 +2817,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2835,7 +2826,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -2848,7 +2839,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2857,7 +2848,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2866,7 +2857,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2875,7 +2866,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -2888,7 +2879,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2897,7 +2888,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2906,7 +2897,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2915,7 +2906,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -2928,7 +2919,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2939,7 +2930,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -2950,7 +2941,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2961,7 +2952,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -2976,7 +2967,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2985,7 +2976,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2994,7 +2985,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3003,7 +2994,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3016,7 +3007,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3025,7 +3016,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3034,7 +3025,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3043,7 +3034,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3056,7 +3047,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3065,7 +3056,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3074,7 +3065,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3083,7 +3074,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3096,7 +3087,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3105,7 +3096,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3114,7 +3105,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3123,7 +3114,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3136,7 +3127,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -3147,7 +3138,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -3158,7 +3149,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -3169,7 +3160,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -3184,7 +3175,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3193,7 +3184,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3202,7 +3193,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3211,7 +3202,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3224,7 +3215,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3233,7 +3224,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3242,7 +3233,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3251,7 +3242,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3264,7 +3255,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3273,7 +3264,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3282,7 +3273,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3291,7 +3282,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3304,7 +3295,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3313,7 +3304,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3322,7 +3313,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3331,7 +3322,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3344,7 +3335,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -3355,7 +3346,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -3366,7 +3357,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -3377,7 +3368,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -3392,7 +3383,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3401,7 +3392,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3410,7 +3401,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3419,7 +3410,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3432,7 +3423,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3441,7 +3432,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3450,7 +3441,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3459,7 +3450,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3472,7 +3463,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -3483,7 +3474,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -3494,7 +3485,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -3505,7 +3496,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -3520,7 +3511,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3529,7 +3520,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3538,7 +3529,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3547,7 +3538,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3560,7 +3551,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3569,7 +3560,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3578,7 +3569,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3587,7 +3578,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3600,7 +3591,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3609,7 +3600,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3618,7 +3609,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3627,7 +3618,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3640,7 +3631,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3649,7 +3640,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3658,7 +3649,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3667,7 +3658,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3680,7 +3671,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3689,7 +3680,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3698,7 +3689,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3707,7 +3698,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3720,7 +3711,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3729,7 +3720,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3738,7 +3729,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3747,7 +3738,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3760,7 +3751,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3769,7 +3760,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3778,7 +3769,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3787,7 +3778,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3800,7 +3791,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3809,7 +3800,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3818,7 +3809,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3827,7 +3818,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3840,7 +3831,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3849,7 +3840,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3858,7 +3849,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3867,7 +3858,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3880,7 +3871,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3889,7 +3880,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3898,7 +3889,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3907,7 +3898,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3920,7 +3911,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3929,7 +3920,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3938,7 +3929,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3947,7 +3938,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3960,7 +3951,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3969,7 +3960,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3978,7 +3969,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -3987,7 +3978,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4000,7 +3991,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4009,7 +4000,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4018,7 +4009,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4027,7 +4018,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4040,7 +4031,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4049,7 +4040,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4058,7 +4049,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4067,7 +4058,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4080,7 +4071,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4089,7 +4080,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4098,7 +4089,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4107,7 +4098,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4120,7 +4111,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4129,7 +4120,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4138,7 +4129,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4147,7 +4138,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4160,7 +4151,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4169,7 +4160,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4178,7 +4169,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4187,7 +4178,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4200,7 +4191,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4209,7 +4200,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4218,7 +4209,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4227,7 +4218,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4240,7 +4231,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4251,7 +4242,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4262,7 +4253,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4273,7 +4264,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4288,7 +4279,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4299,7 +4290,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4310,7 +4301,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4321,7 +4312,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4336,7 +4327,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4347,7 +4338,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4358,7 +4349,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4369,7 +4360,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4384,7 +4375,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4395,7 +4386,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4406,7 +4397,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4417,7 +4408,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4432,7 +4423,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4443,7 +4434,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4454,7 +4445,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4465,7 +4456,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4480,7 +4471,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4491,7 +4482,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4502,7 +4493,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4513,7 +4504,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4528,7 +4519,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4537,7 +4528,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4546,7 +4537,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4555,7 +4546,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4568,7 +4559,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4577,7 +4568,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4586,7 +4577,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4595,7 +4586,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4608,7 +4599,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4619,7 +4610,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4630,7 +4621,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4641,7 +4632,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4656,7 +4647,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4667,7 +4658,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4678,7 +4669,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4689,7 +4680,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4704,7 +4695,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4713,7 +4704,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4722,7 +4713,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4731,7 +4722,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4744,7 +4735,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4753,7 +4744,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4762,7 +4753,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4771,7 +4762,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4784,7 +4775,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4795,7 +4786,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4806,7 +4797,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4817,7 +4808,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4832,7 +4823,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4841,7 +4832,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4850,7 +4841,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4859,7 +4850,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4872,7 +4863,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4881,7 +4872,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4890,7 +4881,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4899,7 +4890,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -4912,7 +4903,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4923,7 +4914,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -4934,7 +4925,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4945,7 +4936,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -4960,7 +4951,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4969,7 +4960,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4978,7 +4969,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -4987,7 +4978,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -5000,7 +4991,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5011,7 +5002,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5022,7 +5013,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5033,7 +5024,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5048,7 +5039,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5057,7 +5048,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5066,7 +5057,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5075,7 +5066,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -5088,7 +5079,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5097,7 +5088,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5106,7 +5097,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5115,7 +5106,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -5128,7 +5119,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5139,7 +5130,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5150,7 +5141,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5161,7 +5152,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5176,7 +5167,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5185,7 +5176,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5194,7 +5185,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5203,7 +5194,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -5216,7 +5207,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5225,7 +5216,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5234,7 +5225,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5243,7 +5234,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -5256,7 +5247,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5265,7 +5256,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5274,7 +5265,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5283,7 +5274,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -5296,7 +5287,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5307,7 +5298,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5318,7 +5309,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5329,7 +5320,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5344,7 +5335,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5355,7 +5346,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5366,7 +5357,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5377,7 +5368,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5392,7 +5383,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5403,7 +5394,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5414,7 +5405,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5425,7 +5416,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5440,7 +5431,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5449,7 +5440,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5458,7 +5449,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5467,7 +5458,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -5480,7 +5471,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5491,7 +5482,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5502,7 +5493,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5513,7 +5504,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5528,7 +5519,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5537,7 +5528,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5546,7 +5537,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5555,7 +5546,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -5568,7 +5559,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5577,7 +5568,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5586,7 +5577,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5595,7 +5586,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -5608,7 +5599,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5617,7 +5608,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5626,7 +5617,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5635,7 +5626,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -5648,7 +5639,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5659,7 +5650,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5670,7 +5661,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5681,7 +5672,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5696,7 +5687,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5707,7 +5698,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5718,7 +5709,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5729,7 +5720,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5744,7 +5735,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5755,7 +5746,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5766,7 +5757,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5777,7 +5768,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5792,7 +5783,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5803,7 +5794,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5814,7 +5805,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5825,7 +5816,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5840,7 +5831,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5849,7 +5840,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5858,7 +5849,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5867,7 +5858,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -5880,7 +5871,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5891,7 +5882,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5902,7 +5893,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5913,7 +5904,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5928,7 +5919,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5939,7 +5930,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -5950,7 +5941,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5961,7 +5952,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -5976,7 +5967,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5985,7 +5976,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -5994,7 +5985,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6003,7 +5994,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -6016,7 +6007,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6027,7 +6018,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6038,7 +6029,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6049,7 +6040,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6064,7 +6055,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6073,7 +6064,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6082,7 +6073,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6091,7 +6082,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -6104,7 +6095,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6113,7 +6104,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6122,7 +6113,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6131,7 +6122,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -6144,7 +6135,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6155,7 +6146,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6166,7 +6157,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6177,7 +6168,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6192,7 +6183,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6201,7 +6192,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6210,7 +6201,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6219,7 +6210,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -6232,7 +6223,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6243,7 +6234,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6254,7 +6245,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6265,7 +6256,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6284,7 +6275,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6295,7 +6286,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6306,7 +6297,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6317,7 +6308,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6332,7 +6323,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6343,7 +6334,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6354,7 +6345,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6365,7 +6356,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6380,7 +6371,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6391,7 +6382,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6402,7 +6393,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6413,7 +6404,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6428,7 +6419,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6437,7 +6428,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6446,7 +6437,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6455,7 +6446,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -6468,7 +6459,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6477,7 +6468,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6486,7 +6477,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6495,7 +6486,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -6512,7 +6503,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6521,7 +6512,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6530,7 +6521,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6539,7 +6530,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -6552,7 +6543,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6561,7 +6552,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6570,7 +6561,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6579,7 +6570,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -6592,7 +6583,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6601,7 +6592,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6610,7 +6601,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6619,7 +6610,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -6632,7 +6623,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6641,7 +6632,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6650,7 +6641,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6659,7 +6650,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -6672,7 +6663,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6681,7 +6672,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6690,7 +6681,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -6699,7 +6690,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -6712,7 +6703,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6723,7 +6714,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6734,7 +6725,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6745,7 +6736,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6760,7 +6751,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6771,7 +6762,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6782,7 +6773,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6793,7 +6784,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6808,7 +6799,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6819,7 +6810,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6830,7 +6821,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6841,7 +6832,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6860,7 +6851,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6871,7 +6862,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6882,7 +6873,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6893,7 +6884,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6908,7 +6899,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6919,7 +6910,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6930,7 +6921,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6941,7 +6932,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6956,7 +6947,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6967,7 +6958,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -6978,7 +6969,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -6989,7 +6980,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7008,7 +6999,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7019,7 +7010,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7030,7 +7021,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7041,7 +7032,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7056,7 +7047,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7067,7 +7058,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7078,7 +7069,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7089,7 +7080,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7104,7 +7095,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7113,7 +7104,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7122,7 +7113,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7131,7 +7122,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -7144,7 +7135,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7153,7 +7144,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7162,7 +7153,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7171,7 +7162,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -7184,7 +7175,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7193,7 +7184,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7202,7 +7193,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7211,7 +7202,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -7224,7 +7215,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7235,7 +7226,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7246,7 +7237,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7257,7 +7248,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7272,7 +7263,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7281,7 +7272,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7290,7 +7281,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7299,7 +7290,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -7312,7 +7303,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7323,7 +7314,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7334,7 +7325,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7345,7 +7336,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7360,7 +7351,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7371,7 +7362,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7382,7 +7373,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7393,7 +7384,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7408,7 +7399,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7419,7 +7410,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7430,7 +7421,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7441,7 +7432,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7456,7 +7447,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7467,7 +7458,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7478,7 +7469,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7489,7 +7480,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7504,7 +7495,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7515,7 +7506,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7526,7 +7517,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7537,7 +7528,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7552,7 +7543,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7561,7 +7552,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7570,7 +7561,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7579,7 +7570,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -7592,7 +7583,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7603,7 +7594,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7614,7 +7605,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7625,7 +7616,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7640,7 +7631,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7651,7 +7642,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7662,7 +7653,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7673,7 +7664,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7688,7 +7679,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7699,7 +7690,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7710,7 +7701,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7721,7 +7712,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7736,7 +7727,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7747,7 +7738,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7758,7 +7749,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7769,7 +7760,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7784,7 +7775,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7795,7 +7786,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7806,7 +7797,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7817,7 +7808,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7832,7 +7823,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7843,7 +7834,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7854,7 +7845,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7865,7 +7856,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7880,7 +7871,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7891,7 +7882,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7902,7 +7893,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7913,7 +7904,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -7932,7 +7923,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7941,7 +7932,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7950,7 +7941,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -7959,7 +7950,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -7972,7 +7963,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7983,7 +7974,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -7994,7 +7985,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8005,7 +7996,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8020,7 +8011,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8031,7 +8022,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8042,7 +8033,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8053,7 +8044,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8068,7 +8059,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8079,7 +8070,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8090,7 +8081,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8101,7 +8092,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8116,7 +8107,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8127,7 +8118,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8138,7 +8129,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8149,7 +8140,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8164,7 +8155,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -8173,7 +8164,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -8182,7 +8173,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -8191,7 +8182,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -8204,7 +8195,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8215,7 +8206,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8226,7 +8217,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8237,7 +8228,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8252,7 +8243,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8263,7 +8254,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8274,7 +8265,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8285,7 +8276,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8300,7 +8291,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8311,7 +8302,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8322,7 +8313,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8333,7 +8324,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8348,7 +8339,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -8357,7 +8348,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -8366,7 +8357,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -8375,7 +8366,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -8388,7 +8379,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8399,7 +8390,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8410,7 +8401,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8421,7 +8412,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8436,7 +8427,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8447,7 +8438,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8458,7 +8449,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8469,7 +8460,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8484,7 +8475,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8495,7 +8486,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8506,7 +8497,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8517,7 +8508,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8532,7 +8523,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8543,7 +8534,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8554,7 +8545,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8565,7 +8556,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8580,7 +8571,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -8589,7 +8580,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -8598,7 +8589,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -8607,7 +8598,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -8620,7 +8611,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8631,7 +8622,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8642,7 +8633,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8653,7 +8644,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8672,7 +8663,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8683,7 +8674,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8694,7 +8685,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8705,7 +8696,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8720,7 +8711,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8731,7 +8722,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8742,7 +8733,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8753,7 +8744,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8772,7 +8763,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8783,7 +8774,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8794,7 +8785,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8805,7 +8796,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8820,7 +8811,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8831,7 +8822,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8842,7 +8833,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8853,7 +8844,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8868,7 +8859,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8879,7 +8870,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8890,7 +8881,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8901,7 +8892,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8916,7 +8907,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8927,7 +8918,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -8938,7 +8929,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8949,7 +8940,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -8964,7 +8955,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -8973,7 +8964,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -8982,7 +8973,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -8991,7 +8982,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -9004,7 +8995,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -9015,7 +9006,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -9026,7 +9017,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -9037,7 +9028,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -9052,7 +9043,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -9063,7 +9054,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -9074,7 +9065,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -9085,7 +9076,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -9100,7 +9091,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -9111,7 +9102,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Debug/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

@@ -9122,7 +9113,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

@@ -9133,7 +9124,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_;$(NoInherit)"

 						ObjectFile="../../../proj/hdf5dll/Release/"

 						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

diff --git a/windows/proj/property_sheets/remove-posix-warnings.vsprops b/windows/proj/property_sheets/remove-posix-warnings.vsprops
deleted file mode 100644
index 9b5a64f..0000000
--- a/windows/proj/property_sheets/remove-posix-warnings.vsprops
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioPropertySheet

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="Remove Posix Warnings"

-	>

-	<Tool

-		Name="VCCLCompilerTool"

-		PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

-	/>

-</VisualStudioPropertySheet>

diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index 0c06901..aaad8be 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -138,10 +138,6 @@ in the file file_io.win32.c and including it on the projects
 
 #endif /* H5_HAVE_WINDOWS */
 
-/* This definition is used for alterative handelling and testing of Windows
-paths.  This shouldn't need to be commented or removed. */
-#define H5_HAVE_WINDOW_PATH 1
-
 /* comment the following line out if you are not using N-bit filter*/
 /* #define H5_HAVE_FILTER_NBIT 1*/
 
diff --git a/windows/test/big/big.vcproj b/windows/test/big/big.vcproj
index 033c226..23670cd 100644
--- a/windows/test/big/big.vcproj
+++ b/windows/test/big/big.vcproj
@@ -22,7 +22,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +77,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/big/Release/big.pdb"

@@ -114,7 +114,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +170,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/big/Release/big.pdb"

@@ -207,7 +207,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -299,7 +299,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/bigdll/bigdll.vcproj b/windows/test/bigdll/bigdll.vcproj
index 2314210..92aedb3 100644
--- a/windows/test/bigdll/bigdll.vcproj
+++ b/windows/test/bigdll/bigdll.vcproj
@@ -22,7 +22,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/bigdll/Debug/bigdll.pdb"

@@ -112,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/bigdll/Debug/bigdll.pdb"

@@ -203,7 +203,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/bigdll/Release/bigdll.pdb"

 				SubSystem="1"

@@ -294,7 +294,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -350,7 +350,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/bigdll/Release/bigdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/bittests/bittests.vcproj b/windows/test/bittests/bittests.vcproj
index 88f0d79..a77e143 100644
--- a/windows/test/bittests/bittests.vcproj
+++ b/windows/test/bittests/bittests.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="bittests"

 	ProjectGUID="{958A5473-0E7C-4FA1-9C2F-AEA0925EF5AD}"

-	RootNamespace="bittests"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/bittests/Release/bittests.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/bittests/Release/bittests.pdb"

diff --git a/windows/test/bittestsdll/bittestsdll.vcproj b/windows/test/bittestsdll/bittestsdll.vcproj
index 1574134..0f4a61e 100644
--- a/windows/test/bittestsdll/bittestsdll.vcproj
+++ b/windows/test/bittestsdll/bittestsdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="bittestsdll"

 	ProjectGUID="{E5C9E235-E10F-4F46-A94F-A112CD8D867E}"

-	RootNamespace="bittestsdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -74,7 +73,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/bittestsdll/Debug/bittestsdll.pdb"

@@ -111,7 +110,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -164,7 +163,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/bittestsdll/Debug/bittestsdll.pdb"

@@ -201,7 +200,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -255,7 +254,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/bittestsdll/Release/bittestsdll.pdb"

 				SubSystem="1"

@@ -291,7 +290,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -346,7 +345,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/bittestsdll/Release/bittestsdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/btree2/btree2.vcproj b/windows/test/btree2/btree2.vcproj
index 317ed03..85ba55f 100644
--- a/windows/test/btree2/btree2.vcproj
+++ b/windows/test/btree2/btree2.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="btree2"

 	ProjectGUID="{8CE6FF9D-8A14-4A45-971A-18972109AC9D}"

-	RootNamespace="btree2"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/btree2/Release/btree2.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/btree2/Release/btree2.pdb"

diff --git a/windows/test/btree2dll/btree2dll.vcproj b/windows/test/btree2dll/btree2dll.vcproj
index a4e1e37..653df2e 100644
--- a/windows/test/btree2dll/btree2dll.vcproj
+++ b/windows/test/btree2dll/btree2dll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="btree2dll"

 	ProjectGUID="{34EEE194-B77E-453E-9C59-252C0421188A}"

-	RootNamespace="btree2dll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/btree2dll/Debug/btree2dll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/btree2dll/Debug/btree2dll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/btree2dll/Release/btree2dll.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/btree2dll/Release/btree2dll.pdb"

 				SubSystem="1"

diff --git a/windows/test/cache/cache.vcproj b/windows/test/cache/cache.vcproj
index d323ed3..db8672d 100644
--- a/windows/test/cache/cache.vcproj
+++ b/windows/test/cache/cache.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="cache"

 	ProjectGUID="{4BAFED6D-07B4-465D-8C93-81A1C2EF02E0}"

-	RootNamespace="cache"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/cache/Release/cache.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/cache/Release/cache.pdb"

diff --git a/windows/test/cache_api/cache_api.vcproj b/windows/test/cache_api/cache_api.vcproj
index 962dc1a..1741435 100644
--- a/windows/test/cache_api/cache_api.vcproj
+++ b/windows/test/cache_api/cache_api.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="cache_api"

 	ProjectGUID="{4F8B23C1-9832-4C3B-A836-2FBB53F628A0}"

-	RootNamespace="cache_api"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/cache_api/Release/cache_api.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/cache_api/Release/cache_api.pdb"

diff --git a/windows/test/cache_apidll/cache_apidll.vcproj b/windows/test/cache_apidll/cache_apidll.vcproj
index c785314..f4df329 100644
--- a/windows/test/cache_apidll/cache_apidll.vcproj
+++ b/windows/test/cache_apidll/cache_apidll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="cache_apidll"

 	ProjectGUID="{EB5DE4FB-CC65-47BF-9D94-AC96B01B6A33}"

-	RootNamespace="cache_apidll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/cache_apidll/Release/cache_apidll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/cache_apidll/Release/cache_apidll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/cache_apidll/Debug/cache_apidll.pdb"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -351,7 +350,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/cache_apidll/Debug/cache_apidll.pdb"

diff --git a/windows/test/cachedll/cachedll.vcproj b/windows/test/cachedll/cachedll.vcproj
index 998f300..ab23684 100644
--- a/windows/test/cachedll/cachedll.vcproj
+++ b/windows/test/cachedll/cachedll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="cachedll"

 	ProjectGUID="{D0CEF98C-07B5-4A8A-9153-43FDF6B5F169}"

-	RootNamespace="cachedll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/cachedll/Debug/cachedll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/cachedll/Debug/cachedll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/cachedll/Release/cachedll.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/cachedll/Release/cachedll.pdb"

 				SubSystem="1"

diff --git a/windows/test/chunk/chunk.vcproj b/windows/test/chunk/chunk.vcproj
index f484304..20d9c26 100644
--- a/windows/test/chunk/chunk.vcproj
+++ b/windows/test/chunk/chunk.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="chunk"

 	ProjectGUID="{57A5C559-F1BD-49F1-9B5E-13591D22FD75}"

-	RootNamespace="chunk"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/chunk/Release/chunk.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/chunk/Release/chunk.pdb"

diff --git a/windows/test/chunk_info/chunk_info.vcproj b/windows/test/chunk_info/chunk_info.vcproj
deleted file mode 100644
index 0a6ad56..0000000
--- a/windows/test/chunk_info/chunk_info.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="chunk_info"

-	ProjectGUID="{E3B24219-DEB9-4ECB-809C-AD98EE51974E}"

-	RootNamespace="chunk_info"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				LinkIncremental="0"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				LinkIncremental="0"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				LinkIncremental="0"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				LinkIncremental="0"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\test\chunk_info.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/test/chunk_infodll/chunk_infodll.vcproj b/windows/test/chunk_infodll/chunk_infodll.vcproj
deleted file mode 100644
index 43eb32e..0000000
--- a/windows/test/chunk_infodll/chunk_infodll.vcproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="chunk_infodll"

-	ProjectGUID="{D6FB6925-671E-47C1-97AD-DFC6F2E3F72D}"

-	RootNamespace="chunk_infodll"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				LinkIncremental="0"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				LinkIncremental="0"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			InheritedPropertySheets="..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				LinkIncremental="0"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="..\..\proj\property_sheets\remove-posix-warnings.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				LinkIncremental="0"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\test\chunk_info.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows/test/chunkdll/chunkdll.vcproj b/windows/test/chunkdll/chunkdll.vcproj
index 18749a9..cd72770 100644
--- a/windows/test/chunkdll/chunkdll.vcproj
+++ b/windows/test/chunkdll/chunkdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="chunkdll"

 	ProjectGUID="{4941199C-EB11-460D-8EF7-9F68293AE202}"

-	RootNamespace="chunkdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -74,7 +73,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/chunkdll/Debug/chunkdll.pdb"

@@ -111,7 +110,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -164,7 +163,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/chunkdll/Debug/chunkdll.pdb"

@@ -201,7 +200,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -255,7 +254,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/chunkdll/Release/chunkdll.pdb"

 				SubSystem="1"

@@ -291,7 +290,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -346,7 +345,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/chunkdll/Release/chunkdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/cmpd_dset/cmpd_dset.vcproj b/windows/test/cmpd_dset/cmpd_dset.vcproj
index 9b2a188..c165945 100644
--- a/windows/test/cmpd_dset/cmpd_dset.vcproj
+++ b/windows/test/cmpd_dset/cmpd_dset.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="cmpd_dset"

 	ProjectGUID="{BA86B1FE-8CA7-4A96-9FD0-11941F885589}"

-	RootNamespace="cmpd_dset"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/cmpd_dset/Release/cmpd_dset.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/cmpd_dset/Release/cmpd_dset.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/cmpd_dsetdll/cmpd_dsetdll.vcproj b/windows/test/cmpd_dsetdll/cmpd_dsetdll.vcproj
index 8f4044c..f31e902 100644
--- a/windows/test/cmpd_dsetdll/cmpd_dsetdll.vcproj
+++ b/windows/test/cmpd_dsetdll/cmpd_dsetdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="cmpd_dsetdll"

 	ProjectGUID="{8F4417C5-2F4A-4070-88F9-0AFDB0F8EA14}"

-	RootNamespace="cmpd_dsetdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/cmpd_dsetdll/Release/cmpd_dsetdll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/cmpd_dsetdll/Release/cmpd_dsetdll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/cmpd_dsetdll/Debug/cmpd_dsetdll.pdb"

@@ -295,7 +294,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -349,7 +348,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/cmpd_dsetdll/Debug/cmpd_dsetdll.pdb"

diff --git a/windows/test/cross_read/cross_read.vcproj b/windows/test/cross_read/cross_read.vcproj
index 08db1eb..8c85a10 100644
--- a/windows/test/cross_read/cross_read.vcproj
+++ b/windows/test/cross_read/cross_read.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="cross_read"

 	ProjectGUID="{68A52165-E0EF-4019-B658-1AC734649955}"

-	RootNamespace="cross_read"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/cross_read/Release/cross_read.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/cross_read/Release/cross_read.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +260,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/cross_readdll/cross_readdll.vcproj b/windows/test/cross_readdll/cross_readdll.vcproj
index e3c4adb..1b55b85 100644
--- a/windows/test/cross_readdll/cross_readdll.vcproj
+++ b/windows/test/cross_readdll/cross_readdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="cross_readdll"

 	ProjectGUID="{E1F98D07-4724-46CB-B327-5677C1C9266D}"

-	RootNamespace="cross_readdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/cross_readdll/Debug/cross_readdll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/cross_readdll/Debug/cross_readdll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/cross_readdll/Release/cross_readdll.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/cross_readdll/Release/cross_readdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/dangle/dangle.vcproj b/windows/test/dangle/dangle.vcproj
index 325427d..5375162 100644
--- a/windows/test/dangle/dangle.vcproj
+++ b/windows/test/dangle/dangle.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="dangle"

 	ProjectGUID="{8C6D9C00-44A9-432F-B695-F56439C1B288}"

-	RootNamespace="dangle"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/dangle/Release/dangle.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/dangle/Release/dangle.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +260,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/dangledll/dangledll.vcproj b/windows/test/dangledll/dangledll.vcproj
index 2bac00a..5ac7c56 100644
--- a/windows/test/dangledll/dangledll.vcproj
+++ b/windows/test/dangledll/dangledll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="dangledll"

 	ProjectGUID="{D15E5D9B-A1A6-4935-889C-D880FD0068CE}"

-	RootNamespace="dangledll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/dangledll/Debug/dangledll.pdb"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +165,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/dangledll/Debug/dangledll.pdb"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -257,7 +256,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/dangledll/Release/dangledll.pdb"

 				SubSystem="1"

@@ -293,7 +292,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -348,7 +347,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/dangledll/Release/dangledll.pdb"

 				SubSystem="1"

diff --git a/windows/test/dsets/dsets.vcproj b/windows/test/dsets/dsets.vcproj
index 1bed8f9..c1b62af 100644
--- a/windows/test/dsets/dsets.vcproj
+++ b/windows/test/dsets/dsets.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="dsets"

 	ProjectGUID="{A90ADD88-DA1B-4642-A97B-37DF89433858}"

-	RootNamespace="dsets"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/dsets/Release/dsets.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/dsets/Release/dsets.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/dsetsdll/dsetsdll.vcproj b/windows/test/dsetsdll/dsetsdll.vcproj
index 21072c2..783e2cc 100644
--- a/windows/test/dsetsdll/dsetsdll.vcproj
+++ b/windows/test/dsetsdll/dsetsdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="dsetsdll"

 	ProjectGUID="{1B298EEC-0B47-4145-88AA-C6558E0BD993}"

-	RootNamespace="dsetsdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/dsetsdll/Debug/dsetsdll.pdb"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +165,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/dsetsdll/Debug/dsetsdll.pdb"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/dsetsdll/Release/dsetsdll.pdb"

 				SubSystem="1"

@@ -294,7 +293,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -350,7 +349,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/dsetsdll/Release/dsetsdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/dt_arith/dt_arith.vcproj b/windows/test/dt_arith/dt_arith.vcproj
index 8b4b44c..962570f 100644
--- a/windows/test/dt_arith/dt_arith.vcproj
+++ b/windows/test/dt_arith/dt_arith.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="dt_arith"

 	ProjectGUID="{AE5D4766-9668-4EB5-B801-5DF8F53363FC}"

-	RootNamespace="dt_arith"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/dt_arith/Release/dt_arith.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/dt_arith/Release/dt_arith.pdb"

diff --git a/windows/test/dt_arithdll/dt_arithdll.vcproj b/windows/test/dt_arithdll/dt_arithdll.vcproj
index c605132..4932946 100644
--- a/windows/test/dt_arithdll/dt_arithdll.vcproj
+++ b/windows/test/dt_arithdll/dt_arithdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="dt_arithdll"

 	ProjectGUID="{3E41969B-D69B-4235-B192-A94F7853D869}"

-	RootNamespace="dt_arithdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/dt_arithdll/Debug/dt_arithdll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/dt_arithdll/Debug/dt_arithdll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/dt_arithdll/Release/dt_arithdll.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/dt_arithdll/Release/dt_arithdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/dtransform/dtransform.vcproj b/windows/test/dtransform/dtransform.vcproj
index c07286a..4a448de 100644
--- a/windows/test/dtransform/dtransform.vcproj
+++ b/windows/test/dtransform/dtransform.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="dtransform"

 	ProjectGUID="{F5109F4B-5869-40A7-BC6A-8130CA4BB987}"

-	RootNamespace="dtransform"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/dtransform/Release/dtransform.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/dtransform/Release/dtransform.pdb"

diff --git a/windows/test/dtransformdll/dtransformdll.vcproj b/windows/test/dtransformdll/dtransformdll.vcproj
index 79327d9..f78cd14 100644
--- a/windows/test/dtransformdll/dtransformdll.vcproj
+++ b/windows/test/dtransformdll/dtransformdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="dtransformdll"

 	ProjectGUID="{0E0F449A-7998-4113-BDD2-A74E0B6D3466}"

-	RootNamespace="dtransformdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/dtransformdll/Debug/dtransformdll.pdb"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +165,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/dtransformdll/Debug/dtransformdll.pdb"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -257,7 +256,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/dtransformdll/Release/dtransformdll.pdb"

 				SubSystem="1"

@@ -293,7 +292,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -348,7 +347,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/dtransformdll/Release/dtransformdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/dtypes/dtypes.vcproj b/windows/test/dtypes/dtypes.vcproj
index c859e79..e7423db 100644
--- a/windows/test/dtypes/dtypes.vcproj
+++ b/windows/test/dtypes/dtypes.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="dtypes"

 	ProjectGUID="{4AC79406-D6E0-43B3-82B0-7A032FABB52A}"

-	RootNamespace="dtypes"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/dtypes/Release/dtypes.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/dtypes/Release/dtypes.pdb"

diff --git a/windows/test/dtypesdll/dtypesdll.vcproj b/windows/test/dtypesdll/dtypesdll.vcproj
index b765061..bcaf0cf 100644
--- a/windows/test/dtypesdll/dtypesdll.vcproj
+++ b/windows/test/dtypesdll/dtypesdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="dtypesdll"

 	ProjectGUID="{AE50F8BA-5FAC-47CC-A5A0-7F1E55C413E3}"

-	RootNamespace="dtypesdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/dtypesdll/Debug/dtypesdll.pdb"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +165,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/dtypesdll/Debug/dtypesdll.pdb"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/dtypesdll/Release/dtypesdll.pdb"

 				SubSystem="1"

@@ -294,7 +293,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -350,7 +349,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/dtypesdll/Release/dtypesdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/enum/enum.vcproj b/windows/test/enum/enum.vcproj
index f23c4b3..1d8d7ea 100644
--- a/windows/test/enum/enum.vcproj
+++ b/windows/test/enum/enum.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="enum"

 	ProjectGUID="{FD8B058E-F53A-4197-B75E-849904E5AA79}"

-	RootNamespace="enum"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/enum/Release/enum.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/enum/Release/enum.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/enumdll/enumdll.vcproj b/windows/test/enumdll/enumdll.vcproj
index bbd22dd..4cb1fe4 100644
--- a/windows/test/enumdll/enumdll.vcproj
+++ b/windows/test/enumdll/enumdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="enumdll"

 	ProjectGUID="{D8D53F43-41EE-486A-8DBD-956D8CD072E8}"

-	RootNamespace="enumdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/enumdll/Release/enumdll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/enumdll/Release/enumdll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/enumdll/Debug/enumdll.pdb"

@@ -295,7 +294,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -349,7 +348,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/enumdll/Debug/enumdll.pdb"

diff --git a/windows/test/err_compat/err_compat.vcproj b/windows/test/err_compat/err_compat.vcproj
index 861d007..647377f 100644
--- a/windows/test/err_compat/err_compat.vcproj
+++ b/windows/test/err_compat/err_compat.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="err_compat"

 	ProjectGUID="{265C41B2-30D7-4FF8-A08C-B997363DA763}"

-	RootNamespace="err_compat"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/err_compat/Release/err_compat.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/err_compat/Release/err_compat.pdb"

diff --git a/windows/test/err_compatdll/err_compatdll.vcproj b/windows/test/err_compatdll/err_compatdll.vcproj
index bf8ebfb..66d7797 100644
--- a/windows/test/err_compatdll/err_compatdll.vcproj
+++ b/windows/test/err_compatdll/err_compatdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="err_compatdll"

 	ProjectGUID="{309CE6F8-4658-44CB-8E99-0B86DCA77EFC}"

-	RootNamespace="err_compatdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/err_compatdll/Debug/err_compatdll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/err_compatdll/Debug/err_compatdll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/err_compatdll/Release/err_compatdll.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/err_compatdll/Release/err_compatdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/error_test/error_test.vcproj b/windows/test/error_test/error_test.vcproj
index bacea65..7369798 100644
--- a/windows/test/error_test/error_test.vcproj
+++ b/windows/test/error_test/error_test.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="error_test"

 	ProjectGUID="{7ABA5DD5-77E7-42D3-9C29-84A13B0CAA91}"

-	RootNamespace="error_test"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/error_test/Release/error_test.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/error_test/Release/error_test.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +260,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/error_testdll/error_testdll.vcproj b/windows/test/error_testdll/error_testdll.vcproj
index 8b32320..6a6fa51 100644
--- a/windows/test/error_testdll/error_testdll.vcproj
+++ b/windows/test/error_testdll/error_testdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="error_testdll"

 	ProjectGUID="{55894CDC-C220-40FE-B403-D74EAC6EBACF}"

-	RootNamespace="error_testdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/error_testdll/Debug/error_testdll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/error_testdll/Debug/error_testdll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/error_testdll/Release/error_testdll.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/error_testdll/Release/error_testdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/extend/extend.vcproj b/windows/test/extend/extend.vcproj
index a5812c1..a090aaa 100644
--- a/windows/test/extend/extend.vcproj
+++ b/windows/test/extend/extend.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="extend"

 	ProjectGUID="{8708E58C-F990-4B6C-AD83-745CA9582E92}"

-	RootNamespace="extend"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/extend/Release/extend.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/extend/Release/extend.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/extenddll/extenddll.vcproj b/windows/test/extenddll/extenddll.vcproj
index 38633a5..0dd847e 100644
--- a/windows/test/extenddll/extenddll.vcproj
+++ b/windows/test/extenddll/extenddll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="extenddll"

 	ProjectGUID="{76FFD0F6-3D5F-4826-A3BA-DEE92084FA27}"

-	RootNamespace="extenddll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/extenddll/Debug/extenddll.pdb"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +165,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/extenddll/Debug/extenddll.pdb"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/extenddll/Release/extenddll.pdb"

 				SubSystem="1"

@@ -294,7 +293,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -350,7 +349,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/extenddll/Release/extenddll.pdb"

 				SubSystem="1"

diff --git a/windows/test/external/external.vcproj b/windows/test/external/external.vcproj
index d300c9d..65fc50a 100644
--- a/windows/test/external/external.vcproj
+++ b/windows/test/external/external.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="external"

 	ProjectGUID="{7D293021-0601-498B-91B8-C49580EFB08D}"

-	RootNamespace="external"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/external/Release/external.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/external/Release/external.pdb"

diff --git a/windows/test/externaldll/externaldll.vcproj b/windows/test/externaldll/externaldll.vcproj
index d7a8a38..ce26c70 100644
--- a/windows/test/externaldll/externaldll.vcproj
+++ b/windows/test/externaldll/externaldll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="externaldll"

 	ProjectGUID="{0CB771D6-9CAB-4799-A7B1-5D89E436E6AF}"

-	RootNamespace="externaldll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/externaldll/Release/externaldll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/externaldll/Release/externaldll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/externaldll/Debug/externaldll.pdb"

@@ -295,7 +294,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -349,7 +348,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/externaldll/Debug/externaldll.pdb"

diff --git a/windows/test/fheap/fheap.vcproj b/windows/test/fheap/fheap.vcproj
index 5ddc9c2..b4456fd 100644
--- a/windows/test/fheap/fheap.vcproj
+++ b/windows/test/fheap/fheap.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="fheap"

 	ProjectGUID="{AACD0537-E8F3-4F0F-A0E6-B99C0F4EF892}"

-	RootNamespace="fheap"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/fheap/Release/fheap.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/fheap/Release/fheap.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +260,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/fheapdll/fheapdll.vcproj b/windows/test/fheapdll/fheapdll.vcproj
index a1135d5..73923b0 100644
--- a/windows/test/fheapdll/fheapdll.vcproj
+++ b/windows/test/fheapdll/fheapdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="fheapdll"

 	ProjectGUID="{CEBB9980-4B77-4105-BFEB-4DCDBB1F5E35}"

-	RootNamespace="fheapdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/fheapdll/Release/fheapdll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/fheapdll/Release/fheapdll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/fheapdll/Debug/fheapdll.pdb"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -351,7 +350,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/fheapdll/Debug/fheapdll.pdb"

diff --git a/windows/test/fillval/fillval.vcproj b/windows/test/fillval/fillval.vcproj
index aa27f18..2237491 100644
--- a/windows/test/fillval/fillval.vcproj
+++ b/windows/test/fillval/fillval.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="fillval"

 	ProjectGUID="{CAC1F1E8-55D5-4CC6-857E-F01E59FB8098}"

-	RootNamespace="fillval"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/fillval/Release/fillval.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/fillval/Release/fillval.pdb"

diff --git a/windows/test/fillvaldll/fillvaldll.vcproj b/windows/test/fillvaldll/fillvaldll.vcproj
index 1436036..e32647a 100644
--- a/windows/test/fillvaldll/fillvaldll.vcproj
+++ b/windows/test/fillvaldll/fillvaldll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="fillvaldll"

 	ProjectGUID="{0CB176F2-1FA9-467A-986D-512FAD8144B0}"

-	RootNamespace="fillvaldll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/fillvaldll/Release/fillvaldll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/fillvaldll/Release/fillvaldll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/fillvaldll/Debug/fillvaldll.pdb"

@@ -295,7 +294,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -349,7 +348,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/fillvaldll/Debug/fillvaldll.pdb"

diff --git a/windows/test/flush1/flush1.vcproj b/windows/test/flush1/flush1.vcproj
index c951019..56351ef 100644
--- a/windows/test/flush1/flush1.vcproj
+++ b/windows/test/flush1/flush1.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="flush1"

 	ProjectGUID="{364FF608-7969-4ED1-95B2-8592872F8264}"

-	RootNamespace="flush1"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/flush1/Release/flush1.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/flush1/Release/flush1.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/flush1dll/flush1dll.vcproj b/windows/test/flush1dll/flush1dll.vcproj
index 88c13b8..541547e 100644
--- a/windows/test/flush1dll/flush1dll.vcproj
+++ b/windows/test/flush1dll/flush1dll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="flush1dll"

 	ProjectGUID="{B36344D1-122C-4BC6-A292-CC82F74CBB0A}"

-	RootNamespace="flush1dll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/flush1dll/Debug/flush1dll.pdb"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +165,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/flush1dll/Debug/flush1dll.pdb"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/flush1dll/Release/flush1dll.pdb"

 				SubSystem="1"

@@ -294,7 +293,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -350,7 +349,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/flush1dll/Release/flush1dll.pdb"

 				SubSystem="1"

diff --git a/windows/test/flush2/flush2.vcproj b/windows/test/flush2/flush2.vcproj
index 8c8d17b..e09f511 100644
--- a/windows/test/flush2/flush2.vcproj
+++ b/windows/test/flush2/flush2.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="flush2"

 	ProjectGUID="{E9F8FC85-8508-4FE7-9BB0-C0494A71BA1B}"

-	RootNamespace="flush2"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/flush2/Release/flush2.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/flush2/Release/flush2.pdb"

diff --git a/windows/test/flush2dll/flush2dll.vcproj b/windows/test/flush2dll/flush2dll.vcproj
index 0d3f054..baed447 100644
--- a/windows/test/flush2dll/flush2dll.vcproj
+++ b/windows/test/flush2dll/flush2dll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="flush2dll"

 	ProjectGUID="{F4386ECB-D688-4C18-A091-673F1F8A96E7}"

-	RootNamespace="flush2dll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/flush2dll/Debug/flush2dll.pdb"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +165,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/flush2dll/Debug/flush2dll.pdb"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/flush2dll/Release/flush2dll.pdb"

 				SubSystem="1"

@@ -294,7 +293,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -350,7 +349,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/flush2dll/Release/flush2dll.pdb"

 				SubSystem="1"

diff --git a/windows/test/getname/getname.vcproj b/windows/test/getname/getname.vcproj
index 13a00dd..0d42d0a 100644
--- a/windows/test/getname/getname.vcproj
+++ b/windows/test/getname/getname.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="getname"

 	ProjectGUID="{B21CA611-6DAE-4051-8B4C-989E135711B1}"

-	RootNamespace="getname"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/getname/Release/getname.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/getname/Release/getname.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +260,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/getnamedll/getnamedll.vcproj b/windows/test/getnamedll/getnamedll.vcproj
index 3aef1df..661e408 100644
--- a/windows/test/getnamedll/getnamedll.vcproj
+++ b/windows/test/getnamedll/getnamedll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="getnamedll"

 	ProjectGUID="{80892339-F6CE-4E96-B61B-131095F2612D}"

-	RootNamespace="getnamedll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				ProgramDatabaseFile=".\../../../test/getnamedll/Release/getnamedll.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				ProgramDatabaseFile=".\../../../test/getnamedll/Release/getnamedll.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +260,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				GenerateDebugInformation="true"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/getub/getub.vcproj b/windows/test/getub/getub.vcproj
index d053aa1..0935229 100644
--- a/windows/test/getub/getub.vcproj
+++ b/windows/test/getub/getub.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="getub"

 	ProjectGUID="{2FC5DAE1-36D6-4783-A0F9-96D0B37687A8}"

-	RootNamespace="getub"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/getub/Release/getub.pdb"

 				SubSystem="1"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/getub/Release/getub.pdb"

 				SubSystem="1"

diff --git a/windows/test/gheap/gheap.vcproj b/windows/test/gheap/gheap.vcproj
index 4691880..013d8fd 100644
--- a/windows/test/gheap/gheap.vcproj
+++ b/windows/test/gheap/gheap.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="gheap"

 	ProjectGUID="{9FCBE814-3818-4F1A-975D-05BAF6FF432F}"

-	RootNamespace="gheap"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/gheap/Release/gheap.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/gheap/Release/gheap.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/gheapdll/gheapdll.vcproj b/windows/test/gheapdll/gheapdll.vcproj
index 972f353..8c3ab87 100644
--- a/windows/test/gheapdll/gheapdll.vcproj
+++ b/windows/test/gheapdll/gheapdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="gheapdll"

 	ProjectGUID="{0DA16B6F-0156-417A-9093-589D55BB066C}"

-	RootNamespace="gheapdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/gheapdll/Release/gheapdll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/gheapdll/Release/gheapdll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/gheapdll/Debug/gheapdll.pdb"

@@ -295,7 +294,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -349,7 +348,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/gheapdll/Debug/gheapdll.pdb"

diff --git a/windows/test/hyperslab/hyperslab.vcproj b/windows/test/hyperslab/hyperslab.vcproj
index b52426c..dd72667 100644
--- a/windows/test/hyperslab/hyperslab.vcproj
+++ b/windows/test/hyperslab/hyperslab.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hyperslab"

 	ProjectGUID="{1AB767EA-546C-4F72-BC1F-6AA0458512D8}"

-	RootNamespace="hyperslab"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/hyperslab/Release/hyperslab.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/hyperslab/Release/hyperslab.pdb"

diff --git a/windows/test/hyperslabdll/hyperslabdll.vcproj b/windows/test/hyperslabdll/hyperslabdll.vcproj
index 0c5f2d8..0ea17e8 100644
--- a/windows/test/hyperslabdll/hyperslabdll.vcproj
+++ b/windows/test/hyperslabdll/hyperslabdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="hyperslabdll"

 	ProjectGUID="{CEA44545-33C8-4C63-9F8C-85BA48F45637}"

-	RootNamespace="hyperslabdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/hyperslabdll/Release/hyperslabdll.pdb"

 				SubSystem="1"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/hyperslabdll/Release/hyperslabdll.pdb"

 				SubSystem="1"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -255,7 +254,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/hyperslabdll/Debug/hyperslabdll.pdb"

@@ -292,7 +291,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -345,7 +344,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/hyperslabdll/Debug/hyperslabdll.pdb"

diff --git a/windows/test/iopipe/iopipe.vcproj b/windows/test/iopipe/iopipe.vcproj
index ef46bb1..26bfd6c 100644
--- a/windows/test/iopipe/iopipe.vcproj
+++ b/windows/test/iopipe/iopipe.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="iopipe"

 	ProjectGUID="{73B78F11-3DCC-4A00-B4A6-E5A8FAE9DD90}"

-	RootNamespace="iopipe"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/iopipe/Release/iopipe.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/iopipe/Release/iopipe.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/iopipedll/iopipedll.vcproj b/windows/test/iopipedll/iopipedll.vcproj
index 9954085..11525c4 100644
--- a/windows/test/iopipedll/iopipedll.vcproj
+++ b/windows/test/iopipedll/iopipedll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="iopipedll"

 	ProjectGUID="{4E8105F2-56D4-45D6-9017-706F804052E7}"

-	RootNamespace="iopipedll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -74,7 +73,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/iopipedll/Debug/iopipedll.pdb"

@@ -111,7 +110,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -164,7 +163,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/iopipedll/Debug/iopipedll.pdb"

@@ -201,7 +200,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -255,7 +254,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/iopipedll/Release/iopipedll.pdb"

 				SubSystem="1"

@@ -291,7 +290,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -346,7 +345,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/iopipedll/Release/iopipedll.pdb"

 				SubSystem="1"

diff --git a/windows/test/istore/istore.vcproj b/windows/test/istore/istore.vcproj
index 79e9ad1..009c50c 100644
--- a/windows/test/istore/istore.vcproj
+++ b/windows/test/istore/istore.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="istore"

 	ProjectGUID="{C4BA3E66-2310-43E7-B30A-ABDCCF44D823}"

-	RootNamespace="istore"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/istore/Release/istore.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/istore/Release/istore.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/istoredll/istoredll.vcproj b/windows/test/istoredll/istoredll.vcproj
index 0b8dc13..d299866 100644
--- a/windows/test/istoredll/istoredll.vcproj
+++ b/windows/test/istoredll/istoredll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="istoredll"

 	ProjectGUID="{BE4FFA8B-2988-4888-A9B9-DD108BCBA8A6}"

-	RootNamespace="istoredll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/istoredll/Release/istoredll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/istoredll/Release/istoredll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/istoredll/Debug/istoredll.pdb"

@@ -295,7 +294,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -349,7 +348,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/istoredll/Debug/istoredll.pdb"

diff --git a/windows/test/lheap/lheap.vcproj b/windows/test/lheap/lheap.vcproj
index 857afb2..98663ab 100644
--- a/windows/test/lheap/lheap.vcproj
+++ b/windows/test/lheap/lheap.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="lheap"

 	ProjectGUID="{5A90FD64-6EED-45E1-A147-D9FE72788570}"

-	RootNamespace="lheap"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/lheap/Release/lheap.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/lheap/Release/lheap.pdb"

diff --git a/windows/test/lheapdll/lheapdll.vcproj b/windows/test/lheapdll/lheapdll.vcproj
index 20d6638..ccd7c9b 100644
--- a/windows/test/lheapdll/lheapdll.vcproj
+++ b/windows/test/lheapdll/lheapdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="lheapdll"

 	ProjectGUID="{E02CDAAC-05F4-436B-B245-2A402FFA131F}"

-	RootNamespace="lheapdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/lheapdll/Release/lheapdll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/lheapdll/Release/lheapdll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/lheapdll/Debug/lheapdll.pdb"

@@ -295,7 +294,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -349,7 +348,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/lheapdll/Debug/lheapdll.pdb"

diff --git a/windows/test/libtest/libtest.vcproj b/windows/test/libtest/libtest.vcproj
index d309d2a..46bec2b 100644
--- a/windows/test/libtest/libtest.vcproj
+++ b/windows/test/libtest/libtest.vcproj
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -95,7 +95,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +170,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -245,7 +245,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

diff --git a/windows/test/libtestdll/libtestdll.vcproj b/windows/test/libtestdll/libtestdll.vcproj
index a41edfb..409d731 100644
--- a/windows/test/libtestdll/libtestdll.vcproj
+++ b/windows/test/libtestdll/libtestdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="libtestdll"

 	ProjectGUID="{54BDA057-C716-4807-A35E-73185DCB236D}"

-	RootNamespace="libtestdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -80,7 +79,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\libtestdll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -118,7 +117,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -176,7 +175,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\libtestdll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

@@ -214,7 +213,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -271,7 +270,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\libtestddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -310,7 +309,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -367,7 +366,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\libtestddll.dll"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ManifestFile="$(TargetPath).intermediate.manifest"

 				GenerateDebugInformation="true"

@@ -419,7 +418,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -429,7 +428,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -439,7 +438,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -450,7 +449,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -465,7 +464,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -475,7 +474,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_;$(NoInherit)"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -485,7 +484,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

@@ -496,7 +495,7 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_;_HDF5TESTDLL_;$(NoInherit)"

 						BasicRuntimeChecks="3"

 					/>

 				</FileConfiguration>

diff --git a/windows/test/links/links.vcproj b/windows/test/links/links.vcproj
index ec0800f..ffd17b7 100644
--- a/windows/test/links/links.vcproj
+++ b/windows/test/links/links.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="links"

 	ProjectGUID="{8792D377-8105-4C67-87F1-115E48D0178F}"

-	RootNamespace="links"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/links/Release/links.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/links/Release/links.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/linksdll/linksdll.vcproj b/windows/test/linksdll/linksdll.vcproj
index 557cccc..7375b30 100644
--- a/windows/test/linksdll/linksdll.vcproj
+++ b/windows/test/linksdll/linksdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="linksdll"

 	ProjectGUID="{27CCFE35-61A5-434F-8B83-9A40AE2AE8C5}"

-	RootNamespace="linksdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/linksdll/Debug/linksdll.pdb"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +165,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/linksdll/Debug/linksdll.pdb"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/linksdll/Release/linksdll.pdb"

 				SubSystem="1"

@@ -294,7 +293,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -350,7 +349,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/linksdll/Release/linksdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/mount/mount.vcproj b/windows/test/mount/mount.vcproj
index 78ce772..fc14408 100644
--- a/windows/test/mount/mount.vcproj
+++ b/windows/test/mount/mount.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="mount"

 	ProjectGUID="{4EE91AD5-8332-4FD3-A5E3-BF4C145BB53A}"

-	RootNamespace="mount"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/mount/Release/mount.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/mount/Release/mount.pdb"

diff --git a/windows/test/mountdll/mountdll.vcproj b/windows/test/mountdll/mountdll.vcproj
index 2bf4cde..93bfa98 100644
--- a/windows/test/mountdll/mountdll.vcproj
+++ b/windows/test/mountdll/mountdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="mountdll"

 	ProjectGUID="{CE7C4168-68A6-43B2-BAE7-B2CF857C8F03}"

-	RootNamespace="mountdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/mountdll/Debug/mountdll.pdb"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +165,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/mountdll/Debug/mountdll.pdb"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/mountdll/Release/mountdll.pdb"

 				SubSystem="1"

@@ -294,7 +293,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -350,7 +349,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/mountdll/Release/mountdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/mtime/mtime.vcproj b/windows/test/mtime/mtime.vcproj
index 0490df9..f863f98 100644
--- a/windows/test/mtime/mtime.vcproj
+++ b/windows/test/mtime/mtime.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="mtime"

 	ProjectGUID="{40EBF7DB-330C-4F56-AE68-9FC7D75CB5D5}"

-	RootNamespace="mtime"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/mtime/Release/mtime.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/mtime/Release/mtime.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/mtimedll/mtimedll.vcproj b/windows/test/mtimedll/mtimedll.vcproj
index 03c33d6..beeae88 100644
--- a/windows/test/mtimedll/mtimedll.vcproj
+++ b/windows/test/mtimedll/mtimedll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="mtimedll"

 	ProjectGUID="{7F1AFE93-97E7-4905-A2CF-5C845D7FDD4F}"

-	RootNamespace="mtimedll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/mtimedll/Release/mtimedll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/mtimedll/Release/mtimedll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/mtimedll/Debug/mtimedll.pdb"

@@ -295,7 +294,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -349,7 +348,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/mtimedll/Debug/mtimedll.pdb"

diff --git a/windows/test/ntypes/ntypes.vcproj b/windows/test/ntypes/ntypes.vcproj
index 934e7f1..d2743c4 100644
--- a/windows/test/ntypes/ntypes.vcproj
+++ b/windows/test/ntypes/ntypes.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="ntypes"

 	ProjectGUID="{0A049202-6533-413E-89D6-5D6866AAE703}"

-	RootNamespace="ntypes"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/ntypes/Release/ntypes.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/ntypes/Release/ntypes.pdb"

diff --git a/windows/test/ntypesdll/ntypesdll.vcproj b/windows/test/ntypesdll/ntypesdll.vcproj
index 22c2c31..09fe898 100644
--- a/windows/test/ntypesdll/ntypesdll.vcproj
+++ b/windows/test/ntypesdll/ntypesdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="ntypesdll"

 	ProjectGUID="{9AAC897A-70FA-4E5E-BF48-F664C12B05C7}"

-	RootNamespace="ntypesdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				ProgramDatabaseFile=".\../../../test/ntypesdll/Release/ntypesdll.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				ProgramDatabaseFile=".\../../../test/ntypesdll/Release/ntypesdll.pdb"

diff --git a/windows/test/objcopy/objcopy.vcproj b/windows/test/objcopy/objcopy.vcproj
index 087aa01..d97987e 100644
--- a/windows/test/objcopy/objcopy.vcproj
+++ b/windows/test/objcopy/objcopy.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="objcopy"

 	ProjectGUID="{34C0FDFA-81D6-4652-B841-894BD1A15FB0}"

-	RootNamespace="objcopy"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/objcopy/Debug/objcopy.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/objcopy/Debug/objcopy.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/objcopy/Release/objcopy.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/objcopy/Release/objcopy.pdb"

diff --git a/windows/test/objcopydll/objcopydll.vcproj b/windows/test/objcopydll/objcopydll.vcproj
index 203fdce..6c443df 100644
--- a/windows/test/objcopydll/objcopydll.vcproj
+++ b/windows/test/objcopydll/objcopydll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="objcopydll"

 	ProjectGUID="{794B7E1E-E6AD-456D-9F33-FCE317325EC4}"

-	RootNamespace="objcopydll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/objcopydll/Debug/objcopydll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/objcopydll/Debug/objcopydll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/objcopydll/Release/objcopydll.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/objcopydll/Release/objcopydll.pdb"

 				SubSystem="1"

diff --git a/windows/test/ohdr/ohdr.vcproj b/windows/test/ohdr/ohdr.vcproj
index d63d07e..b9cb610 100644
--- a/windows/test/ohdr/ohdr.vcproj
+++ b/windows/test/ohdr/ohdr.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="ohdr"

 	ProjectGUID="{DB97D6C6-2E60-47DC-AED7-4691A1D6DC05}"

-	RootNamespace="ohdr"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/ohdr/Release/ohdr.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/ohdr/Release/ohdr.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/ohdr_gentst/ohdr_gentst.vcproj b/windows/test/ohdr_gentst/ohdr_gentst.vcproj
new file mode 100644
index 0000000..0ebc116
--- /dev/null
+++ b/windows/test/ohdr_gentst/ohdr_gentst.vcproj
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="ohdr_gentst"

+	ProjectGUID="{400D995A-CFC8-4D39-A449-88BE067834F8}"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../test/ohdr_gentst/Release/ohdr_gentst.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../test/ohdr_gentst/Release/ohdr_gentst.pch"

+				AssemblerListingLocation=".\../../../test/ohdr_gentst/Release/"

+				ObjectFile=".\../../../test/ohdr_gentst/Release/"

+				ProgramDataBaseFileName=".\../../../test/ohdr_gentst/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../test/ohdr_gentst/Release/ohdr_gentst.pdb"

+				SubSystem="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../test/ohdr_gentst/Release/ohdr_gentst.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../test/ohdr_gentst/Release/ohdr_gentst.pch"

+				AssemblerListingLocation=".\../../../test/ohdr_gentst/Release/"

+				ObjectFile=".\../../../test/ohdr_gentst/Release/"

+				ProgramDataBaseFileName=".\../../../test/ohdr_gentst/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile=".\../../../test/ohdr_gentst/Release/ohdr_gentst.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../test/ohdr_gentst/Debug/ohdr_gentst.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../test/ohdr_gentst/Debug/ohdr_gentst.pch"

+				AssemblerListingLocation=".\../../../test/ohdr_gentst/Debug/"

+				ObjectFile=".\../../../test/ohdr_gentst/Debug/"

+				ProgramDataBaseFileName=".\../../../test/ohdr_gentst/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../test/ohdr_gentst/Debug/ohdr_gentst.pdb"

+				SubSystem="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName=".\../../../test/ohdr_gentst/Debug/ohdr_gentst.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\../../../test/ohdr_gentst/Debug/ohdr_gentst.pch"

+				AssemblerListingLocation=".\../../../test/ohdr_gentst/Debug/"

+				ObjectFile=".\../../../test/ohdr_gentst/Debug/"

+				ProgramDataBaseFileName=".\../../../test/ohdr_gentst/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile="$(OutDir)\$(ProjectName).exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\../../../test/ohdr_gentst/Debug/ohdr_gentst.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

+			<File

+				RelativePath="..\..\..\test\gen_bogus.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl"

+			>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/windows/test/ohdrdll/ohdrdll.vcproj b/windows/test/ohdrdll/ohdrdll.vcproj
index 7ca57ab..95f3736 100644
--- a/windows/test/ohdrdll/ohdrdll.vcproj
+++ b/windows/test/ohdrdll/ohdrdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="ohdrdll"

 	ProjectGUID="{37605955-FA00-41C9-9D39-D078CF270376}"

-	RootNamespace="ohdrdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/ohdrdll/Release/ohdrdll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/ohdrdll/Release/ohdrdll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/ohdrdll/Debug/ohdrdll.pdb"

@@ -295,7 +294,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -349,7 +348,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/ohdrdll/Debug/ohdrdll.pdb"

diff --git a/windows/test/overhead/overhead.vcproj b/windows/test/overhead/overhead.vcproj
index 4eec985..5793285 100644
--- a/windows/test/overhead/overhead.vcproj
+++ b/windows/test/overhead/overhead.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="overhead"

 	ProjectGUID="{9A9D7ABC-ED3A-462E-9ED1-CB55F14174F3}"

-	RootNamespace="overhead"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/overhead/Release/overhead.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/overhead/Release/overhead.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/overheaddll/overheaddll.vcproj b/windows/test/overheaddll/overheaddll.vcproj
index 3404271..e4691c0 100644
--- a/windows/test/overheaddll/overheaddll.vcproj
+++ b/windows/test/overheaddll/overheaddll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="overheaddll"

 	ProjectGUID="{71A1C081-FF1C-452B-B938-95551D565302}"

-	RootNamespace="overheaddll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -74,7 +73,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/overheaddll/Debug/overheaddll.pdb"

@@ -111,7 +110,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -164,7 +163,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/overheaddll/Debug/overheaddll.pdb"

@@ -201,7 +200,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -255,7 +254,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/overheaddll/Release/overheaddll.pdb"

 				SubSystem="1"

@@ -291,7 +290,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -346,7 +345,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/overheaddll/Release/overheaddll.pdb"

 				SubSystem="1"

diff --git a/windows/test/pool/pool.vcproj b/windows/test/pool/pool.vcproj
index 9af229b..93a96b3 100644
--- a/windows/test/pool/pool.vcproj
+++ b/windows/test/pool/pool.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="pool"

 	ProjectGUID="{9ADAE03A-2060-471E-A7B5-9D8F6995223A}"

-	RootNamespace="pool"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/pool/Release/pool.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/pool/Release/pool.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +260,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/pooldll/pooldll.vcproj b/windows/test/pooldll/pooldll.vcproj
index f7bfe67..d3e1565 100644
--- a/windows/test/pooldll/pooldll.vcproj
+++ b/windows/test/pooldll/pooldll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="pooldll"

 	ProjectGUID="{DFE42486-47A2-487C-81B9-DDCDA9F07BF0}"

-	RootNamespace="pooldll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/pooldll/Release/pooldll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/pooldll/Release/pooldll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/pooldll/Debug/pooldll.pdb"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -351,7 +350,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/pooldll/Debug/pooldll.pdb"

diff --git a/windows/test/reserved/reserved.vcproj b/windows/test/reserved/reserved.vcproj
index 1c79666..bf65142 100644
--- a/windows/test/reserved/reserved.vcproj
+++ b/windows/test/reserved/reserved.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="reserved"

 	ProjectGUID="{2248C52C-75DC-465B-A598-6E89CC93E00D}"

-	RootNamespace="reserved"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/reserved/Release/reserved.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/reserved/Release/reserved.pdb"

diff --git a/windows/test/reserveddll/reserveddll.vcproj b/windows/test/reserveddll/reserveddll.vcproj
index 447709bf..8232b5f 100644
--- a/windows/test/reserveddll/reserveddll.vcproj
+++ b/windows/test/reserveddll/reserveddll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="reserveddll"

 	ProjectGUID="{C2E6106F-1450-4F62-8D8E-17A93E986B26}"

-	RootNamespace="reserveddll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/reserveddll/Debug/reserveddll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/reserveddll/Debug/reserveddll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/reserveddll/Release/reserveddll.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/reserveddll/Release/reserveddll.pdb"

 				SubSystem="1"

diff --git a/windows/test/set_extent/set_extent.vcproj b/windows/test/set_extent/set_extent.vcproj
index ab5fd9a..2bdf9a5 100644
--- a/windows/test/set_extent/set_extent.vcproj
+++ b/windows/test/set_extent/set_extent.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="set_extent"

 	ProjectGUID="{E81413CC-046C-42B0-B862-0BB81AED2854}"

-	RootNamespace="set_extent"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/set_extent/Release/set_extent.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/set_extent/Release/set_extent.pdb"

diff --git a/windows/test/set_extentdll/set_extentdll.vcproj b/windows/test/set_extentdll/set_extentdll.vcproj
index 1604fff..a102dfe 100644
--- a/windows/test/set_extentdll/set_extentdll.vcproj
+++ b/windows/test/set_extentdll/set_extentdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="set_extentdll"

 	ProjectGUID="{14DB1F8E-0BF6-4E9D-8372-5EA9ED48347F}"

-	RootNamespace="set_extentdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/set_extentdll/Debug/set_extentdll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/set_extentdll/Debug/set_extentdll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/set_extentdll/Release/set_extentdll.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/set_extentdll/Release/set_extentdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/stab/stab.vcproj b/windows/test/stab/stab.vcproj
index e35c24e..7ff1d8e 100644
--- a/windows/test/stab/stab.vcproj
+++ b/windows/test/stab/stab.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="stab"

 	ProjectGUID="{17DC13C3-78E0-4EF5-B7B1-87EB1A379D2A}"

-	RootNamespace="stab"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/stab/Release/stab.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/stab/Release/stab.pdb"

diff --git a/windows/test/stabdll/stabdll.vcproj b/windows/test/stabdll/stabdll.vcproj
index d9a35da..ab296b5 100644
--- a/windows/test/stabdll/stabdll.vcproj
+++ b/windows/test/stabdll/stabdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="stabdll"

 	ProjectGUID="{7CF4F18C-3C74-4EBB-AD76-F41575D7A5A0}"

-	RootNamespace="stabdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/stabdll/Debug/stabdll.pdb"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +165,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/stabdll/Debug/stabdll.pdb"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/stabdll/Release/stabdll.pdb"

 				SubSystem="1"

@@ -294,7 +293,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -350,7 +349,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/stabdll/Release/stabdll.pdb"

 				SubSystem="1"

diff --git a/windows/test/tellub/tellub.vcproj b/windows/test/tellub/tellub.vcproj
index 0cde288..a9970a1 100644
--- a/windows/test/tellub/tellub.vcproj
+++ b/windows/test/tellub/tellub.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="tellub"

 	ProjectGUID="{A26C50E9-D3FB-4490-9CD7-606EB2E77D21}"

-	RootNamespace="tellub"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/tellub/Release/tellub.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/tellub/Release/tellub.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/testerror.bat b/windows/test/testerror.bat
index 844e69c..3dad50b 100644
--- a/windows/test/testerror.bat
+++ b/windows/test/testerror.bat
@@ -88,40 +88,25 @@ rem
         if not "!line_tmp:~0,9!"=="*********" (

             set line=

             set last_token=

-            set skip=

             for %%b in (%%a) do (

-                if not defined skip (

-                    if "!last_token!"=="thread" (

-                        set line=!line! ^(IDs^):

-                        

-                    ) else if "!last_token!"=="some" (

-                        if "%%b"=="thread:" (

-                            set line=!line! thread ^(IDs^):

-                            set skip=yes

-                        ) else (

-                            set line=!line! some %%b

-                        )

-                        

-                    ) else if "!last_token:~0,2!"=="#0" (

-                        set line=!line! ^(file name^)

-                        

-                    ) else if "!last_token!"=="HDF5" (

-                        rem Check if we wrap parenthesis around "version (number)"

-                        set version_token=%%b

-                        if "!version_token:~0,1!"=="(" (

-                            set line=!line! ^(version ^(number^)^)

-                        ) else (

-                            set line=!line! version ^(number^).

-                        )

-                        

-                    ) else if "!last_token!"=="line" (

-                        set line=!line! ^(number^)

-                        

-                    ) else if not "%%b"=="some" (

-                        set line=!line! %%b

+                if "!last_token!"=="thread" (

+                    set line=!line! ^(IDs^):

+                ) else if "!last_token:~0,2!"=="#0" (

+                    set line=!line! ^(file name^)

+                ) else if "!last_token!"=="HDF5" (

+                    rem Check if we wrap parenthesis around "version (number)"

+                    set version_token=%%b

+                    if "!version_token:~0,1!"=="(" (

+                        set line=!line! ^(version ^(number^)^)

+                    ) else (

+                        set line=!line! version ^(number^).

                     )

-                    set last_token=%%b

+                ) else if "!last_token!"=="line" (

+                    set line=!line! ^(number^)

+                ) else (

+                    set line=!line! %%b

                 )

+                set last_token=%%b

             )

             echo.!line!>>%actual_ext%

         )

@@ -144,12 +129,23 @@ rem
             )

         )

     )

+    type nul > %expect2_parsed%

+    for /f "delims=" %%a in (%expect2%) do (

+        set line_tmp=%%a

+        if not "!line_tmp:~0,9!"=="*********" (

+            set line=

+            for %%b in (%%a) do (

+                set line=!line! %%b

+            )

+            echo.!line!>>%expect2_parsed%

+        )

+    )

         

-    fc /w %expect1_parsed% %actual% > nul

+    fc /w %expect1_parsed% %actual% | find "FC: no diff" > nul

     if %errorlevel% equ 0 (

             call :testing PASSED %test_err%

     ) else (

-        fc /w %expect2_parsed% %actual% > nul

+        fc /w %expect2_parsed% %actual% | find "FC: no diff" > nul

         if !errorlevel! equ 0 (

             call :testing PASSED %test_err%

         ) else (

@@ -199,4 +195,4 @@ rem ############################################################################
     

     popd

     endlocal & exit /b %nerrors%

-    

+    
\ No newline at end of file
diff --git a/windows/test/testhdf5/testhdf5.vcproj b/windows/test/testhdf5/testhdf5.vcproj
index 35e2163..19e6912 100644
--- a/windows/test/testhdf5/testhdf5.vcproj
+++ b/windows/test/testhdf5/testhdf5.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="testhdf5"

 	ProjectGUID="{D1518671-CB9D-471F-8BCE-A03DE67F26B1}"

-	RootNamespace="testhdf5"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/testhdf5/Release/testhdf5.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/testhdf5/Release/testhdf5.pdb"

diff --git a/windows/test/testhdf5dll/testhdf5dll.vcproj b/windows/test/testhdf5dll/testhdf5dll.vcproj
index d528f39..f44720b 100644
--- a/windows/test/testhdf5dll/testhdf5dll.vcproj
+++ b/windows/test/testhdf5dll/testhdf5dll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="testhdf5dll"

 	ProjectGUID="{D1FD44F8-8263-4B29-985D-21CE26F45A76}"

-	RootNamespace="testhdf5dll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/testhdf5dll/Release/testhdf5dll.pdb"

 				SubSystem="1"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/testhdf5dll/Release/testhdf5dll.pdb"

 				SubSystem="1"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -255,7 +254,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/testhdf5dll/Debug/testhdf5dll.pdb"

@@ -292,7 +291,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -345,7 +344,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/testhdf5dll/Debug/testhdf5dll.pdb"

diff --git a/windows/test/ttsafedll/ttsafedll.vcproj b/windows/test/ttsafedll/ttsafedll.vcproj
index c80a73f..7d5ce96 100644
--- a/windows/test/ttsafedll/ttsafedll.vcproj
+++ b/windows/test/ttsafedll/ttsafedll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="ttsafedll"

 	ProjectGUID="{DDDFC0AC-2ECB-4930-9C83-788AC7C1343E}"

-	RootNamespace="ttsafedll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) pthreadVC2.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/ttsafedll/Debug/ttsafedll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) pthreadVC2.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/ttsafedll/Debug/ttsafedll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) pthreadVC2.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/ttsafedll/Release/ttsafedll.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) pthreadVC2.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/ttsafedll/Release/ttsafedll.pdb"

 				SubSystem="1"

diff --git a/windows/test/unlink/unlink.vcproj b/windows/test/unlink/unlink.vcproj
index ad39064..08f5208 100644
--- a/windows/test/unlink/unlink.vcproj
+++ b/windows/test/unlink/unlink.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="unlink"

 	ProjectGUID="{9321B2C5-74B3-4743-9D87-B0FDCB47373B}"

-	RootNamespace="unlink"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/unlink/Release/unlink.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/unlink/Release/unlink.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/test/unlinkdll/unlinkdll.vcproj b/windows/test/unlinkdll/unlinkdll.vcproj
index dcbe386..612d7f0 100644
--- a/windows/test/unlinkdll/unlinkdll.vcproj
+++ b/windows/test/unlinkdll/unlinkdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="unlinkdll"

 	ProjectGUID="{685666ED-4640-47EE-AEA5-35B9602CA541}"

-	RootNamespace="unlinkdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/unlinkdll/Release/unlinkdll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../test/unlinkdll/Release/unlinkdll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -258,7 +257,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/unlinkdll/Debug/unlinkdll.pdb"

@@ -295,7 +294,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -349,7 +348,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../test/unlinkdll/Debug/unlinkdll.pdb"

diff --git a/windows/test/vfd/vfd.vcproj b/windows/test/vfd/vfd.vcproj
index 461b1fd..e8b8102 100644
--- a/windows/test/vfd/vfd.vcproj
+++ b/windows/test/vfd/vfd.vcproj
@@ -22,7 +22,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +114,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +207,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +262,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/vfd/release/vfd.pdb"

@@ -299,7 +299,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +355,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/vfd/release/vfd.pdb"

diff --git a/windows/test/vfddll/vfddll.vcproj b/windows/test/vfddll/vfddll.vcproj
index 3fa4b16..319d135 100644
--- a/windows/test/vfddll/vfddll.vcproj
+++ b/windows/test/vfddll/vfddll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="vfddll"

 	ProjectGUID="{0C5E3F36-3338-4B2C-A956-4D577B6119E7}"

-	RootNamespace="vfddll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/vfddll/release/vfddll.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../test/vfddll/release/vfddll.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +260,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/tools/h5copy/h5copy.vcproj b/windows/tools/h5copy/h5copy.vcproj
index c714d28..81d0c12 100644
--- a/windows/tools/h5copy/h5copy.vcproj
+++ b/windows/tools/h5copy/h5copy.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5copy"

 	ProjectGUID="{69952435-F01F-46A7-B907-A78EBC864ED7}"

-	RootNamespace="h5copy"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5copy/Release/h5copy.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5copy/Release/h5copy.pdb"

diff --git a/windows/tools/h5copy/testh5copy.bat b/windows/tools/h5copy/testh5copy.bat
index 7b3d034..8fc9f67 100644
--- a/windows/tools/h5copy/testh5copy.bat
+++ b/windows/tools/h5copy/testh5copy.bat
@@ -211,7 +211,7 @@ rem        rem Create the expect file if it doesn't yet exist
 rem        call :verify_h5ls CREATED %*

 rem        copy %actual% %expect%

 rem    ) else (

-    fc %expect_parsed% %actual_parsed% > nul

+    fc %expect_parsed% %actual_parsed% | find "FC: no diff" > nul

     if %errorlevel% equ 0 (

         call :verify_h5ls PASSED %*

     ) else (

@@ -305,4 +305,4 @@ rem ############################################################################
     

     popd

     endlocal & exit /b %nerrors%

-    

+    
\ No newline at end of file
diff --git a/windows/tools/h5debug/h5debug.vcproj b/windows/tools/h5debug/h5debug.vcproj
index d894f31..57ba9b9 100644
--- a/windows/tools/h5debug/h5debug.vcproj
+++ b/windows/tools/h5debug/h5debug.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5debug"

 	ProjectGUID="{BE1A0022-708E-4CC2-B01C-26BD99AB6576}"

-	RootNamespace="h5debug"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5debug/Release/h5debug.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5debug/Release/h5debug.pdb"

diff --git a/windows/tools/h5debugdll/h5debugdll.vcproj b/windows/tools/h5debugdll/h5debugdll.vcproj
index 9ff2cd8..b3c1211 100644
--- a/windows/tools/h5debugdll/h5debugdll.vcproj
+++ b/windows/tools/h5debugdll/h5debugdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5debugdll"

 	ProjectGUID="{D10F67D0-8057-49C2-A62A-12D0C512288E}"

-	RootNamespace="h5debugdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5debugdll/Release/h5debugdll.pdb"

 				SubSystem="1"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5debugdll/Release/h5debugdll.pdb"

 				SubSystem="1"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -255,7 +254,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5debugdll/Debug/h5debugdll.pdb"

@@ -292,7 +291,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -345,7 +344,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5debugdll/Debug/h5debugdll.pdb"

diff --git a/windows/tools/h5diff/h5diff.vcproj b/windows/tools/h5diff/h5diff.vcproj
index b5ad479..fe9c65e 100644
--- a/windows/tools/h5diff/h5diff.vcproj
+++ b/windows/tools/h5diff/h5diff.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5diff"

 	ProjectGUID="{1C5A9EC8-F882-4A8A-B773-E79CD46369AF}"

-	RootNamespace="h5diff"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -115,7 +114,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -171,7 +170,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -209,7 +208,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -264,7 +263,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5diff/Release/h5diff.pdb"

@@ -301,7 +300,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -357,7 +356,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5diff/Release/h5diff.pdb"

diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat
index d3c407a..fba7ef0 100644
--- a/windows/tools/h5diff/testh5diff.bat
+++ b/windows/tools/h5diff/testh5diff.bat
@@ -141,7 +141,7 @@ rem
         call :testing CREATED %h5diff% %params%

         copy /y %actual% %expect% > nul

     ) else (

-        fc /w %expect% %actual% > nul

+        fc /w %expect% %actual% | find "FC: no diff" > nul

         if !errorlevel! equ 0 (

             call :testing PASSED %h5diff% %params%

         ) else (

diff --git a/windows/tools/h5diffdll/h5diffdll.vcproj b/windows/tools/h5diffdll/h5diffdll.vcproj
index 08546e9..9f0ccc6 100644
--- a/windows/tools/h5diffdll/h5diffdll.vcproj
+++ b/windows/tools/h5diffdll/h5diffdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5diffdll"

 	ProjectGUID="{EC6B5EAD-D938-4211-A7B1-01C9D2C15160}"

-	RootNamespace="h5diffdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5diffdll/Release/h5diffdll.pdb"

 				SubSystem="1"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5diffdll/Release/h5diffdll.pdb"

 				SubSystem="1"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -256,7 +255,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5diffdll/Debug/h5diffdll.pdb"

@@ -293,7 +292,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -347,7 +346,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5diffdll/Debug/h5diffdll.pdb"

diff --git a/windows/tools/h5dump/h5dump.vcproj b/windows/tools/h5dump/h5dump.vcproj
index 10a2265..6e9b3fb 100644
--- a/windows/tools/h5dump/h5dump.vcproj
+++ b/windows/tools/h5dump/h5dump.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5dump"

 	ProjectGUID="{9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2}"

-	RootNamespace="h5dump"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5dump/Release/h5dump.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5dump/Release/h5dump.pdb"

diff --git a/windows/tools/h5dump/testh5dump.bat b/windows/tools/h5dump/testh5dump.bat
index 5de0dfe..f26a5d9 100644
--- a/windows/tools/h5dump/testh5dump.bat
+++ b/windows/tools/h5dump/testh5dump.bat
@@ -16,7 +16,7 @@ rem
 rem Tests for the h5dump tool

 rem

 rem    Created:  Scott Wegner, 8/23/07

-rem    Modified: Scott Wegner, 3/10/08

+rem    Modified: Scott Wegner, 8/27/07

 rem

 

 setlocal enabledelayedexpansion

@@ -124,7 +124,7 @@ rem
         call :testing CREATED %params%

         copy /y %actual% %expect% > nul

     ) else (

-        fc /w %expect% %actual% > nul

+        fc /w %expect% %actual% | find "FC: no diff" > nul

         if !errorlevel! equ 0 (

             call :testing PASSED %params%

         ) else (

@@ -176,7 +176,7 @@ rem use for the binary tests that expect a full path in -o
         call :testing CREATED %params%

         copy /y %actual% %expect% > nul

     ) else (

-        fc /w %expect% %actual% > nul

+        fc /w %expect% %actual% | find "FC: no diff" > nul

         if !errorlevel! equ 0 (

             call :testing PASSED %params%

         ) else (

@@ -405,7 +405,8 @@ rem ############################################################################
     call :tooltest tall-4s.ddl --dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 tall.h5

     call :tooltest tall-5s.ddl -d "/g1/g1.1/dset1.1.2[0;2;10;]" tall.h5

     call :tooltest tdset-3s.ddl -d "/dset1[1,1;;;]" tdset.h5

-

+    rem block

+    rem call :tooltest tdset2-1s.ddl -d "/dset1[;3,2;4,4;1,4]" tdset2.h5

 

     rem test printing characters in ASCII instead of decimal

     call :tooltest tchar1.ddl -r tchar.h5

diff --git a/windows/tools/h5dump/testh5dumpxml.bat b/windows/tools/h5dump/testh5dumpxml.bat
index 1b7893e..7fd04f3 100644
--- a/windows/tools/h5dump/testh5dumpxml.bat
+++ b/windows/tools/h5dump/testh5dumpxml.bat
@@ -89,7 +89,7 @@ rem
         call :testing CREATED %params%

         copy %actual% %expect% > nul

     ) else (

-        fc /w %expect% %actual% > nul

+        fc /w %expect% %actual% | find "FC: no diff" > nul

         if !errorlevel! equ 0 (

             call :testing PASSED %params%

         ) else (

@@ -212,4 +212,4 @@ rem ############################################################################
     

     popd

     endlocal & exit /b %nerrors%

-    

+    
\ No newline at end of file
diff --git a/windows/tools/h5dumpdll/h5dumpdll.vcproj b/windows/tools/h5dumpdll/h5dumpdll.vcproj
index 4fe63e9..92274b7 100644
--- a/windows/tools/h5dumpdll/h5dumpdll.vcproj
+++ b/windows/tools/h5dumpdll/h5dumpdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5dumpdll"

 	ProjectGUID="{7E207F6A-DC28-4DEB-8454-7977092131DC}"

-	RootNamespace="h5dumpdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5dumpdll/Release/h5dumpdll.pdb"

 				SubSystem="1"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5dumpdll/Release/h5dumpdll.pdb"

 				SubSystem="1"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -256,7 +255,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5dumpdll/Debug/h5dumpdll.pdb"

@@ -293,7 +292,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -347,7 +346,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5dumpdll/Debug/h5dumpdll.pdb"

diff --git a/windows/tools/h5import/h5import.vcproj b/windows/tools/h5import/h5import.vcproj
index 1ec9656..566bf62 100644
--- a/windows/tools/h5import/h5import.vcproj
+++ b/windows/tools/h5import/h5import.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5import"

 	ProjectGUID="{9E588AD8-14BD-4BA3-B4EA-16D1D882C700}"

-	RootNamespace="h5import"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -74,7 +73,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5import/Release/h5import.pdb"

@@ -111,7 +110,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -164,7 +163,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5import/Release/h5import.pdb"

@@ -201,7 +200,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -254,7 +253,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -292,7 +291,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -346,7 +345,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/tools/h5import/h5importtestutil.bat b/windows/tools/h5import/h5importtestutil.bat
index ed9c63a..5307473 100644
--- a/windows/tools/h5import/h5importtestutil.bat
+++ b/windows/tools/h5import/h5importtestutil.bat
@@ -37,9 +37,6 @@ set h5dump=..\h5dump%2\%1\h5dump%2
 rem The path of the h5dump tool binary

 set h5dump_bin=%CD%\%h5dump%

 

-rem source directory (this is already defined in the Linux script)

-set srcdir=%CD%

-

 rem initialize errors variables

 set errors=0

 

@@ -70,7 +67,7 @@ goto main
     %h5dump_bin% %5 > log1

     popd

     

-    fc /w tmp_testfiles\log1 log2 > nul

+    fc /w tmp_testfiles\log1 log2 | find "FC: no diff" > nul

     if %errorlevel% neq 0 set err=1

     del /f log2 tmp_testfiles\log1

     if "%err%"=="1" (

@@ -104,65 +101,49 @@ goto main
     rem On Windows, echo gives a carriage return, so we store the TESTING params

     rem and call TESTING from TOOLTEST.  --SJW 8/27/07

     set testing=ASCII I32 rank 3 - Output BE 

-    rem call :tooltest txtin32 -c %CD%\testfiles\textin32 -o test1.h5

-    call :tooltest %srcdir%\testfiles\txtin16.txt -c %srcdir%\testfiles\txtin32.conf -o txtin32.h5

+    call :tooltest txtin32 -c %CD%\testfiles\textin32 -o test1.h5

 

     set testing=ASCII I16 rank 3 - Output LE - CHUNKED - extended

-    rem call :tooltest txtin16 -c %CD%\testfiles\textin16 -o test2.h5

-    call :tooltest %srcdir%\testfiles\txtin16.txt -c %srcdir%\testfiles\txtin16.conf -o txtin16.h5

+    call :tooltest txtin16 -c %CD%\testfiles\textin16 -o test2.h5

 

     set testing=ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed

-    rem call :tooltest txtin16 -c %CD%\testfiles\textin8  -o test3.h5

-    call :tooltest %srcdir%\testfiles\txtin16.txt -c %srcdir%\testfiles\txtin8.conf  -o txtin8.h5

+    call :tooltest txtin16 -c %CD%\testfiles\textin8  -o test3.h5

 

     set testing=ASCII UI32 - rank 3 - Output BE

-    rem call :tooltest %CD%\testfiles\in1 -c %CD%\testfiles\textuin32 -o test4.h5

-    call :tooltest %srcdir%\testfiles\txtuin32.txt -c %srcdir%\testfiles\txtuin32.conf -o txtuin32.h5

+    call :tooltest %CD%\testfiles\in1 -c %CD%\testfiles\textuin32 -o test4.h5

 

     set testing=ASCII UI16 - rank 2 - Output LE+Chunked+Compressed

-    rem call :tooltest %CD%\testfiles\in1 -c %CD%\testfiles\textuin16 -o test5.h5

-    call :tooltest %srcdir%\testfiles\txtuin32.txt -c %srcdir%\testfiles\txtuin16.conf -o txtuin16.h5

+    call :tooltest %CD%\testfiles\in1 -c %CD%\testfiles\textuin16 -o test5.h5

 

     set testing=ASCII F32 - rank 3 - Output LE

-    rem call :tooltest %CD%\testfiles\fp1 -c %CD%\testfiles\textfp32 -o test6.h5

-    call :tooltest %srcdir%\testfiles\txtfp32.txt -c %srcdir%\testfiles\txtfp32.conf -o txtfp32.h5

+    call :tooltest %CD%\testfiles\fp1 -c %CD%\testfiles\textfp32 -o test6.h5

 

     set testing=ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed

-    rem call :tooltest %CD%\testfiles\fp2 -c %CD%\testfiles\textfp64 -o test7.h5

-    call :tooltest %srcdir%\testfiles\txtfp64.txt -c %srcdir%\testfiles\txtfp64.conf -o txtfp64.h5

+    call :tooltest %CD%\testfiles\fp2 -c %CD%\testfiles\textfp64 -o test7.h5

 

     set testing=BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed

-    rem call :tooltest bfp64 -c %CD%\testfiles\conbfp64 -o test8.h5

-    call :tooltest binfp64.bin -c %srcdir%\testfiles\binfp64.conf -o binfp64.h5

+    call :tooltest bfp64 -c %CD%\testfiles\conbfp64 -o test8.h5

 

     set testing=BINARY I16 - rank 3 - Output order LE + CHUNKED + extended

-    rem call :tooltest bin16 -c %CD%\testfiles\conbin16 -o test9.h5

-    call :tooltest binin16.bin -c %srcdir%\testfiles\binin16.conf -o binin16.h5

+    call :tooltest bin16 -c %CD%\testfiles\conbin16 -o test9.h5

 

     set testing=BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed

-    rem call :tooltest bin8 -c %CD%\testfiles\conbin8  -o test10.h5

-    call :tooltest binin8.bin -c %srcdir%\testfiles\binin8.conf  -o binin8.h5

+    call :tooltest bin8 -c %CD%\testfiles\conbin8  -o test10.h5

 

     set testing=BINARY I32 - rank 3 - Output BE + CHUNKED

-    rem call :tooltest bin32 -c %CD%\testfiles\conbin32 -o test11.h5

-    call :tooltest binin32.bin -c %srcdir%\testfiles\binin32.conf -o binin32.h5

+    call :tooltest bin32 -c %CD%\testfiles\conbin32 -o test11.h5

 

     set testing=BINARY UI16 - rank 3 - Output byte BE + CHUNKED

-    rem call :tooltest buin16 -c %CD%\testfiles\conbuin16 -o test12.h5

-    call :tooltest binuin16.bin -c %srcdir%\testfiles\binuin16.conf -o binuin16.h5

+    call :tooltest buin16 -c %CD%\testfiles\conbuin16 -o test12.h5

 

     set testing=BINARY UI32 - rank 3 - Output LE + CHUNKED

-    rem call :tooltest buin32 -c %CD%\testfiles\conbuin32 -o test13.h5

-    call :tooltest binuin32.bin -c %srcdir%\testfiles\binuin32.conf -o binuin32.h5

+    call :tooltest buin32 -c %CD%\testfiles\conbuin32 -o test13.h5

 

     set testing=STR 

-    rem call :tooltest %CD%\testfiles\txtstr -c %CD%\testfiles\textstr -o teststr.h5

-    call :tooltest %srcdir%\testfiles\txtstr.txt -c %srcdir%\testfiles\txtstr.conf -o txtstr.h5

-

-    set testing=BINARY I8 CR LF EOF

-    call :tooltest binin8w.bin -c %srcdir%\testfiles\binin8w.conf -o binin8w.h5

+    call :tooltest %CD%\testfiles\txtstr -c %CD%\testfiles\textstr -o teststr.h5

 

-    del /f *.txt *.bin *.h5

+    del /f tx* b* *.dat

+    del /f test*.h5

     rmdir /s /q tmp_testfiles

     

     ) else (

@@ -187,5 +168,5 @@ goto main
     )

     

     popd

-    endlocal & exit /b %errors%

-    

+    endlocal & exit /b %nerrors%

+    
\ No newline at end of file
diff --git a/windows/tools/h5importdll/h5importdll.vcproj b/windows/tools/h5importdll/h5importdll.vcproj
index 7c0f4e4..f28df91 100644
--- a/windows/tools/h5importdll/h5importdll.vcproj
+++ b/windows/tools/h5importdll/h5importdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5importdll"

 	ProjectGUID="{2DCDB978-79B7-4A3A-B24A-D908A49B7D50}"

-	RootNamespace="h5importdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -73,7 +72,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5importdll/Release/h5importdll.pdb"

 				SubSystem="1"

@@ -109,7 +108,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -161,7 +160,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5importdll/Release/h5importdll.pdb"

 				SubSystem="1"

@@ -197,7 +196,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -249,7 +248,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5importdll/Debug/h5importdll.pdb"

@@ -286,7 +285,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -339,7 +338,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5importdll/Debug/h5importdll.pdb"

diff --git a/windows/tools/h5jam/h5jam.vcproj b/windows/tools/h5jam/h5jam.vcproj
index 6b03953..729e946 100644
--- a/windows/tools/h5jam/h5jam.vcproj
+++ b/windows/tools/h5jam/h5jam.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5jam"

 	ProjectGUID="{196F5935-2391-49A7-B6A2-410DF8149F0D}"

-	RootNamespace="h5jam"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5jam/Release/h5jam.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5jam/Release/h5jam.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/tools/h5jam/testh5jam.bat b/windows/tools/h5jam/testh5jam.bat
index 9a9c5d4..d3522f1 100644
--- a/windows/tools/h5jam/testh5jam.bat
+++ b/windows/tools/h5jam/testh5jam.bat
@@ -249,7 +249,7 @@ rem
     rem Compare to 'cmpfile', result is set in result1

     set tfile=tt1

     %getub_bin% -c %size% %hfile% > %tfile%

-    fc /w %cmpfile% %tfile% > nul

+    fc /w %cmpfile% %tfile% | find "FC: no diff" > nul

     if %errorlevel% neq 0 (

         fc /w %cmpfile% %file%

         set result1=1

@@ -595,4 +595,4 @@ rem ############################################################################
     

     popd

     endlocal & exit /b %nerrors%

-    

+    
\ No newline at end of file
diff --git a/windows/tools/h5ls/h5ls.vcproj b/windows/tools/h5ls/h5ls.vcproj
index 80b03fb..ae96caa 100644
--- a/windows/tools/h5ls/h5ls.vcproj
+++ b/windows/tools/h5ls/h5ls.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5ls"

 	ProjectGUID="{357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0}"

-	RootNamespace="h5ls"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5ls/Release/h5ls.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5ls/Release/h5ls.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/tools/h5ls/testh5ls.bat b/windows/tools/h5ls/testh5ls.bat
index 3baeda8..0329447 100644
--- a/windows/tools/h5ls/testh5ls.bat
+++ b/windows/tools/h5ls/testh5ls.bat
@@ -124,7 +124,7 @@ rem %2 and on -- argument for the h5ls tool
     rem     call :testing CREATED %params%

     rem     copy %actual% %expect% > nul

     ) else (

-        fc /w %expect% %actual% > nul

+        fc /w %expect% %actual% | find "FC: no diff" > nul

         if !errorlevel! equ 0 (

             call :testing PASSED %params%

         ) else (

diff --git a/windows/tools/h5lsdll/h5lsdll.vcproj b/windows/tools/h5lsdll/h5lsdll.vcproj
index 5868b07..cf8a1d9 100644
--- a/windows/tools/h5lsdll/h5lsdll.vcproj
+++ b/windows/tools/h5lsdll/h5lsdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5lsdll"

 	ProjectGUID="{18FBE8C2-CD20-4D99-9E0B-63B408CE4850}"

-	RootNamespace="h5lsdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -74,7 +73,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5lsdll/Debug/h5lsdll.pdb"

@@ -111,7 +110,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -164,7 +163,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5lsdll/Debug/h5lsdll.pdb"

@@ -201,7 +200,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -255,7 +254,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5lsdll/Release/h5lsdll.pdb"

 				SubSystem="1"

@@ -291,7 +290,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -346,7 +345,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5lsdll/Release/h5lsdll.pdb"

 				SubSystem="1"

diff --git a/windows/tools/h5mkgrp/h5mkgrp.vcproj b/windows/tools/h5mkgrp/h5mkgrp.vcproj
index e0d87b1..89c0cf4 100644
--- a/windows/tools/h5mkgrp/h5mkgrp.vcproj
+++ b/windows/tools/h5mkgrp/h5mkgrp.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5mkgrp"

 	ProjectGUID="{ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF}"

-	RootNamespace="h5mkgrp"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5mkgrp/Release/h5mkgrp.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5mkgrp/Release/h5mkgrp.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5mkgrp/Debug/h5mkgrp.pdb"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -351,7 +350,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5mkgrp/Debug/h5mkgrp.pdb"

diff --git a/windows/tools/h5mkgrp/testh5mkgrp.bat b/windows/tools/h5mkgrp/testh5mkgrp.bat
index 15de2cd..112c106 100644
--- a/windows/tools/h5mkgrp/testh5mkgrp.bat
+++ b/windows/tools/h5mkgrp/testh5mkgrp.bat
@@ -148,7 +148,7 @@ rem
     rem     copy %actual% %expect%

     rem )

     

-    fc /w %expect_parsed% %expect_parsed% > nul

+    fc /w %expect_parsed% %expect_parsed% | find "FC: no diff" > nul

     if %errorlevel% equ 0 (

         call :verify_h5ls PASSED %*

     ) else ( 

@@ -251,4 +251,4 @@ rem ############################################################################
     

     popd

     endlocal & exit /b %nerrors%

-    

+    
\ No newline at end of file
diff --git a/windows/tools/h5repack/h5repack.vcproj b/windows/tools/h5repack/h5repack.vcproj
index 996e71d..9896209 100644
--- a/windows/tools/h5repack/h5repack.vcproj
+++ b/windows/tools/h5repack/h5repack.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5repack"

 	ProjectGUID="{411D221C-9FA1-417E-8A2B-DF746F4C7E07}"

-	RootNamespace="h5repack"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5repack/Release/h5repack.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5repack/Release/h5repack.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,9 +261,9 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories=""

+				AdditionalLibraryDirectories="D:\szip\all\lib\Debug"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5repack/Debug/h5repack.pdb"

@@ -301,7 +300,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -357,9 +356,9 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories=""

+				AdditionalLibraryDirectories="D:\szip\all\lib\Debug"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5repack/Debug/h5repack.pdb"

diff --git a/windows/tools/h5repackdll/h5repackdll.vcproj b/windows/tools/h5repackdll/h5repackdll.vcproj
index 1b1f36a..32255b1 100644
--- a/windows/tools/h5repackdll/h5repackdll.vcproj
+++ b/windows/tools/h5repackdll/h5repackdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5repackdll"

 	ProjectGUID="{854F7E09-CEB5-44CD-B924-3FFAC7936323}"

-	RootNamespace="h5repackdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5repackdll/Debug/h5repackdll.pdb"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +165,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5repackdll/Debug/h5repackdll.pdb"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -257,7 +256,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5repackdll/Release/h5repackdll.pdb"

 				SubSystem="1"

@@ -293,7 +292,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -348,7 +347,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5repackdll/Release/h5repackdll.pdb"

 				SubSystem="1"

diff --git a/windows/tools/h5repart/h5repart.vcproj b/windows/tools/h5repart/h5repart.vcproj
index c197f52..41af4aa 100644
--- a/windows/tools/h5repart/h5repart.vcproj
+++ b/windows/tools/h5repart/h5repart.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5repart"

 	ProjectGUID="{F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF}"

-	RootNamespace="h5repart"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5repart/Release/h5repart.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/h5repart/Release/h5repart.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/tools/h5repartdll/h5repartdll.vcproj b/windows/tools/h5repartdll/h5repartdll.vcproj
index 8e2d13e..3bced34 100644
--- a/windows/tools/h5repartdll/h5repartdll.vcproj
+++ b/windows/tools/h5repartdll/h5repartdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5repartdll"

 	ProjectGUID="{89DA820B-7A3B-46FA-AE09-971A739BEEFD}"

-	RootNamespace="h5repartdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -74,7 +73,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5repartdll/Debug/h5repartdll.pdb"

@@ -111,7 +110,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -164,7 +163,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5repartdll/Debug/h5repartdll.pdb"

@@ -201,7 +200,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -255,7 +254,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5repartdll/Release/h5repartdll.pdb"

 				SubSystem="1"

@@ -291,7 +290,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -346,7 +345,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5repartdll/Release/h5repartdll.pdb"

 				SubSystem="1"

diff --git a/windows/tools/h5stat/h5stat.vcproj b/windows/tools/h5stat/h5stat.vcproj
index 6f5c191..ac5f56b 100644
--- a/windows/tools/h5stat/h5stat.vcproj
+++ b/windows/tools/h5stat/h5stat.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5stat"

 	ProjectGUID="{405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5}"

-	RootNamespace="h5stat"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5stat/Debug/h5stat.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5stat/Debug/h5stat.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5stat/Release/h5stat.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5stat/Release/h5stat.pdb"

 				SubSystem="1"

diff --git a/windows/tools/h5stat/testh5stat.bat b/windows/tools/h5stat/testh5stat.bat
index 06ab4ba..3bc6ab0 100644
--- a/windows/tools/h5stat/testh5stat.bat
+++ b/windows/tools/h5stat/testh5stat.bat
@@ -99,7 +99,7 @@ rem
         call :testing CREATED %stat% %params%

         copy /y %actual% %expect%

     ) else (

-        fc /w %expect% %actual% > nul

+        fc /w %expect% %actual% | find "FC: no diff" > nul

         if !errorlevel! equ 0 (

             call :testing PASSED %stat% %params%

         ) else (

@@ -173,4 +173,4 @@ rem ############################################################################
     

     popd

     endlocal & exit /b %nerrors%

-    

+    
\ No newline at end of file
diff --git a/windows/tools/h5statdll/h5statdll.vcproj b/windows/tools/h5statdll/h5statdll.vcproj
index 8dca444..561723e 100644
--- a/windows/tools/h5statdll/h5statdll.vcproj
+++ b/windows/tools/h5statdll/h5statdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5statdll"

 	ProjectGUID="{165195D1-B742-4030-8B12-3FE94B829D45}"

-	RootNamespace="h5statdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5statdll/Debug/h5statdll.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/h5statdll/Debug/h5statdll.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5statdll/Release/h5statdll.pdb"

 				SubSystem="1"

@@ -295,7 +294,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -350,7 +349,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5statdll/Release/h5statdll.pdb"

 				SubSystem="1"

diff --git a/windows/tools/h5unjam/h5unjam.vcproj b/windows/tools/h5unjam/h5unjam.vcproj
index c5aea7f..11de671 100644
--- a/windows/tools/h5unjam/h5unjam.vcproj
+++ b/windows/tools/h5unjam/h5unjam.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5unjam"

 	ProjectGUID="{52E83C17-2B68-44B5-881D-4F6338FB14C7}"

-	RootNamespace="h5unjam"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5unjam/Release/h5unjam.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/h5unjam/Release/h5unjam.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/tools/talign/talign.vcproj b/windows/tools/talign/talign.vcproj
index 4aef90d..a0d1004 100644
--- a/windows/tools/talign/talign.vcproj
+++ b/windows/tools/talign/talign.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="talign"

 	ProjectGUID="{E6A9BFE8-84DE-46C0-A372-72087598018E}"

-	RootNamespace="talign"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/talign/Release/talign.pdb"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -355,7 +354,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../tools/talign/Release/talign.pdb"

diff --git a/windows/tools/taligndll/taligndll.vcproj b/windows/tools/taligndll/taligndll.vcproj
index 4a10a16..5c54284 100644
--- a/windows/tools/taligndll/taligndll.vcproj
+++ b/windows/tools/taligndll/taligndll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="taligndll"

 	ProjectGUID="{3BBA31F8-2679-4655-975D-52FDA5ABD5C4}"

-	RootNamespace="taligndll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/taligndll/Release/taligndll.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../tools/taligndll/Release/taligndll.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/taligndll/Debug/taligndll.pdb"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -351,7 +350,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../tools/taligndll/Debug/taligndll.pdb"

diff --git a/windows/tools/testfiles/binread/binread.vcproj b/windows/tools/testfiles/binread/binread.vcproj
index 8e514f7..b0073da 100644
--- a/windows/tools/testfiles/binread/binread.vcproj
+++ b/windows/tools/testfiles/binread/binread.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="binread"

 	ProjectGUID="{BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB}"

-	RootNamespace="binread"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -74,7 +73,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/binread/Release/binread.pdb"

 				SubSystem="1"

@@ -110,7 +109,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -163,7 +162,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/binread/Release/binread.pdb"

 				SubSystem="1"

@@ -199,7 +198,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -250,7 +249,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/binread/Debug/binread.pdb"

@@ -287,7 +286,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -339,7 +338,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/binread/Debug/binread.pdb"

diff --git a/windows/tools/testfiles/h5difftst/h5difftst.vcproj b/windows/tools/testfiles/h5difftst/h5difftst.vcproj
index 942106b..c0d3e69 100644
--- a/windows/tools/testfiles/h5difftst/h5difftst.vcproj
+++ b/windows/tools/testfiles/h5difftst/h5difftst.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5difftst"

 	ProjectGUID="{1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4}"

-	RootNamespace="h5difftst"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5difftst/Release/h5difftst.pdb"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -170,7 +169,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5difftst/Release/h5difftst.pdb"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -261,7 +260,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -299,7 +298,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/tools/testfiles/h5dumptst/h5dumptst.vcproj b/windows/tools/testfiles/h5dumptst/h5dumptst.vcproj
index 24f1256..6c7effa 100644
--- a/windows/tools/testfiles/h5dumptst/h5dumptst.vcproj
+++ b/windows/tools/testfiles/h5dumptst/h5dumptst.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5dumptst"

 	ProjectGUID="{0A33B4FE-A2C9-4B7F-ACEC-D251308182ED}"

-	RootNamespace="h5dumptst"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5dumptst/Release/h5dumptst.pdb"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -353,7 +352,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libcd.lib"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5dumptst/Release/h5dumptst.pdb"

diff --git a/windows/tools/testfiles/h5importtst/h5importtst.vcproj b/windows/tools/testfiles/h5importtst/h5importtst.vcproj
index d79975d..85e3a75 100644
--- a/windows/tools/testfiles/h5importtst/h5importtst.vcproj
+++ b/windows/tools/testfiles/h5importtst/h5importtst.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5importtst"

 	ProjectGUID="{AF696934-5004-4C1D-90C3-B434E92AFB89}"

-	RootNamespace="h5importtst"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -75,7 +74,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5importtst/Debug/h5importtst.pdb"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -166,7 +165,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5importtst/Debug/h5importtst.pdb"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -257,7 +256,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5importtst/Release/h5importtst.pdb"

 				SubSystem="1"

@@ -293,7 +292,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -348,7 +347,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5importtst/Release/h5importtst.pdb"

 				SubSystem="1"

diff --git a/windows/tools/testfiles/h5jamtst/h5jamtst.vcproj b/windows/tools/testfiles/h5jamtst/h5jamtst.vcproj
index a3d8b43..d0cba51 100644
--- a/windows/tools/testfiles/h5jamtst/h5jamtst.vcproj
+++ b/windows/tools/testfiles/h5jamtst/h5jamtst.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5jamtst"

 	ProjectGUID="{E8896FEE-8601-4AFC-91EA-6F9698574174}"

-	RootNamespace="h5jamtst"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -114,7 +113,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -207,7 +206,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -262,7 +261,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5jamtst/Release/h5jamtst.pdb"

 				SubSystem="1"

@@ -298,7 +297,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -354,7 +353,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5jamtst/Release/h5jamtst.pdb"

 				SubSystem="1"

diff --git a/windows/tools/testfiles/h5repacktst/h5repacktst.vcproj b/windows/tools/testfiles/h5repacktst/h5repacktst.vcproj
index abedb7c..0ff902f 100644
--- a/windows/tools/testfiles/h5repacktst/h5repacktst.vcproj
+++ b/windows/tools/testfiles/h5repacktst/h5repacktst.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5repacktst"

 	ProjectGUID="{AC4C582B-B27D-4E57-A59F-6FF0E833C6E5}"

-	RootNamespace="h5repacktst"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -115,7 +114,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -171,7 +170,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -209,7 +208,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -264,7 +263,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repacktst/Release/h5repacktst.pdb"

 				SubSystem="1"

@@ -300,7 +299,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -356,7 +355,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repacktst/Release/h5repacktst.pdb"

 				SubSystem="1"

diff --git a/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj b/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj
index d2ca364..9c2ab53 100644
--- a/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj
+++ b/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5repart_gentest"

 	ProjectGUID="{EBF7C380-5F58-462D-993D-75B53F83FA81}"

-	RootNamespace="h5repart_gentest"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repart_gentest/Debug/h5repart_gentest.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repart_gentest/Debug/h5repart_gentest.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repart_gentest/Release/h5repart_gentest.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5repart_gentest/Release/h5repart_gentest.pdb"

 				SubSystem="1"

diff --git a/windows/tools/testfiles/h5reparttst/h5reparttst.vcproj b/windows/tools/testfiles/h5reparttst/h5reparttst.vcproj
index 2decbd1..f4c55ba 100644
--- a/windows/tools/testfiles/h5reparttst/h5reparttst.vcproj
+++ b/windows/tools/testfiles/h5reparttst/h5reparttst.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="h5reparttst"

 	ProjectGUID="{53022A9D-F5B2-407C-9A29-3AC71B3E6DDC}"

-	RootNamespace="h5reparttst"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5reparttst/Debug/h5reparttst.pdb"

@@ -113,7 +112,7 @@
 			OutputDirectory=".\../../../../tools/testfiles/h5reparttst/Debug"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -168,7 +167,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5reparttst/Debug/h5reparttst.pdb"

@@ -205,7 +204,7 @@
 			OutputDirectory=".\../../../../tools/testfiles/h5reparttst/Release"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -260,7 +259,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5reparttst/Release/h5reparttst.pdb"

 				SubSystem="1"

@@ -296,7 +295,7 @@
 			OutputDirectory=".\../../../../tools/testfiles/h5reparttst/Release"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/h5reparttst/Release/h5reparttst.pdb"

 				SubSystem="1"

diff --git a/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj b/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj
index fd29d62..09962d5 100644
--- a/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj
+++ b/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="testh5repack_detect_szip"

 	ProjectGUID="{5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30}"

-	RootNamespace="testh5repack_detect_szip"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -77,7 +76,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/testh5repack_detect_szip.pdb"

 				SubSystem="1"

@@ -113,7 +112,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -169,7 +168,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/testh5repack_detect_szip.pdb"

 				SubSystem="1"

@@ -205,7 +204,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -259,7 +258,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

@@ -297,7 +296,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -352,7 +351,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="true"

diff --git a/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj b/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj
index f300130..9f240d7 100644
--- a/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj
+++ b/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"

 	Name="testh5repack_detect_szipdll"

 	ProjectGUID="{E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF}"

-	RootNamespace="testh5repack_detect_szipdll"

 	>

 	<Platforms>

 		<Platform

@@ -22,7 +21,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -76,7 +75,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/testh5repack_detect_szipdll.pdb"

 				SubSystem="1"

@@ -112,7 +111,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -167,7 +166,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/testh5repack_detect_szipdll.pdb"

 				SubSystem="1"

@@ -203,7 +202,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -256,7 +255,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/testh5repack_detect_szipdll.pdb"

@@ -293,7 +292,7 @@
 			OutputDirectory="..\..\..\..\tools\testfiles\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -347,7 +346,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

-				LinkIncremental="0"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/testh5repack_detect_szipdll.pdb"

diff --git a/windows/tools/toolslib/toolslib.vcproj b/windows/tools/toolslib/toolslib.vcproj
index 87e5a26..3870816 100644
--- a/windows/tools/toolslib/toolslib.vcproj
+++ b/windows/tools/toolslib/toolslib.vcproj
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -92,7 +92,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -164,7 +164,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -237,7 +237,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

diff --git a/windows/tools/toolslibdll/toolslibdll.vcproj b/windows/tools/toolslibdll/toolslibdll.vcproj
index 8a4d01c..5907a8c 100644
--- a/windows/tools/toolslibdll/toolslibdll.vcproj
+++ b/windows/tools/toolslibdll/toolslibdll.vcproj
@@ -22,7 +22,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -93,7 +93,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -165,7 +165,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

@@ -237,7 +237,7 @@
 			OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			>

diff --git a/windows_vnet/hl/examples/allhlcexamples/allhlcexamples.sln b/windows_vnet/hl/examples/allhlcexamples/allhlcexamples.sln
index f50ef9b..4ed5225 100644
--- a/windows_vnet/hl/examples/allhlcexamples/allhlcexamples.sln
+++ b/windows_vnet/hl/examples/allhlcexamples/allhlcexamples.sln
@@ -1,175 +1,55 @@
 Microsoft Visual Studio Solution File, Format Version 8.00

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allhlcexamples", "allhlcexamples.vcproj", "{6B659D89-A5D6-4DF4-B6AF-74BEBE5961E5}"

 	ProjectSection(ProjectDependencies) = postProject

-		{31018018-AC76-4F43-846C-F8B1DCE676FD} = {31018018-AC76-4F43-846C-F8B1DCE676FD}

+		{50FEC639-EBCF-4F19-B535-ABECE5707A93} = {50FEC639-EBCF-4F19-B535-ABECE5707A93}

+		{133F4A96-DD6D-4B13-BADC-7587F845D253} = {133F4A96-DD6D-4B13-BADC-7587F845D253}

 		{C6B12522-10FD-4E4A-AD4E-AD28A6011CF0} = {C6B12522-10FD-4E4A-AD4E-AD28A6011CF0}

-		{643A1F28-6553-43B9-9F26-DD5FE2448559} = {643A1F28-6553-43B9-9F26-DD5FE2448559}

+		{99EDFA69-68D6-43F7-A4DB-1C2739D8364C} = {99EDFA69-68D6-43F7-A4DB-1C2739D8364C}

 		{5526D330-EDC2-4620-8816-44D4196E2372} = {5526D330-EDC2-4620-8816-44D4196E2372}

-		{50FEC639-EBCF-4F19-B535-ABECE5707A93} = {50FEC639-EBCF-4F19-B535-ABECE5707A93}

+		{31018018-AC76-4F43-846C-F8B1DCE676FD} = {31018018-AC76-4F43-846C-F8B1DCE676FD}

 		{BA597B44-B102-4E95-98F4-03C9ABD02A62} = {BA597B44-B102-4E95-98F4-03C9ABD02A62}

+		{643A1F28-6553-43B9-9F26-DD5FE2448559} = {643A1F28-6553-43B9-9F26-DD5FE2448559}

 		{79DE1C67-FE07-41FE-A8C9-154CD2C0280D} = {79DE1C67-FE07-41FE-A8C9-154CD2C0280D}

-		{99EDFA69-68D6-43F7-A4DB-1C2739D8364C} = {99EDFA69-68D6-43F7-A4DB-1C2739D8364C}

-		{133F4A96-DD6D-4B13-BADC-7587F845D253} = {133F4A96-DD6D-4B13-BADC-7587F845D253}

 		{154DCDF3-E08F-4881-B2D4-776B26C9D5DA} = {154DCDF3-E08F-4881-B2D4-776B26C9D5DA}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_ds1", "..\ex_ds1\ex_ds1.vcproj", "{99EDFA69-68D6-43F7-A4DB-1C2739D8364C}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_ds1dll", "..\ex_ds1dll\ex_ds1dll.vcproj", "{C6B12522-10FD-4E4A-AD4E-AD28A6011CF0}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_image1", "..\ex_image1\ex_image1.vcproj", "{154DCDF3-E08F-4881-B2D4-776B26C9D5DA}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_image1dll", "..\ex_image1dll\ex_image1dll.vcproj", "{79DE1C67-FE07-41FE-A8C9-154CD2C0280D}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite1", "..\ex_lite1\ex_lite1.vcproj", "{643A1F28-6553-43B9-9F26-DD5FE2448559}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite1dll", "..\ex_lite1dll\ex_lite1dll.vcproj", "{BA597B44-B102-4E95-98F4-03C9ABD02A62}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptExampleFL", "..\ptExampleFL\ptExampleFL.vcproj", "{133F4A96-DD6D-4B13-BADC-7587F845D253}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptExampleFLdll", "..\ptExampleFLdll\ptExampleFLdll.vcproj", "{50FEC639-EBCF-4F19-B535-ABECE5707A93}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table01", "..\ex_table01\ex_table01.vcproj", "{31018018-AC76-4F43-846C-F8B1DCE676FD}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table01dll", "..\ex_table01dll\ex_table01dll.vcproj", "{5526D330-EDC2-4620-8816-44D4196E2372}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_image2", "..\ex_image2\ex_image2.vcproj", "{26F2A6A5-C92E-4641-8722-37875D8BDEED}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_image2dll", "..\ex_image2dll\ex_image2dll.vcproj", "{78F336DD-71DF-44C6-AF3B-30C22FC4A628}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite2", "..\ex_lite2\ex_lite2.vcproj", "{AF23F2F3-DD7F-4CE1-AA0F-24DDB4C1460C}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite2dll", "..\ex_lite2dll\ex_lite2dll.vcproj", "{4460827F-F484-4FC2-8EF9-9CFC1B027413}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite3", "..\ex_lite3\ex_lite3.vcproj", "{C16E8F66-D33B-43D8-879D-22384D2E9DFC}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite3dll", "..\ex_lite3dll\ex_lite3dll.vcproj", "{B947219E-C9AE-421B-956C-5907DFD16324}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table02", "..\ex_table02\ex_table02.vcproj", "{FEC433E2-F31A-49FC-84F7-5A0DA9FC603D}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table02dll", "..\ex_table02dll\ex_table02dll.vcproj", "{16D21118-54D4-425B-9ADD-091FC1AC426A}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table03", "..\ex_table03\ex_table03.vcproj", "{3F5979DE-2829-4E49-A02B-F3693659CB47}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table03dll", "..\ex_table03dll\ex_table03dll.vcproj", "{3EF85C9B-925E-4DA3-99A9-994F6D1B4EE0}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table04", "..\ex_table04\ex_table04.vcproj", "{E97B3493-ACB4-42A5-97C8-4B813495BC02}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table04dll", "..\ex_table04dll\ex_table04dll.vcproj", "{77B52391-90E8-48D5-A438-F30319958AC7}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table05", "..\ex_table05\ex_table05.vcproj", "{BDE0BF36-667E-4B7F-B07C-8874B121B9F4}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table05dll", "..\ex_table05dll\ex_table05dll.vcproj", "{6BB44516-EA47-471A-A72D-623B70062DE4}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table06", "..\ex_table06\ex_table06.vcproj", "{8B05C3F8-A936-493A-A251-78B31C7CA400}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table06dll", "..\ex_table06dll\ex_table06dll.vcproj", "{A928EDAB-FAA8-40D1-8C8B-7614D994F662}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table07", "..\ex_table07\ex_table07.vcproj", "{1AAA811E-7A15-4940-B599-12532861FFDB}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table07dll", "..\ex_table07dll\ex_table07dll.vcproj", "{D0907A70-422F-40E6-9CAE-BFD4DAF333DE}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table08", "..\ex_table08\ex_table08.vcproj", "{751BF943-2AFD-48A0-A7F3-6909E8F90B9B}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table08dll", "..\ex_table08dll\ex_table08dll.vcproj", "{ED80E5CE-63A2-4CE3-9B8B-DA91A5A27341}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table09", "..\ex_table09\ex_table09.vcproj", "{033F3600-F9A7-46B2-933E-CFB18E6621A6}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_ds", "..\ex_ds\ex_ds.vcproj", "{99EDFA69-68D6-43F7-A4DB-1C2739D8364C}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table09dll", "..\ex_table09dll\ex_table09dll.vcproj", "{BCA0028D-28A0-4D9A-B66B-B2FB39A6CE9D}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_dsdll", "..\ex_dsdll\ex_dsdll.vcproj", "{C6B12522-10FD-4E4A-AD4E-AD28A6011CF0}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table10", "..\ex_table10\ex_table10.vcproj", "{ABFD593D-0DA6-4F6E-BA32-2B9F9D05DCE5}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_images", "..\ex_images\ex_images.vcproj", "{154DCDF3-E08F-4881-B2D4-776B26C9D5DA}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table10dll", "..\ex_table10dll\ex_table10dll.vcproj", "{F74FE537-AD81-43E5-9902-368BF0D03F7A}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_imagesdll", "..\ex_imagesdll\ex_imagesdll.vcproj", "{79DE1C67-FE07-41FE-A8C9-154CD2C0280D}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table11", "..\ex_table11\ex_table11.vcproj", "{27ED9926-BFEA-4163-B711-EA1C68FDA99A}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite", "..\ex_lite\ex_lite.vcproj", "{643A1F28-6553-43B9-9F26-DD5FE2448559}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table11dll", "..\ex_table11dll\ex_table11dll.vcproj", "{3A7F3327-35EF-4495-9EDD-E13B76717D89}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_litedll", "..\ex_litedll\ex_litedll.vcproj", "{BA597B44-B102-4E95-98F4-03C9ABD02A62}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table12", "..\ex_table12\ex_table12.vcproj", "{BFAF94EB-DF79-4F72-BAAA-8AC488D99F13}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_packet", "..\ex_packet\ex_packet.vcproj", "{133F4A96-DD6D-4B13-BADC-7587F845D253}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table12dll", "..\ex_table12dll\ex_table12dll.vcproj", "{0526B6D8-6E99-4E1E-A310-08EF62C97A4A}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_packetdll", "..\ex_packetdll\ex_packetdll.vcproj", "{50FEC639-EBCF-4F19-B535-ABECE5707A93}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptExampleVL", "..\ptExampleVL\ptExampleVL.vcproj", "{1381D116-ACDF-4D91-9111-EF1C89F1FA72}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table", "..\ex_table\ex_table.vcproj", "{31018018-AC76-4F43-846C-F8B1DCE676FD}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptExampleVLdll", "..\ptExampleVLdll\ptExampleVLdll.vcproj", "{66FA6E3D-D797-49E6-84E0-8D25616B431B}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_tabledll", "..\ex_tabledll\ex_tabledll.vcproj", "{5526D330-EDC2-4620-8816-44D4196E2372}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

@@ -225,126 +105,6 @@ Global
 		{5526D330-EDC2-4620-8816-44D4196E2372}.Debug.Build.0 = Debug|Win32

 		{5526D330-EDC2-4620-8816-44D4196E2372}.Release.ActiveCfg = Release|Win32

 		{5526D330-EDC2-4620-8816-44D4196E2372}.Release.Build.0 = Release|Win32

-		{26F2A6A5-C92E-4641-8722-37875D8BDEED}.Debug.ActiveCfg = Debug|Win32

-		{26F2A6A5-C92E-4641-8722-37875D8BDEED}.Debug.Build.0 = Debug|Win32

-		{26F2A6A5-C92E-4641-8722-37875D8BDEED}.Release.ActiveCfg = Release|Win32

-		{26F2A6A5-C92E-4641-8722-37875D8BDEED}.Release.Build.0 = Release|Win32

-		{78F336DD-71DF-44C6-AF3B-30C22FC4A628}.Debug.ActiveCfg = Debug|Win32

-		{78F336DD-71DF-44C6-AF3B-30C22FC4A628}.Debug.Build.0 = Debug|Win32

-		{78F336DD-71DF-44C6-AF3B-30C22FC4A628}.Release.ActiveCfg = Release|Win32

-		{78F336DD-71DF-44C6-AF3B-30C22FC4A628}.Release.Build.0 = Release|Win32

-		{AF23F2F3-DD7F-4CE1-AA0F-24DDB4C1460C}.Debug.ActiveCfg = Debug|Win32

-		{AF23F2F3-DD7F-4CE1-AA0F-24DDB4C1460C}.Debug.Build.0 = Debug|Win32

-		{AF23F2F3-DD7F-4CE1-AA0F-24DDB4C1460C}.Release.ActiveCfg = Release|Win32

-		{AF23F2F3-DD7F-4CE1-AA0F-24DDB4C1460C}.Release.Build.0 = Release|Win32

-		{4460827F-F484-4FC2-8EF9-9CFC1B027413}.Debug.ActiveCfg = Debug|Win32

-		{4460827F-F484-4FC2-8EF9-9CFC1B027413}.Debug.Build.0 = Debug|Win32

-		{4460827F-F484-4FC2-8EF9-9CFC1B027413}.Release.ActiveCfg = Release|Win32

-		{4460827F-F484-4FC2-8EF9-9CFC1B027413}.Release.Build.0 = Release|Win32

-		{C16E8F66-D33B-43D8-879D-22384D2E9DFC}.Debug.ActiveCfg = Debug|Win32

-		{C16E8F66-D33B-43D8-879D-22384D2E9DFC}.Debug.Build.0 = Debug|Win32

-		{C16E8F66-D33B-43D8-879D-22384D2E9DFC}.Release.ActiveCfg = Release|Win32

-		{C16E8F66-D33B-43D8-879D-22384D2E9DFC}.Release.Build.0 = Release|Win32

-		{B947219E-C9AE-421B-956C-5907DFD16324}.Debug.ActiveCfg = Debug|Win32

-		{B947219E-C9AE-421B-956C-5907DFD16324}.Debug.Build.0 = Debug|Win32

-		{B947219E-C9AE-421B-956C-5907DFD16324}.Release.ActiveCfg = Release|Win32

-		{B947219E-C9AE-421B-956C-5907DFD16324}.Release.Build.0 = Release|Win32

-		{FEC433E2-F31A-49FC-84F7-5A0DA9FC603D}.Debug.ActiveCfg = Debug|Win32

-		{FEC433E2-F31A-49FC-84F7-5A0DA9FC603D}.Debug.Build.0 = Debug|Win32

-		{FEC433E2-F31A-49FC-84F7-5A0DA9FC603D}.Release.ActiveCfg = Release|Win32

-		{FEC433E2-F31A-49FC-84F7-5A0DA9FC603D}.Release.Build.0 = Release|Win32

-		{16D21118-54D4-425B-9ADD-091FC1AC426A}.Debug.ActiveCfg = Debug|Win32

-		{16D21118-54D4-425B-9ADD-091FC1AC426A}.Debug.Build.0 = Debug|Win32

-		{16D21118-54D4-425B-9ADD-091FC1AC426A}.Release.ActiveCfg = Release|Win32

-		{16D21118-54D4-425B-9ADD-091FC1AC426A}.Release.Build.0 = Release|Win32

-		{3F5979DE-2829-4E49-A02B-F3693659CB47}.Debug.ActiveCfg = Debug|Win32

-		{3F5979DE-2829-4E49-A02B-F3693659CB47}.Debug.Build.0 = Debug|Win32

-		{3F5979DE-2829-4E49-A02B-F3693659CB47}.Release.ActiveCfg = Release|Win32

-		{3F5979DE-2829-4E49-A02B-F3693659CB47}.Release.Build.0 = Release|Win32

-		{3EF85C9B-925E-4DA3-99A9-994F6D1B4EE0}.Debug.ActiveCfg = Debug|Win32

-		{3EF85C9B-925E-4DA3-99A9-994F6D1B4EE0}.Debug.Build.0 = Debug|Win32

-		{3EF85C9B-925E-4DA3-99A9-994F6D1B4EE0}.Release.ActiveCfg = Release|Win32

-		{3EF85C9B-925E-4DA3-99A9-994F6D1B4EE0}.Release.Build.0 = Release|Win32

-		{E97B3493-ACB4-42A5-97C8-4B813495BC02}.Debug.ActiveCfg = Debug|Win32

-		{E97B3493-ACB4-42A5-97C8-4B813495BC02}.Debug.Build.0 = Debug|Win32

-		{E97B3493-ACB4-42A5-97C8-4B813495BC02}.Release.ActiveCfg = Release|Win32

-		{E97B3493-ACB4-42A5-97C8-4B813495BC02}.Release.Build.0 = Release|Win32

-		{77B52391-90E8-48D5-A438-F30319958AC7}.Debug.ActiveCfg = Debug|Win32

-		{77B52391-90E8-48D5-A438-F30319958AC7}.Debug.Build.0 = Debug|Win32

-		{77B52391-90E8-48D5-A438-F30319958AC7}.Release.ActiveCfg = Release|Win32

-		{77B52391-90E8-48D5-A438-F30319958AC7}.Release.Build.0 = Release|Win32

-		{BDE0BF36-667E-4B7F-B07C-8874B121B9F4}.Debug.ActiveCfg = Debug|Win32

-		{BDE0BF36-667E-4B7F-B07C-8874B121B9F4}.Debug.Build.0 = Debug|Win32

-		{BDE0BF36-667E-4B7F-B07C-8874B121B9F4}.Release.ActiveCfg = Release|Win32

-		{BDE0BF36-667E-4B7F-B07C-8874B121B9F4}.Release.Build.0 = Release|Win32

-		{6BB44516-EA47-471A-A72D-623B70062DE4}.Debug.ActiveCfg = Debug|Win32

-		{6BB44516-EA47-471A-A72D-623B70062DE4}.Debug.Build.0 = Debug|Win32

-		{6BB44516-EA47-471A-A72D-623B70062DE4}.Release.ActiveCfg = Release|Win32

-		{6BB44516-EA47-471A-A72D-623B70062DE4}.Release.Build.0 = Release|Win32

-		{8B05C3F8-A936-493A-A251-78B31C7CA400}.Debug.ActiveCfg = Debug|Win32

-		{8B05C3F8-A936-493A-A251-78B31C7CA400}.Debug.Build.0 = Debug|Win32

-		{8B05C3F8-A936-493A-A251-78B31C7CA400}.Release.ActiveCfg = Release|Win32

-		{8B05C3F8-A936-493A-A251-78B31C7CA400}.Release.Build.0 = Release|Win32

-		{A928EDAB-FAA8-40D1-8C8B-7614D994F662}.Debug.ActiveCfg = Debug|Win32

-		{A928EDAB-FAA8-40D1-8C8B-7614D994F662}.Debug.Build.0 = Debug|Win32

-		{A928EDAB-FAA8-40D1-8C8B-7614D994F662}.Release.ActiveCfg = Release|Win32

-		{A928EDAB-FAA8-40D1-8C8B-7614D994F662}.Release.Build.0 = Release|Win32

-		{1AAA811E-7A15-4940-B599-12532861FFDB}.Debug.ActiveCfg = Debug|Win32

-		{1AAA811E-7A15-4940-B599-12532861FFDB}.Debug.Build.0 = Debug|Win32

-		{1AAA811E-7A15-4940-B599-12532861FFDB}.Release.ActiveCfg = Release|Win32

-		{1AAA811E-7A15-4940-B599-12532861FFDB}.Release.Build.0 = Release|Win32

-		{D0907A70-422F-40E6-9CAE-BFD4DAF333DE}.Debug.ActiveCfg = Debug|Win32

-		{D0907A70-422F-40E6-9CAE-BFD4DAF333DE}.Debug.Build.0 = Debug|Win32

-		{D0907A70-422F-40E6-9CAE-BFD4DAF333DE}.Release.ActiveCfg = Release|Win32

-		{D0907A70-422F-40E6-9CAE-BFD4DAF333DE}.Release.Build.0 = Release|Win32

-		{751BF943-2AFD-48A0-A7F3-6909E8F90B9B}.Debug.ActiveCfg = Debug|Win32

-		{751BF943-2AFD-48A0-A7F3-6909E8F90B9B}.Debug.Build.0 = Debug|Win32

-		{751BF943-2AFD-48A0-A7F3-6909E8F90B9B}.Release.ActiveCfg = Release|Win32

-		{751BF943-2AFD-48A0-A7F3-6909E8F90B9B}.Release.Build.0 = Release|Win32

-		{ED80E5CE-63A2-4CE3-9B8B-DA91A5A27341}.Debug.ActiveCfg = Debug|Win32

-		{ED80E5CE-63A2-4CE3-9B8B-DA91A5A27341}.Debug.Build.0 = Debug|Win32

-		{ED80E5CE-63A2-4CE3-9B8B-DA91A5A27341}.Release.ActiveCfg = Release|Win32

-		{ED80E5CE-63A2-4CE3-9B8B-DA91A5A27341}.Release.Build.0 = Release|Win32

-		{033F3600-F9A7-46B2-933E-CFB18E6621A6}.Debug.ActiveCfg = Debug|Win32

-		{033F3600-F9A7-46B2-933E-CFB18E6621A6}.Debug.Build.0 = Debug|Win32

-		{033F3600-F9A7-46B2-933E-CFB18E6621A6}.Release.ActiveCfg = Release|Win32

-		{033F3600-F9A7-46B2-933E-CFB18E6621A6}.Release.Build.0 = Release|Win32

-		{BCA0028D-28A0-4D9A-B66B-B2FB39A6CE9D}.Debug.ActiveCfg = Debug|Win32

-		{BCA0028D-28A0-4D9A-B66B-B2FB39A6CE9D}.Debug.Build.0 = Debug|Win32

-		{BCA0028D-28A0-4D9A-B66B-B2FB39A6CE9D}.Release.ActiveCfg = Release|Win32

-		{BCA0028D-28A0-4D9A-B66B-B2FB39A6CE9D}.Release.Build.0 = Release|Win32

-		{ABFD593D-0DA6-4F6E-BA32-2B9F9D05DCE5}.Debug.ActiveCfg = Debug|Win32

-		{ABFD593D-0DA6-4F6E-BA32-2B9F9D05DCE5}.Debug.Build.0 = Debug|Win32

-		{ABFD593D-0DA6-4F6E-BA32-2B9F9D05DCE5}.Release.ActiveCfg = Release|Win32

-		{ABFD593D-0DA6-4F6E-BA32-2B9F9D05DCE5}.Release.Build.0 = Release|Win32

-		{F74FE537-AD81-43E5-9902-368BF0D03F7A}.Debug.ActiveCfg = Debug|Win32

-		{F74FE537-AD81-43E5-9902-368BF0D03F7A}.Debug.Build.0 = Debug|Win32

-		{F74FE537-AD81-43E5-9902-368BF0D03F7A}.Release.ActiveCfg = Release|Win32

-		{F74FE537-AD81-43E5-9902-368BF0D03F7A}.Release.Build.0 = Release|Win32

-		{27ED9926-BFEA-4163-B711-EA1C68FDA99A}.Debug.ActiveCfg = Debug|Win32

-		{27ED9926-BFEA-4163-B711-EA1C68FDA99A}.Debug.Build.0 = Debug|Win32

-		{27ED9926-BFEA-4163-B711-EA1C68FDA99A}.Release.ActiveCfg = Release|Win32

-		{27ED9926-BFEA-4163-B711-EA1C68FDA99A}.Release.Build.0 = Release|Win32

-		{3A7F3327-35EF-4495-9EDD-E13B76717D89}.Debug.ActiveCfg = Debug|Win32

-		{3A7F3327-35EF-4495-9EDD-E13B76717D89}.Debug.Build.0 = Debug|Win32

-		{3A7F3327-35EF-4495-9EDD-E13B76717D89}.Release.ActiveCfg = Release|Win32

-		{3A7F3327-35EF-4495-9EDD-E13B76717D89}.Release.Build.0 = Release|Win32

-		{BFAF94EB-DF79-4F72-BAAA-8AC488D99F13}.Debug.ActiveCfg = Debug|Win32

-		{BFAF94EB-DF79-4F72-BAAA-8AC488D99F13}.Debug.Build.0 = Debug|Win32

-		{BFAF94EB-DF79-4F72-BAAA-8AC488D99F13}.Release.ActiveCfg = Release|Win32

-		{BFAF94EB-DF79-4F72-BAAA-8AC488D99F13}.Release.Build.0 = Release|Win32

-		{0526B6D8-6E99-4E1E-A310-08EF62C97A4A}.Debug.ActiveCfg = Debug|Win32

-		{0526B6D8-6E99-4E1E-A310-08EF62C97A4A}.Debug.Build.0 = Debug|Win32

-		{0526B6D8-6E99-4E1E-A310-08EF62C97A4A}.Release.ActiveCfg = Release|Win32

-		{0526B6D8-6E99-4E1E-A310-08EF62C97A4A}.Release.Build.0 = Release|Win32

-		{1381D116-ACDF-4D91-9111-EF1C89F1FA72}.Debug.ActiveCfg = Debug|Win32

-		{1381D116-ACDF-4D91-9111-EF1C89F1FA72}.Debug.Build.0 = Debug|Win32

-		{1381D116-ACDF-4D91-9111-EF1C89F1FA72}.Release.ActiveCfg = Release|Win32

-		{1381D116-ACDF-4D91-9111-EF1C89F1FA72}.Release.Build.0 = Release|Win32

-		{66FA6E3D-D797-49E6-84E0-8D25616B431B}.Debug.ActiveCfg = Debug|Win32

-		{66FA6E3D-D797-49E6-84E0-8D25616B431B}.Debug.Build.0 = Debug|Win32

-		{66FA6E3D-D797-49E6-84E0-8D25616B431B}.Release.ActiveCfg = Release|Win32

-		{66FA6E3D-D797-49E6-84E0-8D25616B431B}.Release.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 	EndGlobalSection

diff --git a/windows_vnet/hl/examples/ex_ds1/ex_ds1.vcproj b/windows_vnet/hl/examples/ex_ds/ex_ds.vcproj
index fbde3c3..8cee5be 100644
--- a/windows_vnet/hl/examples/ex_ds1/ex_ds1.vcproj
+++ b/windows_vnet/hl/examples/ex_ds/ex_ds.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="ex_ds1"

+	Name="ex_ds"

 	SccProjectName=""

 	SccLocalPath="">

 	<Platforms>

@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_ds\Release"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_ds\Release"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -28,10 +28,10 @@
 				RuntimeLibrary="4"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds1\Release/ex_ds1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds1\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_ds1\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_ds\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				CompileAs="0"/>

@@ -40,16 +40,16 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_ds1\Release/ex_ds1.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds1\Release/ex_ds1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds1\Release/ex_ds1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds\Release/ex_ds.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

@@ -74,8 +74,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_ds\Debug"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_ds\Debug"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -88,10 +88,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="5"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds1\Debug/ex_ds1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds1\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_ds1\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_ds\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				DebugInformationFormat="4"

@@ -101,17 +101,17 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_ds1\Debug/ex_ds1.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds1\Debug/ex_ds1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds1\Debug/ex_ds1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds\Debug/ex_ds.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

diff --git a/windows_vnet/hl/examples/ex_ds1dll/ex_ds1dll.vcproj b/windows_vnet/hl/examples/ex_dsdll/ex_dsdll.vcproj
index 178e755..7aef8e9 100644
--- a/windows_vnet/hl/examples/ex_ds1dll/ex_ds1dll.vcproj
+++ b/windows_vnet/hl/examples/ex_dsdll/ex_dsdll.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="ex_ds1dll"

+	Name="ex_dsdll"

 	SccProjectName=""

 	SccLocalPath="">

 	<Platforms>

@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_dsdll\Debug"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_dsdll\Debug"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -26,10 +26,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/ex_ds1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_dsdll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				DebugInformationFormat="4"

@@ -39,17 +39,17 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/ex_ds1dll.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/ex_ds1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/ex_ds1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

@@ -74,8 +74,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_dsdll\Release"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_dsdll\Release"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -90,10 +90,10 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_ds1dll\Release/ex_ds1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_ds1dll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_ds1dll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1dll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_dsdll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				CompileAs="0"/>

@@ -102,16 +102,16 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_ds1dll\Release/ex_ds1dll.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_ds1dll\Release/ex_ds1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_ds1dll\Release/ex_ds1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_dsdll\Release/ex_dsdll.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

diff --git a/windows_vnet/hl/examples/ex_image2/ex_image2.vcproj b/windows_vnet/hl/examples/ex_image2/ex_image2.vcproj
deleted file mode 100644
index b339a74..0000000
--- a/windows_vnet/hl/examples/ex_image2/ex_image2.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_image2"

-	ProjectGUID="{26F2A6A5-C92E-4641-8722-37875D8BDEED}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_image2.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_image2.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_image2.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_image2.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_image2dll/ex_image2dll.vcproj b/windows_vnet/hl/examples/ex_image2dll/ex_image2dll.vcproj
deleted file mode 100644
index 2a1b923..0000000
--- a/windows_vnet/hl/examples/ex_image2dll/ex_image2dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_image2dll"

-	ProjectGUID="{78F336DD-71DF-44C6-AF3B-30C22FC4A628}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_image2dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_image2dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_image2dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_image2.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_image1/ex_image1.vcproj b/windows_vnet/hl/examples/ex_images/ex_images.vcproj
index 5a0ab6f..04bd96e 100644
--- a/windows_vnet/hl/examples/ex_image1/ex_image1.vcproj
+++ b/windows_vnet/hl/examples/ex_images/ex_images.vcproj
@@ -2,8 +2,7 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="ex_image1"

-	RootNamespace="ex_image1"

+	Name="ex_images"

 	SccProjectName=""

 	SccLocalPath="">

 	<Platforms>

@@ -13,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_images\Debug"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_images\Debug"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -27,10 +26,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="5"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_image1\Debug/ex_image1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_image1\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_image1\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_images\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_images\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_images\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				DebugInformationFormat="4"

@@ -40,17 +39,17 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_image1\Debug/ex_image1.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_image1\Debug/ex_image1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_image1\Debug/ex_image1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_images\Debug/ex_images.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

@@ -75,8 +74,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_images\Release"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_images\Release"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -91,10 +90,10 @@
 				RuntimeLibrary="4"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_image1\Release/ex_image1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_image1\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_image1\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_images\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_images\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_images\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				CompileAs="0"/>

@@ -103,16 +102,16 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_image1\Release/ex_image1.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_image1\Release/ex_image1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_image1\Release/ex_image1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_images\Release/ex_images.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

diff --git a/windows_vnet/hl/examples/ex_image1dll/ex_image1dll.vcproj b/windows_vnet/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
index 45db539..7ec9819 100644
--- a/windows_vnet/hl/examples/ex_image1dll/ex_image1dll.vcproj
+++ b/windows_vnet/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="ex_image1dll"

+	Name="ex_imagesdll"

 	SccProjectName=""

 	SccLocalPath="">

 	<Platforms>

@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_imagesdll\Debug"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_imagesdll\Debug"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -26,10 +26,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="5"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_image1dll\Debug/ex_image1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_image1dll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_image1dll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1dll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				DebugInformationFormat="4"

@@ -39,17 +39,17 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_image1dll\Debug/ex_image1dll.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_image1dll\Debug/ex_image1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_image1dll\Debug/ex_image1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

@@ -74,8 +74,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_imagesdll\Release"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_imagesdll\Release"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -90,10 +90,10 @@
 				RuntimeLibrary="4"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_image1dll\Release/ex_image1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_image1dll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_image1dll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1dll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_imagesdll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				CompileAs="0"/>

@@ -102,16 +102,16 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_image1dll\Release/ex_image1dll.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_image1dll\Release/ex_image1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_image1dll\Release/ex_image1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_imagesdll\Release/ex_imagesdll.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

diff --git a/windows_vnet/hl/examples/ex_lite1/ex_lite1.vcproj b/windows_vnet/hl/examples/ex_lite/ex_lite.vcproj
index 9fdee4c..f35d8fc 100644
--- a/windows_vnet/hl/examples/ex_lite1/ex_lite1.vcproj
+++ b/windows_vnet/hl/examples/ex_lite/ex_lite.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="ex_lite1"

+	Name="ex_lite"

 	SccProjectName=""

 	SccLocalPath="">

 	<Platforms>

@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_lite\Release"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_lite\Release"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -28,10 +28,10 @@
 				RuntimeLibrary="4"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite1\Release/ex_lite1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite1\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_lite1\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_lite\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				CompileAs="0"/>

@@ -40,16 +40,16 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_lite1\Release/ex_lite1.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite1\Release/ex_lite1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite1\Release/ex_lite1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite\Release/ex_lite.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

@@ -74,8 +74,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_lite\Debug"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_lite\Debug"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -88,10 +88,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="5"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite1\Debug/ex_lite1.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite1\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_lite1\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_lite\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				DebugInformationFormat="4"

@@ -101,17 +101,17 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_lite1\Debug/ex_lite1.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite1\Debug/ex_lite1.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite1\Debug/ex_lite1.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite\Debug/ex_lite.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

diff --git a/windows_vnet/hl/examples/ex_lite2/ex_lite2.vcproj b/windows_vnet/hl/examples/ex_lite2/ex_lite2.vcproj
deleted file mode 100644
index a4fdfd9..0000000
--- a/windows_vnet/hl/examples/ex_lite2/ex_lite2.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_lite2"

-	ProjectGUID="{AF23F2F3-DD7F-4CE1-AA0F-24DDB4C1460C}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_lite2.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_lite2.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_lite2.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_lite2.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_lite2dll/ex_lite2dll.vcproj b/windows_vnet/hl/examples/ex_lite2dll/ex_lite2dll.vcproj
deleted file mode 100644
index 4c7a2a2..0000000
--- a/windows_vnet/hl/examples/ex_lite2dll/ex_lite2dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_lite2dll"

-	ProjectGUID="{4460827F-F484-4FC2-8EF9-9CFC1B027413}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_lite2dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_lite2dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_lite2dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_lite2.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_lite3/ex_lite3.vcproj b/windows_vnet/hl/examples/ex_lite3/ex_lite3.vcproj
deleted file mode 100644
index 315fe73..0000000
--- a/windows_vnet/hl/examples/ex_lite3/ex_lite3.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_lite3"

-	ProjectGUID="{C16E8F66-D33B-43D8-879D-22384D2E9DFC}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_lite3.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_lite3.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_lite3.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_lite3.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_lite3dll/ex_lite3dll.vcproj b/windows_vnet/hl/examples/ex_lite3dll/ex_lite3dll.vcproj
deleted file mode 100644
index 886b2f7..0000000
--- a/windows_vnet/hl/examples/ex_lite3dll/ex_lite3dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_lite3dll"

-	ProjectGUID="{B947219E-C9AE-421B-956C-5907DFD16324}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_lite3dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_lite3dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_lite3dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_lite3.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_lite1dll/ex_lite1dll.vcproj b/windows_vnet/hl/examples/ex_litedll/ex_litedll.vcproj
index 5a7d2d1..5eada93 100644
--- a/windows_vnet/hl/examples/ex_lite1dll/ex_lite1dll.vcproj
+++ b/windows_vnet/hl/examples/ex_litedll/ex_litedll.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="ex_lite1dll"

+	Name="ex_litedll"

 	SccProjectName=""

 	SccLocalPath="">

 	<Platforms>

@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_litedll\Release"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_litedll\Release"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -28,10 +28,10 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite1dll\Release/ex_lite1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite1dll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_lite1dll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1dll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_litedll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_litedll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_litedll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				CompileAs="0"/>

@@ -40,16 +40,16 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_lite1dll\Release/ex_lite1dll.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite1dll\Release/ex_lite1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite1dll\Release/ex_lite1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_litedll\Release/ex_litedll.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

@@ -74,8 +74,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_litedll\Debug"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_litedll\Debug"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -88,10 +88,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/ex_lite1dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_litedll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				DebugInformationFormat="4"

@@ -101,17 +101,17 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/ex_lite1dll.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/ex_lite1dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/ex_lite1dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

diff --git a/windows_vnet/hl/examples/ptExampleFL/ptExampleFL.vcproj b/windows_vnet/hl/examples/ex_packet/ex_packet.vcproj
index b01f255..5653626 100644
--- a/windows_vnet/hl/examples/ptExampleFL/ptExampleFL.vcproj
+++ b/windows_vnet/hl/examples/ex_packet/ex_packet.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="ptExampleFL"

+	Name="ex_packet"

 	SccProjectName=""

 	SccLocalPath="">

 	<Platforms>

@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_packet\Debug"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_packet\Debug"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -26,10 +26,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="5"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ptExampleFL\Debug/ptExampleFL.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ptExampleFL\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ptExampleFL\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFL\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packet\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packet\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packet\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				DebugInformationFormat="4"

@@ -39,17 +39,17 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ptExampleFL\Debug/ptExampleFL.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ptExampleFL\Debug/ptExampleFL.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ptExampleFL\Debug/ptExampleFL.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packet\Debug/ex_packet.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

@@ -74,8 +74,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_packet\Release"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_packet\Release"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -90,10 +90,10 @@
 				RuntimeLibrary="4"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ptExampleFL\Release/ptExampleFL.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ptExampleFL\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ptExampleFL\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFL\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packet\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packet\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packet\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				CompileAs="0"/>

@@ -102,16 +102,16 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ptExampleFL\Release/ptExampleFL.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ptExampleFL\Release/ptExampleFL.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ptExampleFL\Release/ptExampleFL.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packet\Release/ex_packet.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

diff --git a/windows_vnet/hl/examples/ptExampleFLdll/ptExampleFLdll.vcproj b/windows_vnet/hl/examples/ex_packetdll/ex_packetdll.vcproj
index 73c2e39..33a9f34 100644
--- a/windows_vnet/hl/examples/ptExampleFLdll/ptExampleFLdll.vcproj
+++ b/windows_vnet/hl/examples/ex_packetdll/ex_packetdll.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="ptExampleFLdll"

+	Name="ex_packetdll"

 	SccProjectName=""

 	SccLocalPath="">

 	<Platforms>

@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_packetdll\Debug"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_packetdll\Debug"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -26,10 +26,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/ptExampleFLdll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packetdll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				DebugInformationFormat="4"

@@ -39,17 +39,17 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/ptExampleFLdll.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/ptExampleFLdll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/ptExampleFLdll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

@@ -74,8 +74,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_packetdll\Release"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_packetdll\Release"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -90,10 +90,10 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/ptExampleFLdll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_packetdll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				CompileAs="0"/>

@@ -102,16 +102,16 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/ptExampleFLdll.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/ptExampleFLdll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ptExampleFLdll\Release/ptExampleFLdll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_packetdll\Release/ex_packetdll.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

diff --git a/windows_vnet/hl/examples/ex_table01/ex_table01.vcproj b/windows_vnet/hl/examples/ex_table/ex_table.vcproj
index 369c6b4..2b5bf52 100644
--- a/windows_vnet/hl/examples/ex_table01/ex_table01.vcproj
+++ b/windows_vnet/hl/examples/ex_table/ex_table.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="ex_table01"

+	Name="ex_table"

 	SccProjectName=""

 	SccLocalPath="">

 	<Platforms>

@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_table\Release"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_table\Release"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -28,10 +28,10 @@
 				RuntimeLibrary="4"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table01\Release/ex_table01.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table01\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_table01\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_table\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				CompileAs="0"/>

@@ -40,16 +40,16 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_table01\Release/ex_table01.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib,..\..\..\..\proj\hdf5\release,..\..\..\..\proj\hdf5_hl\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table01\Release/ex_table01.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table01\Release/ex_table01.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table\Release/ex_table.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

@@ -74,8 +74,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_table\Debug"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_table\Debug"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -88,10 +88,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="5"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table01\Debug/ex_table01.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table01\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_table01\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_table\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				DebugInformationFormat="4"

@@ -101,17 +101,17 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_table01\Debug/ex_table01.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib\,..\..\..\..\proj\hdf5\debug,..\..\..\..\proj\hdf5_hl\debug"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table01\Debug/ex_table01.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table01\Debug/ex_table01.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table\Debug/ex_table.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

diff --git a/windows_vnet/hl/examples/ex_table02/ex_table02.vcproj b/windows_vnet/hl/examples/ex_table02/ex_table02.vcproj
deleted file mode 100644
index b263fcf..0000000
--- a/windows_vnet/hl/examples/ex_table02/ex_table02.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table02"

-	ProjectGUID="{FEC433E2-F31A-49FC-84F7-5A0DA9FC603D}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table02.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table02.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table02.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_02.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table02dll/ex_table02dll.vcproj b/windows_vnet/hl/examples/ex_table02dll/ex_table02dll.vcproj
deleted file mode 100644
index 91d1d4f..0000000
--- a/windows_vnet/hl/examples/ex_table02dll/ex_table02dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table02dll"

-	ProjectGUID="{16D21118-54D4-425B-9ADD-091FC1AC426A}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table02dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table02dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table02dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_02.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table03/ex_table03.vcproj b/windows_vnet/hl/examples/ex_table03/ex_table03.vcproj
deleted file mode 100644
index c41978a..0000000
--- a/windows_vnet/hl/examples/ex_table03/ex_table03.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table03"

-	ProjectGUID="{3F5979DE-2829-4E49-A02B-F3693659CB47}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table03.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table03.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table03.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_03.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table03dll/ex_table03dll.vcproj b/windows_vnet/hl/examples/ex_table03dll/ex_table03dll.vcproj
deleted file mode 100644
index 63ad67b..0000000
--- a/windows_vnet/hl/examples/ex_table03dll/ex_table03dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table03dll"

-	ProjectGUID="{3EF85C9B-925E-4DA3-99A9-994F6D1B4EE0}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table03dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table03dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table03dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_03.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table04/ex_table04.vcproj b/windows_vnet/hl/examples/ex_table04/ex_table04.vcproj
deleted file mode 100644
index c7d136c..0000000
--- a/windows_vnet/hl/examples/ex_table04/ex_table04.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table04"

-	ProjectGUID="{E97B3493-ACB4-42A5-97C8-4B813495BC02}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table04.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table04.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table04.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_04.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table04dll/ex_table04dll.vcproj b/windows_vnet/hl/examples/ex_table04dll/ex_table04dll.vcproj
deleted file mode 100644
index 3448971..0000000
--- a/windows_vnet/hl/examples/ex_table04dll/ex_table04dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table04dll"

-	ProjectGUID="{77B52391-90E8-48D5-A438-F30319958AC7}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table04dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table04dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table04dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_04.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table05/ex_table05.vcproj b/windows_vnet/hl/examples/ex_table05/ex_table05.vcproj
deleted file mode 100644
index 71beadb..0000000
--- a/windows_vnet/hl/examples/ex_table05/ex_table05.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table05"

-	ProjectGUID="{BDE0BF36-667E-4B7F-B07C-8874B121B9F4}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table05.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table05.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table05.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_05.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table05dll/ex_table05dll.vcproj b/windows_vnet/hl/examples/ex_table05dll/ex_table05dll.vcproj
deleted file mode 100644
index bdbc9cc..0000000
--- a/windows_vnet/hl/examples/ex_table05dll/ex_table05dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table05dll"

-	ProjectGUID="{6BB44516-EA47-471A-A72D-623B70062DE4}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table05dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table05dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table05dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_05.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table06/ex_table06.vcproj b/windows_vnet/hl/examples/ex_table06/ex_table06.vcproj
deleted file mode 100644
index 034ffd4..0000000
--- a/windows_vnet/hl/examples/ex_table06/ex_table06.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table06"

-	ProjectGUID="{8B05C3F8-A936-493A-A251-78B31C7CA400}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table06.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table06.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table06.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_06.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table06dll/ex_table06dll.vcproj b/windows_vnet/hl/examples/ex_table06dll/ex_table06dll.vcproj
deleted file mode 100644
index 9337cd3..0000000
--- a/windows_vnet/hl/examples/ex_table06dll/ex_table06dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table06dll"

-	ProjectGUID="{A928EDAB-FAA8-40D1-8C8B-7614D994F662}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table06dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table06dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table06dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_06.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table07/ex_table07.vcproj b/windows_vnet/hl/examples/ex_table07/ex_table07.vcproj
deleted file mode 100644
index 28cf2db..0000000
--- a/windows_vnet/hl/examples/ex_table07/ex_table07.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table07"

-	ProjectGUID="{1AAA811E-7A15-4940-B599-12532861FFDB}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table07.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table07.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table07.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_07.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table07dll/ex_table07dll.vcproj b/windows_vnet/hl/examples/ex_table07dll/ex_table07dll.vcproj
deleted file mode 100644
index c355e93..0000000
--- a/windows_vnet/hl/examples/ex_table07dll/ex_table07dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table07dll"

-	ProjectGUID="{D0907A70-422F-40E6-9CAE-BFD4DAF333DE}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table07dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table07dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table07dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_07.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table08/ex_table08.vcproj b/windows_vnet/hl/examples/ex_table08/ex_table08.vcproj
deleted file mode 100644
index 32a198b..0000000
--- a/windows_vnet/hl/examples/ex_table08/ex_table08.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table08"

-	ProjectGUID="{751BF943-2AFD-48A0-A7F3-6909E8F90B9B}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table08.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table08.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table08.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_08.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table08dll/ex_table08dll.vcproj b/windows_vnet/hl/examples/ex_table08dll/ex_table08dll.vcproj
deleted file mode 100644
index 58860f7..0000000
--- a/windows_vnet/hl/examples/ex_table08dll/ex_table08dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table08dll"

-	ProjectGUID="{ED80E5CE-63A2-4CE3-9B8B-DA91A5A27341}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table08dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table08dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table08dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_08.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table09/ex_table09.vcproj b/windows_vnet/hl/examples/ex_table09/ex_table09.vcproj
deleted file mode 100644
index 4483f6d..0000000
--- a/windows_vnet/hl/examples/ex_table09/ex_table09.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table09"

-	ProjectGUID="{033F3600-F9A7-46B2-933E-CFB18E6621A6}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table09.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table09.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table09.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_09.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table09dll/ex_table09dll.vcproj b/windows_vnet/hl/examples/ex_table09dll/ex_table09dll.vcproj
deleted file mode 100644
index 25c661c..0000000
--- a/windows_vnet/hl/examples/ex_table09dll/ex_table09dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table09dll"

-	ProjectGUID="{BCA0028D-28A0-4D9A-B66B-B2FB39A6CE9D}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table09dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table09dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table09dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_09.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table10/ex_table10.vcproj b/windows_vnet/hl/examples/ex_table10/ex_table10.vcproj
deleted file mode 100644
index c1648b2..0000000
--- a/windows_vnet/hl/examples/ex_table10/ex_table10.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table10"

-	ProjectGUID="{ABFD593D-0DA6-4F6E-BA32-2B9F9D05DCE5}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table10.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table10.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table10.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_10.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table10dll/ex_table10dll.vcproj b/windows_vnet/hl/examples/ex_table10dll/ex_table10dll.vcproj
deleted file mode 100644
index 125362c..0000000
--- a/windows_vnet/hl/examples/ex_table10dll/ex_table10dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table10dll"

-	ProjectGUID="{F74FE537-AD81-43E5-9902-368BF0D03F7A}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table10dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table10dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table10dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_10.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table11/ex_table11.vcproj b/windows_vnet/hl/examples/ex_table11/ex_table11.vcproj
deleted file mode 100644
index b883ed6..0000000
--- a/windows_vnet/hl/examples/ex_table11/ex_table11.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table11"

-	ProjectGUID="{27ED9926-BFEA-4163-B711-EA1C68FDA99A}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table11.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table11.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table11.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_11.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table11dll/ex_table11dll.vcproj b/windows_vnet/hl/examples/ex_table11dll/ex_table11dll.vcproj
deleted file mode 100644
index 44a62d3..0000000
--- a/windows_vnet/hl/examples/ex_table11dll/ex_table11dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table11dll"

-	ProjectGUID="{3A7F3327-35EF-4495-9EDD-E13B76717D89}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table11dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table11dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table11dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_11.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table12/ex_table12.vcproj b/windows_vnet/hl/examples/ex_table12/ex_table12.vcproj
deleted file mode 100644
index 2347ef7..0000000
--- a/windows_vnet/hl/examples/ex_table12/ex_table12.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table12"

-	ProjectGUID="{BFAF94EB-DF79-4F72-BAAA-8AC488D99F13}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table12.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table12.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table12.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_12.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table12dll/ex_table12dll.vcproj b/windows_vnet/hl/examples/ex_table12dll/ex_table12dll.vcproj
deleted file mode 100644
index 4800499..0000000
--- a/windows_vnet/hl/examples/ex_table12dll/ex_table12dll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ex_table12dll"

-	ProjectGUID="{0526B6D8-6E99-4E1E-A310-08EF62C97A4A}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table12dll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ex_table12dll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ex_table12dll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ex_table_12.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ex_table01dll/ex_table01dll.vcproj b/windows_vnet/hl/examples/ex_tabledll/ex_tabledll.vcproj
index e494729..ab7807b 100644
--- a/windows_vnet/hl/examples/ex_table01dll/ex_table01dll.vcproj
+++ b/windows_vnet/hl/examples/ex_tabledll/ex_tabledll.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="ex_table01dll"

+	Name="ex_tabledll"

 	SccProjectName=""

 	SccLocalPath="">

 	<Platforms>

@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_tabledll\Release"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_tabledll\Release"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -28,10 +28,10 @@
 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table01dll\Release/ex_table01dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table01dll\Release/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_table01dll\Release/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01dll\Release/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_tabledll\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				CompileAs="0"/>

@@ -40,16 +40,16 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_table01dll\Release/ex_table01dll.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll\,..\..\..\..\proj\hdf5dll\release,..\..\..\..\proj\hdf5_hldll\release"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table01dll\Release/ex_table01dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table01dll\Release/ex_table01dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_tabledll\Release/ex_tabledll.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

@@ -74,8 +74,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			OutputDirectory=".\..\..\..\..\hl\examples\ex_tabledll\Debug"

+			IntermediateDirectory=".\..\..\..\..\hl\examples\ex_tabledll\Debug"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -88,10 +88,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_table01dll\Debug/ex_table01dll.pch"

-				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_table01dll\Debug/"

-				ObjectFile=".\..\..\..\..\hl\examples\ex_table01dll\Debug/"

-				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01dll\Debug/"

+				PrecompiledHeaderFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.pch"

+				AssemblerListingLocation=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

+				ObjectFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_tabledll\Debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				DebugInformationFormat="4"

@@ -101,17 +101,17 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile=".\..\..\..\..\hl\examples\ex_table01dll\Debug/ex_table01dll.exe"

+				OutputFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll\,..\..\..\..\proj\hdf5dll\debug,..\..\..\..\proj\hdf5_hldll\debug"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_table01dll\Debug/ex_table01dll.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\..\..\..\..\hl\examples\ex_table01dll\Debug/ex_table01dll.tlb"

+				TypeLibraryName=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.tlb"

 				HeaderFileName=""/>

 			<Tool

 				Name="VCPostBuildEventTool"/>

diff --git a/windows_vnet/hl/examples/ptExampleVL/ptExampleVL.vcproj b/windows_vnet/hl/examples/ptExampleVL/ptExampleVL.vcproj
deleted file mode 100644
index 1df1a70..0000000
--- a/windows_vnet/hl/examples/ptExampleVL/ptExampleVL.vcproj
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ptExampleVL"

-	ProjectGUID="{1381D116-ACDF-4D91-9111-EF1C89F1FA72}"

-	RootNamespace="ptExampleVL"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\debug\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5d.lib hdf5_hld.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ptExampleVL.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\lib;..\..\..\..\proj\hdf5\debug;..\..\..\..\proj\hdf5_hl\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ptExampleVL.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5.lib hdf5_hl.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ptExampleVL.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\lib;..\..\..\..\proj\hdf5\release;..\..\..\..\proj\hdf5_hl\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ptExampleVL.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/hl/examples/ptExampleVLdll/ptExampleVLdll.vcproj b/windows_vnet/hl/examples/ptExampleVLdll/ptExampleVLdll.vcproj
deleted file mode 100644
index 233e7dd..0000000
--- a/windows_vnet/hl/examples/ptExampleVLdll/ptExampleVLdll.vcproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="ptExampleVLdll"

-	ProjectGUID="{66FA6E3D-D797-49E6-84E0-8D25616B431B}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ptExampleVLdll.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\debug\dll;..\..\..\..\proj\hdf5dll\debug;..\..\..\..\proj\hdf5_hldll\debug"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/ptExampleVLdll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\hl\examples\$(ProjectName)\$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\..\hdf5lib\release\include;..\..\..\..\src;..\..\..\..\hl\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_SZIP) $(HDF5_EXT_ZLIB)"

-				OutputFile="$(OutDir)/ptExampleVLdll.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\hdf5lib\release\dll;..\..\..\..\proj\hdf5dll\release;..\..\..\..\proj\hdf5_hldll\release"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\..\hl\examples\ptExampleVL.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/proj/all/all.sln b/windows_vnet/proj/all/all.sln
index 1666237..5b28435 100644
--- a/windows_vnet/proj/all/all.sln
+++ b/windows_vnet/proj/all/all.sln
@@ -17,6 +17,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcproj", "{BF2DE
 		{102AD40C-F194-45AE-BF39-D7DD249E9BEE} = {102AD40C-F194-45AE-BF39-D7DD249E9BEE}

 		{44908A0D-6D59-44EC-8E98-290367C74FA4} = {44908A0D-6D59-44EC-8E98-290367C74FA4}

 		{4DA38C0D-62F9-487F-B469-2C822A52D329} = {4DA38C0D-62F9-487F-B469-2C822A52D329}

+		{7F5E4B11-2464-4902-94B8-444B85200ED6} = {7F5E4B11-2464-4902-94B8-444B85200ED6}

 		{7A076512-49AF-475E-B4B3-FE5ECF08A51C} = {7A076512-49AF-475E-B4B3-FE5ECF08A51C}

 		{651D8414-0037-41E9-B5D9-C66199430492} = {651D8414-0037-41E9-B5D9-C66199430492}

 		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}

@@ -662,7 +663,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_cppdll", "..\hdf5_cppd
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl", "..\hdf5_hl\hdf5_hl.vcproj", "{4FC6670C-1339-4C34-9A5D-08D06A644256}"

 	ProjectSection(ProjectDependencies) = postProject

-		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl_cpp", "..\hdf5_hl_cpp\hdf5_hl_cpp.vcproj", "{CFCAEA96-B431-4EED-BE7B-C22FA99C6157}"

@@ -889,6 +889,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdr", "..\..\test\ohdr\ohd
 		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdr_gentst", "..\..\TEST\ohdr_gentst\ohdr_gentst.vcproj", "{7F5E4B11-2464-4902-94B8-444B85200ED6}"

+	ProjectSection(ProjectDependencies) = postProject

+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}

+	EndProjectSection

+EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdrdll", "..\..\test\ohdrdll\ohdrdll.vcproj", "{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}"

 	ProjectSection(ProjectDependencies) = postProject

 		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}

@@ -1045,18 +1050,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfddll", "..\..\TEST\vfddll
 		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk_infodll", "..\..\test\chunk_infodll\chunk_infodll.vcproj", "{4E8449CA-3833-49AA-B12E-7A59BA6A2D14}"

-	ProjectSection(ProjectDependencies) = postProject

-		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}

-		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk_info", "..\..\test\chunk_info\chunk_info.vcproj", "{F99F5FC8-29C2-407E-BC74-AB2623686017}"

-	ProjectSection(ProjectDependencies) = postProject

-		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}

-		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}

-	EndProjectSection

-EndProject

 Global

 	GlobalSection(SolutionConfiguration) = preSolution

 		AlphaDbg = AlphaDbg

@@ -2075,6 +2068,14 @@ Global
 		{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.Debug.Build.0 = Debug|Win32

 		{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.Release.ActiveCfg = Release|Win32

 		{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.Release.Build.0 = Release|Win32

+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.AlphaDbg.ActiveCfg = Debug|Win32

+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.AlphaDbg.Build.0 = Debug|Win32

+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.AlphaRel.ActiveCfg = Debug|Win32

+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.AlphaRel.Build.0 = Debug|Win32

+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.Debug.ActiveCfg = Debug|Win32

+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.Debug.Build.0 = Debug|Win32

+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.Release.ActiveCfg = Release|Win32

+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.Release.Build.0 = Release|Win32

 		{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.AlphaDbg.ActiveCfg = AlphaDbg|Win32

 		{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.AlphaDbg.Build.0 = AlphaDbg|Win32

 		{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.AlphaRel.ActiveCfg = AlphaRel|Win32

@@ -2291,22 +2292,6 @@ Global
 		{4DA38C0D-62F9-487F-B469-2C822A52D329}.Debug.Build.0 = Debug|Win32

 		{4DA38C0D-62F9-487F-B469-2C822A52D329}.Release.ActiveCfg = Release|Win32

 		{4DA38C0D-62F9-487F-B469-2C822A52D329}.Release.Build.0 = Release|Win32

-		{4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.AlphaDbg.ActiveCfg = Release|Win32

-		{4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.AlphaDbg.Build.0 = Release|Win32

-		{4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.AlphaRel.ActiveCfg = Release|Win32

-		{4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.AlphaRel.Build.0 = Release|Win32

-		{4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.Debug.ActiveCfg = Debug|Win32

-		{4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.Debug.Build.0 = Debug|Win32

-		{4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.Release.ActiveCfg = Release|Win32

-		{4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.Release.Build.0 = Release|Win32

-		{F99F5FC8-29C2-407E-BC74-AB2623686017}.AlphaDbg.ActiveCfg = Release|Win32

-		{F99F5FC8-29C2-407E-BC74-AB2623686017}.AlphaDbg.Build.0 = Release|Win32

-		{F99F5FC8-29C2-407E-BC74-AB2623686017}.AlphaRel.ActiveCfg = Release|Win32

-		{F99F5FC8-29C2-407E-BC74-AB2623686017}.AlphaRel.Build.0 = Release|Win32

-		{F99F5FC8-29C2-407E-BC74-AB2623686017}.Debug.ActiveCfg = Debug|Win32

-		{F99F5FC8-29C2-407E-BC74-AB2623686017}.Debug.Build.0 = Debug|Win32

-		{F99F5FC8-29C2-407E-BC74-AB2623686017}.Release.ActiveCfg = Release|Win32

-		{F99F5FC8-29C2-407E-BC74-AB2623686017}.Release.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 	EndGlobalSection

diff --git a/windows_vnet/proj/hdf5/hdf5.vcproj b/windows_vnet/proj/hdf5/hdf5.vcproj
index c02068c..ac8581d 100644
--- a/windows_vnet/proj/hdf5/hdf5.vcproj
+++ b/windows_vnet/proj/hdf5/hdf5.vcproj
@@ -922,9 +922,6 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dchunk.c">

-			</File>

-			<File

 				RelativePath="..\..\..\src\H5Dcompact.c">

 				<FileConfiguration

 					Name="Debug|Win32">

@@ -1322,9 +1319,6 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dscatgath.c">

-			</File>

-			<File

 				RelativePath="..\..\..\src\H5Dselect.c">

 				<FileConfiguration

 					Name="Debug|Win32">

diff --git a/windows_vnet/proj/hdf5dll/hdf5dll.vcproj b/windows_vnet/proj/hdf5dll/hdf5dll.vcproj
index 23debef..f4d83a9 100644
--- a/windows_vnet/proj/hdf5dll/hdf5dll.vcproj
+++ b/windows_vnet/proj/hdf5dll/hdf5dll.vcproj
@@ -973,9 +973,6 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dchunk.c">

-			</File>

-			<File

 				RelativePath="..\..\..\src\H5Dcompact.c">

 				<FileConfiguration

 					Name="Debug|Win32">

@@ -1374,9 +1371,6 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dscatgath.c">

-			</File>

-			<File

 				RelativePath="..\..\..\src\H5Dselect.c">

 				<FileConfiguration

 					Name="Debug|Win32">

diff --git a/windows_vnet/test/chunk_info/chunk_info.vcproj b/windows_vnet/test/chunk_info/chunk_info.vcproj
deleted file mode 100644
index c58cf4c..0000000
--- a/windows_vnet/test/chunk_info/chunk_info.vcproj
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="chunk_info"

-	ProjectGUID="{F99F5FC8-29C2-407E-BC74-AB2623686017}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\../../../test/chunk_info/Debug"

-			IntermediateDirectory=".\../../../test/chunk_info/Debug"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile="$(OutDir)/chunk_info.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/chunk_info.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\../../../test/chunk_info/Release"

-			IntermediateDirectory=".\../../../test/chunk_info/Release"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile="$(OutDir)/chunk_info.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\test\chunk_info.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/test/chunk_infodll/chunk_infodll.vcproj b/windows_vnet/test/chunk_infodll/chunk_infodll.vcproj
deleted file mode 100644
index bd92532..0000000
--- a/windows_vnet/test/chunk_infodll/chunk_infodll.vcproj
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="chunk_infodll"

-	ProjectGUID="{4E8449CA-3833-49AA-B12E-7A59BA6A2D14}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\../../../test/chunk_infodll/Debug"

-			IntermediateDirectory=".\../../../test/chunk_infodll/Debug"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile="$(OutDir)/chunk_infodll.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/chunk_infodll.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\../../../test/chunk_infodll/Release"

-			IntermediateDirectory=".\../../../test/chunk_infodll/Release"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="$(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

-				OutputFile="$(OutDir)/chunk_infodll.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\test\chunk_info.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/windows_vnet/test/ohdr_gentst/ohdr_gentst.vcproj b/windows_vnet/test/ohdr_gentst/ohdr_gentst.vcproj
new file mode 100644
index 0000000..c2359f4
--- /dev/null
+++ b/windows_vnet/test/ohdr_gentst/ohdr_gentst.vcproj
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.10"

+	Name="ohdr_gentst"

+	SccProjectName=""

+	SccLocalPath="">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\../../../test/ohdr_gentst/Release"

+			IntermediateDirectory=".\../../../test/ohdr_gentst/Release"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\src"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				StringPooling="TRUE"

+				RuntimeLibrary="4"

+				EnableFunctionLevelLinking="TRUE"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderFile=".\../../../test/ohdr_gentst/Release/ohdr_gentst.pch"

+				AssemblerListingLocation=".\../../../test/ohdr_gentst/Release/"

+				ObjectFile=".\../../../test/ohdr_gentst/Release/"

+				ProgramDataBaseFileName=".\../../../test/ohdr_gentst/Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile=".\../../../test/ohdr_gentst/Release/ohdr_gentst.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="TRUE"

+				ProgramDatabaseFile=".\../../../test/ohdr_gentst/Release/ohdr_gentst.pdb"

+				SubSystem="1"

+				TargetMachine="1"/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../test/ohdr_gentst/Release/ohdr_gentst.tlb"

+				HeaderFileName=""/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\../../../test/ohdr_gentst/Debug"

+			IntermediateDirectory=".\../../../test/ohdr_gentst/Debug"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\src"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="5"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderFile=".\../../../test/ohdr_gentst/Debug/ohdr_gentst.pch"

+				AssemblerListingLocation=".\../../../test/ohdr_gentst/Debug/"

+				ObjectFile=".\../../../test/ohdr_gentst/Debug/"

+				ProgramDataBaseFileName=".\../../../test/ohdr_gentst/Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				DebugInformationFormat="4"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"

+				OutputFile=".\../../../test/ohdr_gentst/Debug/ohdr_gentst.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="TRUE"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile=".\../../../test/ohdr_gentst/Debug/ohdr_gentst.pdb"

+				SubSystem="1"

+				TargetMachine="1"/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\../../../test/ohdr_gentst/Debug/ohdr_gentst.tlb"

+				HeaderFileName=""/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			<File

+				RelativePath="..\..\..\test\gen_bogus.c">

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"/>

+				</FileConfiguration>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl">

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/windows_vnet/tools/h5repack/h5repack.vcproj b/windows_vnet/tools/h5repack/h5repack.vcproj
index 60568b1..12522bb 100644
--- a/windows_vnet/tools/h5repack/h5repack.vcproj
+++ b/windows_vnet/tools/h5repack/h5repack.vcproj
@@ -105,7 +105,7 @@
 				OutputFile=".\../../../tools/h5repack/Debug/h5repack.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

-				AdditionalLibraryDirectories=""

+				AdditionalLibraryDirectories="D:\szip\all\lib\Debug"

 				IgnoreDefaultLibraryNames="libc.lib"

 				GenerateDebugInformation="TRUE"

 				ProgramDatabaseFile=".\../../../tools/h5repack/Debug/h5repack.pdb"