diff --git a/MeshLib/MshEditor.cpp b/MeshLib/MshEditor.cpp
index 7a9de2c2c1d601fb73c1143c7591d716380fb27f..bad87b43686c0e43c8fd0e645acff7542a58c838 100644
--- a/MeshLib/MshEditor.cpp
+++ b/MeshLib/MshEditor.cpp
@@ -21,6 +21,7 @@
 
 #include "MathTools.h"
 
+namespace MeshLib {
 
 void MshEditor::getSurfaceAreaForNodes(const MeshLib::Mesh* mesh, std::vector<double> &node_area_vec)
 {
@@ -153,7 +154,7 @@ MeshLib::Mesh* MshEditor::getMeshSurface(const MeshLib::Mesh &mesh, const double
 	const std::vector<MeshLib::Element*> elements = mesh.getElements();
 	std::vector<MeshLib::Element*> new_elements;
 	const size_t nElements (mesh.getNElements());
-	
+
 	bool complete_surface = ((dir[0]*dir[0] + dir[1]*dir[1] + dir[2]*dir[2]) == 0) ? true : false;
 
 	// 2D meshes
@@ -173,7 +174,7 @@ MeshLib::Mesh* MshEditor::getMeshSurface(const MeshLib::Mesh &mesh, const double
 		}
 	}
 	// 3D meshes
-	else if (mesh.getDimension() == 3)	// 
+	else if (mesh.getDimension() == 3)	//
 	{
 		for (unsigned i=0; i<nElements; i++)
 		{
@@ -227,4 +228,4 @@ MeshLib::Mesh* MshEditor::getMeshSurface(const MeshLib::Mesh &mesh, const double
 
 }
 
-
+} // end namespace MeshLib
diff --git a/MeshLib/MshEditor.h b/MeshLib/MshEditor.h
index ef9892289f1b3d350a70ab3b947058bc5809e340..083daba110d2d5adda8bce44b15a9f149e5e4dee 100644
--- a/MeshLib/MshEditor.h
+++ b/MeshLib/MshEditor.h
@@ -22,9 +22,9 @@ namespace GeoLib {
 }
 
 namespace MeshLib {
-	class Mesh;
-	class Element;
-}
+// forward declarations
+class Mesh;
+class Element;
 
 /**
  * \brief A set of tools for manipulating existing meshes
@@ -39,15 +39,17 @@ public:
 	static void getSurfaceAreaForNodes(const MeshLib::Mesh* mesh, std::vector<double> &node_area_vec);
 
 	/// Removes the mesh nodes (and connected elements) given in the nodes-list from the mesh.
-	static MeshLib::Mesh* removeMeshNodes(MeshLib::Mesh* mesh, const std::vector<size_t> &nodes);
+	MeshLib::Mesh* removeMeshNodes(MeshLib::Mesh* mesh, const std::vector<size_t> &nodes);
 
 	/// Returns the surface nodes of a layered mesh.
 	static std::vector<GeoLib::PointWithID*> getSurfaceNodes(const MeshLib::Mesh &mesh);
 
-	/// Returns the 2d-element mesh representing the surface of the given layered mesh. 
+	/// Returns the 2d-element mesh representing the surface of the given layered mesh.
 	static MeshLib::Mesh* getMeshSurface(const MeshLib::Mesh &mesh, const double* dir);
 
 private:
 };
 
+} // end namespace MeshLib
+
 #endif //MSHEDITOR_H