diff --git a/src/bindings/C++/H5Fed.cc b/src/bindings/C++/H5Fed.cc
index 0fb855b..dcf9a45 100644
--- a/src/bindings/C++/H5Fed.cc
+++ b/src/bindings/C++/H5Fed.cc
@@ -32,24 +32,24 @@
 
 
 /** include proprietary header files */
-#include <H5Fed.hh>
+#include "H5Fed.hh"
 
 /** \brief make the C API functions available so that
  * we can used them in the implementation of the H5Fed class
  * member functions implementations.
  */
-extern "C"
-{
-	#include <H5Fed.h>
-}
+//extern "C"
+//{
+//	#include "../../H5Fed.h"
+//}
 
 
 /** activate namespaces */
-using namespace H5Fed;
+
 using namespace std;
 
-
-
+namespace H5Fed
+{
 /*!
   \defgroup h5fed_cpp_api H5Fed CPP API
 */
@@ -73,7 +73,7 @@ H5Fed::H5Fed(std::string filename)
 
 
 /** \brief implement constructor */
-~H5Fed::H5Fed()
+H5Fed::~H5Fed()
 {
 	/** initialize internal variables */
 	filename_.erase();
@@ -140,7 +140,7 @@ H5FED_RETURN_CODE H5Fed::closeFile()
 	return(OKCODE);
 }
 
-
+}
 
 
 
diff --git a/src/bindings/C++/H5Fed.hh b/src/bindings/C++/H5Fed.hh
index f432746..1f09730 100644
--- a/src/bindings/C++/H5Fed.hh
+++ b/src/bindings/C++/H5Fed.hh
@@ -78,7 +78,7 @@ namespace H5Fed
 		
 	private:
 		/** book keeping */
-		std::string filename_;								/** \brief Name of H5Fed file to be accessed */
+		std::string filename_;														/** \brief Name of H5Fed file to be accessed */
 		
 		
 		
@@ -88,4 +88,4 @@ namespace H5Fed
 	};
 }
 
-#endif /** H5FED_HH */
\ No newline at end of file
+#endif /** H5FED_HH */