diff --git a/.gitattributes b/.gitattributes
index 512c167..60cc83a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -366,27 +366,16 @@ src/C++/H5Fed.cc -text
 src/C++/H5Fed.hh -text
 src/C++/Makefile.am -text
 src/C/H5.c -text
-src/C/H5.h -text
 src/C/H5Block.c -text
-src/C/H5Block.h -text
 src/C/H5Fed.c -text
-src/C/H5Fed.h -text
 src/C/H5Fed_adjacency.c -text
-src/C/H5Fed_adjacency.h -text
 src/C/H5Fed_inquiry.c -text
-src/C/H5Fed_inquiry.h -text
 src/C/H5Fed_map.c -text
-src/C/H5Fed_map.h -text
 src/C/H5Fed_retrieve.c -text
-src/C/H5Fed_retrieve.h -text
 src/C/H5Fed_store.c -text
-src/C/H5Fed_store.h -text
 src/C/H5Fed_tags.c -text
-src/C/H5Fed_tags.h -text
 src/C/H5Part.c -text
-src/C/H5Part.h -text
 src/C/H5_inquiry.c -text
-src/C/H5_inquiry.h -text
 src/C/Makefile.am -text
 src/Fortran/H5BlockF.c -text
 src/Fortran/H5BlockF90.inc -text
diff --git a/src/C/H5.h b/src/C/H5.h
deleted file mode 100644
index be60e85..0000000
--- a/src/C/H5.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-  Copyright 2007-2008
- 	Paul Scherrer Institut, Villigen, Switzerland;
- 	Benedikt Oswald;
- 	Achim Gsell
- 	All rights reserved.
- 
-  Authors
- 	Achim Gsell
-  
-  Warning
-	This code is under development.
- 
- */
-
-#ifndef __H5_H
-#define __H5_H
-
-#include "H5_inquiry.h"
-
-h5_file_t *
-H5OpenFile (
-	const char * filename,
-	const h5_int32_t oflag,
-	const MPI_Comm comm
-	);
-
-h5_err_t
-H5CloseFile (
-	h5_file_t * f
-	);
-
-h5_err_t
-H5SetStepNameFormat (
-	h5_file_t *f,
-	const char *name,
-	const h5_int64_t width
-	);
-
-h5_err_t
-H5GetStepNameFormat (
-	h5_file_t *f,
-	char *name,
-	const h5_size_t l_name,
-	h5_size_t *width
-	);
-
-h5_err_t
-H5SetStep (
-	h5_file_t *f,
-	const h5_int64_t step
-	);
-
-h5_int64_t
-H5GetStep (
-	h5_file_t *f
-	);
-
-h5_err_t
-H5StartTraverseSteps (
-	h5_file_t *f
-	);
-
-h5_id_t
-H5TraverseSteps (
-	h5_file_t *f
-	);
-
-h5_err_t
-H5EndTraverseSteps (
-	h5_file_t *f
-	);
-
-h5_err_t
-H5SetVerbosityLevel (
-	const h5_id_t level
-	);
-
-h5_err_t
-H5SetErrorHandler (
-	h5_errorhandler_t handler
-	);
-
-h5_errorhandler_t
-H5GetErrorHandler (
-	void
-	);
-
-h5_err_t
-H5ReportErrorhandler (
-	h5_file_t * const f,
-	const char *fmt,
-	va_list ap
-	);
-
-h5_err_t
-H5AbortErrorhandler (
-	h5_file_t * const f,
-	const char *fmt,
-	va_list ap
-	);
-
-h5_err_t
-H5GetErrno (
-	h5_file_t * const f
-	);
-
-#endif
diff --git a/src/C/H5Block.h b/src/C/H5Block.h
deleted file mode 100644
index 6dc878b..0000000
--- a/src/C/H5Block.h
+++ /dev/null
@@ -1,204 +0,0 @@
-#ifndef __H5BLOCK_H
-#define __H5BLOCK_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*! 
-  Interface for block structured field data
-
-*/
-
-h5_int64_t
-H5BlockDefine3DFieldLayout (
-	h5_file_t *f,
-	const h5_int64_t i_start,
-	const h5_int64_t i_end,
-	const h5_int64_t j_start,
-	const h5_int64_t j_end,
-	const h5_int64_t k_start,
-	const h5_int64_t k_end
-	);
-
-h5_int64_t
-H5Block3dGetPartitionOfProc (
-	h5_file_t *f,
-	const h5_int64_t proc,
-	h5_int64_t *i_start,
-	h5_int64_t *i_end,
-	h5_int64_t *j_start,
-	h5_int64_t *j_end,
-	h5_int64_t *k_start,
-	h5_int64_t *k_end
-	);
-
-h5_int64_t
-H5Block3dGetReducedPartitionOfProc (
-	h5_file_t *f,
-	h5_int64_t proc,
-	h5_int64_t *i_start, 
-	h5_int64_t *i_end,
-	h5_int64_t *j_start,
-	h5_int64_t *j_end,
-	h5_int64_t *k_start,
-	h5_int64_t *k_end
-	);
-
-h5_int64_t
-H5Block3dGetProcOf (
-	h5_file_t *f,
-	h5_int64_t i,
-	h5_int64_t j,
-	h5_int64_t k
-	);
-
-h5_int64_t
-H5Block3dWriteScalarField (
-	h5_file_t *f,
-	const char *name,
-	const h5_float64_t *data
-	);
-
-h5_int64_t
-H5Block3dReadScalarField (
-	h5_file_t *f,
-	const char *name,
-	h5_float64_t *data
-	);
-
-h5_int64_t
-H5BlockGetNumFields (
-	h5_file_t *f
-	);
-
-h5_int64_t
-H5BlockGetFieldInfo (
-	h5_file_t *f,
-	const h5_int64_t idx,
-	char *name,
-	const h5_int64_t len_name,
-	h5_int64_t *grid_rank,
-	h5_int64_t *grid_dims,
-	h5_int64_t *field_dims
-	);
-
-h5_int64_t
-H5BlockGetFieldInfoByName (
-	h5_file_t *f,
-	const char *field_name,
-	h5_int64_t *grid_rank,
-	h5_int64_t *grid_dims,
-	h5_int64_t *field_dims
-	);
-
-h5_int64_t
-H5Block3dGetFieldOrigin (
-	h5_file_t *f,
-	const char *field_name,
-	h5_float64_t *x_origin,
-	h5_float64_t *y_origin,
-	h5_float64_t *z_origin
-	);
-
-h5_int64_t
-H5Block3dSetFieldOrigin (
-	h5_file_t *f,
-	const char *field_name,
-	const h5_float64_t x_origin,
-	const h5_float64_t y_origin,
-	const h5_float64_t z_origin
-	);
-
-h5_int64_t
-H5Block3dGetFieldSpacing (
-	h5_file_t *f,
-	const char *field_name,
-	h5_float64_t *x_spacing,
-	h5_float64_t *y_spacing,
-	h5_float64_t *z_spacing
-	);
-
-h5_int64_t
-H5Block3dSetFieldSpacing (
-	h5_file_t *f,
-	const char *field_name,
-	const h5_float64_t x_spacing,
-	const h5_float64_t y_spacing,
-	const h5_float64_t z_spacing
-	);
-
-
-
-h5_int64_t
-H5Block3dWrite3dVectorField (
-	h5_file_t *f,
-	const char *name,
-	const h5_float64_t *xval,
-	const h5_float64_t *yval,
-	const h5_float64_t *zval
-	);	
-
-h5_int64_t
-H5Block3dRead3dVectorField (
-	h5_file_t *f,
-	const char *name,
-	h5_float64_t *xval,
-	h5_float64_t *yval,
-	h5_float64_t *zval
-	);
-
-h5_int64_t
-H5BlockWriteFieldAttrib (
-	h5_file_t *f,
-	const char *field_name,
-	const char *attrib_name,
-	const h5_int64_t attrib_type,
-	const void *attrib_value,
-	const h5_int64_t attrib_nelem
-	);
-
-h5_int64_t
-H5BlockWriteFieldAttribString (
-	h5_file_t *f,
-	const char *field_name,
-	const char *attrib_name,
-	const char *attrib_value
-	);
-
-h5_int64_t
-H5BlockGetNumFieldAttribs (
-	h5_file_t *f,
-	const char *field_name
-	);
-
-h5_int64_t
-H5BlockGetFieldAttribInfo (
-	h5_file_t *f,
-	const char *field_name,
-	const h5_int64_t attrib_idx,
-	char *attrib_name,
-	const h5_int64_t len_of_attrib_name,
-	h5_int64_t *attrib_type,
-	h5_int64_t *attrib_nelem
-	);
-
-h5_int64_t
-H5BlockReadFieldAttrib (
-	h5_file_t *f,
-	const char *field_name,
-	const char *attrib_name,
-	void *attrib_value
-	);
-
-h5_int64_t
-H5BlockHasFieldData (
-	h5_file_t *f
-	);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/C/H5Fed.h b/src/C/H5Fed.h
deleted file mode 100644
index 62d9c8e..0000000
--- a/src/C/H5Fed.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-  Header file for declaring the H5Fed application programming
-  interface (API) in the C language.
-  
-  Copyright 2006-2007
- 	Paul Scherrer Institut, Villigen, Switzerland;
- 	Benedikt Oswald;
- 	Achim Gsell
- 	All rights reserved.
- 
-  Authors
- 	Achim Gsell
-  
-  Warning
-	This code is under development.
- 
- */
-
-#ifndef __H5FED_H
-#define __H5FED_H
-
-#include "H5.h"
-#include "H5Fed_adjacency.h"
-#include "H5Fed_inquiry.h"
-#include "H5Fed_map.h"
-#include "H5Fed_retrieve.h"
-#include "H5Fed_store.h"
-#include "H5Fed_tags.h"
-
-/******	General routines *****************************************************/
-
-h5_err_t
-H5FedOpenMesh (
-	h5_file_t * const f,
-	const h5_id_t mesh_id,
-	const h5_oid_t mesh_type_id
-	);
-
-h5_err_t
-H5FedCloseMesh (
-	h5_file_t * const f
-	);
-
-h5_err_t
-H5FedSetLevel (
-	h5_file_t * f,
-	const h5_id_t level_id
-	);
-
-h5_err_t
-H5FedLinkMeshToStep (
-	h5_file_t * f,
-	const h5_id_t mesh_id
-	);
-
-
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/C/H5Fed_adjacency.h b/src/C/H5Fed_adjacency.h
deleted file mode 100644
index c308917..0000000
--- a/src/C/H5Fed_adjacency.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef __H5FED_ADJACENCY_H
-#define __H5FED_ADJACENCY_H
-
-h5_err_t
-H5FedGetEdgesUpAdjacentToVertex (
-	h5_file_t * const f,
-	const h5_id_t local_vid,
-	h5_idlist_t **list
-	);
-
-h5_err_t
-H5FedGetTrianglesUpAdjacentToVertex (
-	h5_file_t * const f,
-	const h5_id_t local_vid,
-	h5_idlist_t **list
-	);
-
-h5_err_t
-H5FedGetTetsUpAdjacentToVertex (
-	h5_file_t * const f,
-	const h5_id_t local_vid,
-	h5_idlist_t **list
-	);
-
-h5_err_t
-H5FedGetTrianglesUpAdjacentToEdge (
-	h5_file_t * const f,
-	const h5_id_t local_kid,
-	h5_idlist_t **list
-	);
-
-h5_err_t
-H5FedGetTetsUpAdjacentToEdge (
-	h5_file_t * const f,
-	const h5_id_t local_kid,
-	h5_idlist_t **list
-	);
-
-h5_err_t
-H5FedGetTetsUpAdjacentToTriangle (
-	h5_file_t * const f,
-	const h5_id_t local_did,
-	h5_idlist_t **list
-	);
-
-h5_err_t
-H5FedGetVerticesDownAdjacentToEdge (
-	h5_file_t * const f,
-	const h5_id_t local_kid,
-	h5_idlist_t **list
-	);
-
-h5_err_t
-H5FedGetVerticesDownAdjacentToTriangle (
-	h5_file_t * const f,
-	const h5_id_t local_did,
-	h5_idlist_t **list
-	);
-
-h5_err_t
-H5FedGetVerticesDownAdjacentToTet (
-	h5_file_t * const f,
-	const h5_id_t local_tid,
-	h5_idlist_t **list
-	);
-
-h5_err_t
-H5FedGetEdgesDownAdjacentToTriangle (
-	h5_file_t * const f,
-	const h5_id_t local_did,
-	h5_idlist_t **list
-	);
-
-h5_err_t
-H5FedGetEdgesDownAdjacentToTet (
-	h5_file_t * const f,
-	const h5_id_t local_tid,
-	h5_idlist_t **list
-	);
-
-h5_err_t
-H5FedGetTrianglesDownAdjacentToTet (
-	h5_file_t * const f,
-	const h5_id_t local_tid,
-	h5_idlist_t **list
-	);
-
-h5_err_t
-H5FedReleaseListOfAdjacencies (
-	h5_file_t * const f,
-	h5_idlist_t **list
-	);
-
-#endif
diff --git a/src/C/H5Fed_inquiry.h b/src/C/H5Fed_inquiry.h
deleted file mode 100644
index da14385..0000000
--- a/src/C/H5Fed_inquiry.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-  Header file for declaring the H5Fed application programming
-  interface (API) in the C language.
-  
-  Copyright 2006-2007
- 	Paul Scherrer Institut, Villigen, Switzerland;
- 	Benedikt Oswald;
- 	Achim Gsell
- 	All rights reserved.
- 
-  Authors
- 	Achim Gsell
-  
-  Warning
-	This code is under development.
- 
- */
-#ifndef __H5FED_INQUIRY_H
-#define __H5FED_INQUIRY_H
-
-h5_size_t H5FedGetNumMeshes ( h5_file_t * const f, const h5_oid_t type_id );
-h5_size_t H5FedGetNumLevels ( h5_file_t * const f );
-h5_id_t H5FedGetLevel ( h5_file_t * const f );
-h5_size_t H5FedGetNumVertices ( h5_file_t * const f );
-h5_size_t H5FedGetNumVerticesCnode ( h5_file_t * const f, const h5_id_t cnode );
-h5_size_t H5FedGetNumVerticesTotal ( h5_file_t * const f );
-h5_size_t H5FedGetNumElements ( h5_file_t * const f );
-h5_size_t H5FedGetNumElementsCnode ( h5_file_t * const f, const h5_id_t cnode );
-h5_size_t H5FedGetNumElementsTotal ( h5_file_t * const f );
-#endif
diff --git a/src/C/H5Fed_map.h b/src/C/H5Fed_map.h
deleted file mode 100644
index d1ae4ba..0000000
--- a/src/C/H5Fed_map.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-  Header file for declaring the H5Fed application programming
-  interface (API) in the C language.
-  
-  Copyright 2006-2007
- 	Paul Scherrer Institut, Villigen, Switzerland;
- 	Benedikt Oswald;
- 	Achim Gsell
- 	All rights reserved.
- 
-  Authors
- 	Achim Gsell
-  
-  Warning
-	This code is under development.
- 
- */
-
-#ifndef __H5FED_MAP_H
-#define __H5FED_MAP_H
-
-h5_err_t
-H5FedLMapEdgeID2VertexIDs (
-	h5_file_t * const f,
-	h5_id_t local_id,
-	h5_id_t *localvids
-	);
-
-h5_err_t
-H5FedLMapTriangleID2VertexIDs (
-	h5_file_t * const f,
-	h5_id_t local_id,
-	h5_id_t *localvids
-	);
-
-h5_err_t
-H5FedLMapTetID2VertexIDs (
-	h5_file_t * const f,
-	h5_id_t local_id,
-	h5_id_t *localvids
-	);
-
-#endif
-
diff --git a/src/C/H5Fed_retrieve.h b/src/C/H5Fed_retrieve.h
deleted file mode 100644
index 828ffcc..0000000
--- a/src/C/H5Fed_retrieve.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright 2007-2009
- 	Paul Scherrer Institut, Villigen, Switzerland;
- 	Benedikt Oswald;
- 	Achim Gsell
- 	All rights reserved.
- 
-  Authors
- 	Achim Gsell
-  
-  Warning
-	This code is under development.
- 
- */
-#ifndef __H5FED_RETRIEVE_H
-#define __H5FED_RETRIEVE_H
-
-h5_err_t H5FedBeginTraverseVertices ( h5_file_t * const f );
-h5_id_t H5FedTraverseVertices ( h5_file_t * const f, h5_float64_t P[3] );
-h5_err_t H5FedEndTraverseVertices ( h5_file_t * const f	);
-
-h5_err_t H5FedBeginTraverseEdges ( h5_file_t * const f );
-h5_id_t H5FedTraverseEdges ( h5_file_t * const f, h5_id_t * const vids );
-h5_err_t H5FedEndTraverseEdges ( h5_file_t * const f );
-
-h5_err_t H5FedBeginTraverseTriangles ( h5_file_t * const f );
-h5_id_t H5FedTraverseTriangles ( h5_file_t * const f, h5_id_t * const vids );
-h5_err_t H5FedEndTraverseTriangles ( h5_file_t * const f );
-
-h5_err_t H5FedBeginTraverseElements ( h5_file_t * const f );
-h5_id_t H5FedTraverseElements ( h5_file_t * const f, h5_id_t * const vids );
-h5_err_t H5FedEndTraverseElements ( h5_file_t * const f );
-#endif
diff --git a/src/C/H5Fed_store.h b/src/C/H5Fed_store.h
deleted file mode 100644
index 5a0a0ac..0000000
--- a/src/C/H5Fed_store.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-  Header file for declaring the H5Fed application programming
-  interface (API) in the C language.
-  
-  Copyright 2006-2009
- 	Paul Scherrer Institut, Villigen, Switzerland;
- 	Benedikt Oswald;
- 	Achim Gsell
- 	All rights reserved.
- 
-  Authors
- 	Achim Gsell
-  
-  Warning
-	This code is under development.
- 
- */
-
-#ifndef __H5FED_STORE_H
-#define __H5FED_STORE_H
-
-h5_id_t
-H5FedAddMesh (
-	h5_file_t * const f,
-	const h5_oid_t mesh_type_id
-	);
-
-h5_id_t
-H5FedAddLevel (
-	h5_file_t * const f
-	);
-
-h5_err_t
-H5FedBeginStoreVertices (
-	h5_file_t * const f,
-	const h5_size_t num
-	);
-
-h5_id_t
-H5FedStoreVertex (
-	h5_file_t * const f,
-	const h5_id_t id,
-	const h5_float64_t P[3]
-	);
-
-h5_err_t
-H5FedEndStoreVertices (
-	h5_file_t * const f
-	);
-
-h5_err_t
-H5FedBeginStoreElements (
-	h5_file_t * const f,
-	const h5_size_t num
-	);
-
-
-h5_id_t
-H5FedStoreElement (
-	h5_file_t * const f,
-	const h5_id_t local_vids[]
-	);
-
-h5_err_t
-H5FedEndStoreElements (
-	h5_file_t * const f
-	);
-
-h5_err_t
-H5FedBeginRefineElements (
-	h5_file_t * const f,
-	const h5_size_t num
-	);
-
-h5_id_t
-H5FedRefineElement (
-	h5_file_t * const f,
-	const h5_id_t eid
-	);
-
-h5_err_t
-H5FedEndRefineElements (
-	h5_file_t * const f
-	);
-
-h5_err_t
-H5FedMarkRefineElement (
-	h5_file_t * const f,
-	const h5_id_t eid
-	);
-
-
-#endif
diff --git a/src/C/H5Fed_tags.h b/src/C/H5Fed_tags.h
deleted file mode 100644
index aa880aa..0000000
--- a/src/C/H5Fed_tags.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef __H5FED_TAGS_H
-#define __H5FED_TAGS_H
-h5_err_t	H5FedAddMTagset ( h5_file_t * const f,
-				  char * name,
-				  h5_id_t type );
-h5_err_t	H5FedRemoveMTagset ( h5_file_t *const f,
-				     char name[] );
-h5_size_t	H5FedGetMTagsets ( h5_file_t *const f,
-				   char **names[] );
-h5_id_t		H5FedGetTypeOfMTagset ( h5_file_t *const f,
-					char name[] );
-h5_err_t	H5FedSetMTag ( h5_file_t *const f,
-			       char name[], h5_id_t id,
-			       const size_t dims, void *val );
-h5_err_t	H5FedSetMTagToVertex ( h5_file_t *const f,
-				       char name[], h5_id_t id,
-				       const size_t dims, void *val );
-h5_err_t	H5FedSetMTagToEdge ( h5_file_t *const f,
-				     char name[], h5_id_t id,
-				     const size_t dims, void *val );
-h5_err_t	H5FedSetMTagToTriangle ( h5_file_t *const f,
-					 char name[], h5_id_t id,
-					 const size_t dims, void *val );
-h5_err_t	H5FedSetMTagToTet ( h5_file_t *const f,
-				    char name[], h5_id_t id,
-				    const size_t dims, void *val );
-
-h5_err_t	H5FedGetMTag ( h5_file_t *const f,
-			       const char name[], const h5_id_t id, 
-			       size_t *dims, void *val );
-h5_err_t	H5FedRemoveMTag ( h5_file_t *const f,
-				  const char name[], const h5_id_t id );
-
-/*
-  Get descriptor for a tagset
-  Get tag value by descriptor
-  get size of value
-  Get tagset names for specific entity
-*/
-#endif
diff --git a/src/C/H5Part.h b/src/C/H5Part.h
deleted file mode 100644
index 50f5232..0000000
--- a/src/C/H5Part.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-  Header file for declaring the H5Fed application programming
-  interface (API) in the C language.
-  
-  Copyright 2006-2007
- 	Paul Scherrer Institut, Villigen, Switzerland;
- 	Benedikt Oswald;
- 	Achim Gsell
- 	All rights reserved.
- 
-  Authors
- 	Achim Gsell
-  
-  Warning
-	This code is under development.
- 
- */
-#ifndef __H5Part_H
-#define __H5Part_H
-
-#include <hdf5.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "h5_core/h5_core.h"
-#include "H5.h"
-#ifdef PARALLEL_IO
-#include <mpi.h>
-#endif
-
-// #define H5PART_SUCCESS		H5_SUCCESS
-#define H5PART_ERR_NOMEM	H5_ERR_NOMEM
-#define H5PART_ERR_INVAL	H5_ERR_INVAL
-#define H5PART_ERR_BADFD	H5_ERR_BADFD
-#define H5PART_ERR_LAYOUT	H5_ERR_LAYOUT
-#define H5PART_ERR_NOENT	H5_ERR_NOENT
-#define H5PART_ERR_NOENTRY	H5_ERR_NOENTRY
-
-#define H5PART_ERR_MPI		H5_ERR_MPI
-#define H5PART_ERR_HDF5		H5_ERR_HDF5
-
-#define H5PART_READ		H5_O_RDONLY
-#define H5PART_WRITE		H5_O_WRONLY
-#define H5PART_APPEND		H5_O_APPEND
-
-#define H5PART_INT64		((h5_int64_t)H5T_NATIVE_INT64)
-#define H5PART_FLOAT64		((h5_int64_t)H5T_NATIVE_DOUBLE)
-#define H5PART_CHAR		((h5_int64_t)H5T_NATIVE_CHAR)
-
-/*========== File Opening/Closing ===============*/
-h5_file_t *
-H5PartOpenFile(
-	const char *filename,
-	const unsigned flags
-	);
-
-#define H5PartOpenFileSerial(x,y) H5PartOpenFile(x,y)
-
-#ifdef PARALLEL_IO
-h5_file_t *
-H5PartOpenFileParallel (
-	const char *filename,
-	const unsigned flags,
-	MPI_Comm communicator
-	);
-#endif
-
-
-h5_int64_t
-H5PartCloseFile (
-	h5_file_t *f
-	);
-
-
-/*============== File Writing Functions ==================== */
-h5_int64_t
-H5PartDefineStepName (
-	h5_file_t *f,
-	const char *name,
-	const h5_int64_t width
-	);
-
-h5_int64_t
-H5PartSetNumParticles ( 
-	h5_file_t *f, 
-	const h5_int64_t nparticles
-	);
-
-h5_int64_t
-H5PartWriteDataFloat64 (
-	h5_file_t *f,
-	const char *name,
-	const h5_float64_t *array
-	);
-
-h5_int64_t
-H5PartWriteDataInt64 (
-	h5_file_t *f,
-	const char *name,
-	const h5_int64_t *array
-	);
-
-/*================== File Reading Routines =================*/
-h5_int64_t
-H5PartSetStep (
-	h5_file_t *f,
-	const h5_int64_t step
-	);
-
-h5_int64_t
-H5PartGetNumDatasets (
-	h5_file_t *f
-	);
-
-h5_int64_t
-H5PartGetDatasetName (
-	h5_file_t *f,
-	const h5_int64_t idx,
-	char *name,
-	const h5_int64_t maxlen
-	);
-
-h5_int64_t
-H5PartGetDatasetInfo (
-	h5_file_t *f,
-	const h5_int64_t idx,
-	char *name,
-	const h5_int64_t maxlen,
-	h5_int64_t *type,
-	h5_int64_t *nelem);
-
-
-h5_int64_t
-H5PartGetNumParticles (
-	h5_file_t *f
-	);
-
-h5_int64_t
-H5PartSetView (
-	h5_file_t *f,
-	const h5_int64_t start,
-	const h5_int64_t end
-	);
-
-
-h5_int64_t
-H5PartGetView (
-	h5_file_t *f,
-	h5_int64_t *start,
-	h5_int64_t *end
-	);
-
-h5_int64_t
-H5PartHasView (
-	h5_file_t *f
-	);
-
-h5_int64_t
-H5PartResetView (
-	h5_file_t *f
-	);
-
-h5_int64_t
-H5PartSetCanonicalView (
-	h5_file_t *f
-	);
-
-h5_int64_t
-H5PartReadDataFloat64(
-	h5_file_t *f,
-	const char *name,
-	h5_float64_t *array
-	);
-
-h5_int64_t
-H5PartReadDataInt64 (
-	h5_file_t *f,
-	const char *name,
-	h5_int64_t *array
-	);
-
-h5_int64_t
-H5PartReadParticleStep (
-	h5_file_t *f,
-	const h5_int64_t step,
-	h5_float64_t *x, /* particle positions */
-	h5_float64_t *y,
-	h5_float64_t *z,
-	h5_float64_t *px, /* particle momenta */
-	h5_float64_t *py,
-	h5_float64_t *pz,
-	h5_int64_t *id /* and phase */
-	);
-
-/**********==============Attributes Interface============***************/
-/* currently there is file attributes:  Attributes bound to the file
-   and step attributes which are bound to the current step.  You 
-   must set the step explicitly before writing the attributes (just
-   as you must do when you write a new dataset.  Currently there are no
-   attributes that are bound to a particular data array, but this could
-   easily be done if required.
-*/
-h5_int64_t
-H5PartWriteStepAttrib (
-	h5_file_t *f,
-	const char *attrib_name,
-	const h5_int64_t attrib_type,
-	const void *attrib_value,
-	const h5_int64_t attrib_nelem
-	);
-
-h5_int64_t
-H5PartWriteFileAttrib (
-	h5_file_t *f,
-	const char *attrib_name,
-	const h5_int64_t attrib_type,
-	const void *attrib_value,
-	const h5_int64_t attrib_nelem
-	);
-
-h5_int64_t
-H5PartWriteFileAttribString (
-	h5_file_t *f,
-	const char *name,
-	const char *attrib
-	);
-
-h5_int64_t
-H5PartWriteStepAttribString ( 
-	h5_file_t *f,
-	const char *name,
-	const char *attrib
-	);
-
-h5_int64_t
-H5PartGetNumStepAttribs ( /* for current filestep */
-	h5_file_t *f
-	);
-
-h5_int64_t
-H5PartGetNumFileAttribs (
-	h5_file_t *f
-	);
-
-h5_int64_t
-H5PartGetStepAttribInfo (
-	h5_file_t *f,
-	const h5_int64_t attrib_idx,
-	char *attrib_name,
-	const h5_int64_t len_of_attrib_name,
-	h5_int64_t *attrib_type,
-	h5_int64_t *attrib_nelem
-	);
-
-h5_int64_t
-H5PartGetFileAttribInfo (
-	h5_file_t *f,
-	const h5_int64_t idx,
-	char *name,
-	const h5_int64_t maxnamelen,
-	h5_int64_t *type,
-	h5_int64_t *nelem
-	);
-
-h5_int64_t
-H5PartReadStepAttrib (
-	h5_file_t *f,
-	const char *name,
-	void *data
-	);
-
-h5_int64_t
-H5PartReadFileAttrib (
-	h5_file_t *f,
-	const char *name,
-	void *data
-	);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/C/H5_inquiry.h b/src/C/H5_inquiry.h
deleted file mode 100644
index 525ef91..0000000
--- a/src/C/H5_inquiry.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __H5_INQUIRY_H
-#define __H5_INQUIRY_H
-
-h5_size_t
-H5GetNumNodes (
-	h5_file_t * const f
-	);
-
-h5_size_t
-H5GetNumSteps (
-	h5_file_t * const f
-	);
-
-h5_err_t
-H5HasStep (
-	h5_file_t * const f,
-	h5_id_t step
-	);
-#endif