diff --git a/BaseLib/StringTools.cpp b/BaseLib/StringTools.cpp
index 778ffef9898beb36bcdd4d1e2763a34f6cc03aaf..e2b2e94d820460868d65af6a5edc3bed4b574cc2 100644
--- a/BaseLib/StringTools.cpp
+++ b/BaseLib/StringTools.cpp
@@ -120,7 +120,7 @@ void correctScientificNotation(std::string filename, size_t precision)
 
 			outputStream << word << " ";
 		}
-		outputStream << std::endl;
+		outputStream << "\n";
 	}
 
 	stream.close();
diff --git a/FileIO/Legacy/MeshIO.cpp b/FileIO/Legacy/MeshIO.cpp
index b53e201596d1dfd9b290de246e0fdd934a1f7ea6..2dd5bdf1c48acce20664dcdeb467f4d797eb3b66 100644
--- a/FileIO/Legacy/MeshIO.cpp
+++ b/FileIO/Legacy/MeshIO.cpp
@@ -242,23 +242,25 @@ int MeshIO::write(std::ostream &out)
 
 	setPrecision(9);
 
-	out << "#FEM_MSH" << std::endl;
-
-	out << "$PCS_TYPE" << std::endl << "  NO_PCS" << std::endl;
-
-	out << "$NODES" << std::endl << "  ";
+	out << "#FEM_MSH\n"
+		<< "$PCS_TYPE\n"
+		<< "  NO_PCS\n"
+		<< "$NODES\n"
+		<< "  ";
 	const size_t n_nodes(_mesh->getNNodes());
-	out << n_nodes << std::endl;
+	out << n_nodes << "\n";
 	for (size_t i(0); i < n_nodes; ++i) {
-		out << i << " " << *(_mesh->getNode(i)) << std::endl;
+		out << i << " " << *(_mesh->getNode(i)) << "\n";
 	}
 
-	out << "$ELEMENTS" << std::endl << "  ";
+	out << "$ELEMENTS\n"
+		<< "  ";
+
 	writeElementsExceptLines(_mesh->getElements(), out);
 
-	out << " $LAYER" << std::endl;
-	out << "  0" << std::endl;
-	out << "#STOP" << std::endl;
+	out << " $LAYER\n"
+		<< "  0\n"
+		<< "#STOP\n";
 
 	return 1;
 }
@@ -289,14 +291,14 @@ void MeshIO::writeElementsExceptLines(std::vector<MeshLib::Element*> const& ele_
 			}
 		}
 	}
-	out << n_elements << std::endl;
+	out << n_elements << "\n";
 	for (size_t i(0), k(0); i < ele_vector_size; ++i) {
 		if (non_line_element[i] && non_null_element[i]) {
 			out << k << " " << ele_vec[i]->getValue() << " " << MshElemType2String(ele_vec[i]->getGeomType()) << " ";
 			unsigned nElemNodes (ele_vec[i]->getNNodes());
 			for(size_t j = 0; j < nElemNodes; ++j)
 				out << ele_vec[i]->getNode(nElemNodes - j - 1)->getID() << " ";
-			out << std::endl;
+			out << "\n";
 			++k;
 		}
 	}
diff --git a/FileIO/Legacy/OGSIOVer4.cpp b/FileIO/Legacy/OGSIOVer4.cpp
index 944c43a0c80acc369cf192a152bae02e05322c41..121783164103e34001e45bb29eaeec6ce10f6e1d 100644
--- a/FileIO/Legacy/OGSIOVer4.cpp
+++ b/FileIO/Legacy/OGSIOVer4.cpp
@@ -605,9 +605,9 @@ void writeGLIFileV4 (const std::string& fname,
 			if ((*plys)[k]->isClosed())
 			{
 				os << "#SURFACE" << "\n";
-				os << " $NAME " << "\n" << "  " << k << "\n"; //plys_vec->getNameOfElement ((*plys)[k]) << std::endl;
+				os << " $NAME " << "\n" << "  " << k << "\n"; //plys_vec->getNameOfElement ((*plys)[k]) << "\n";
 				os << " $TYPE " << "\n" << "  0" << "\n";
-				os << " $POLYLINES" << "\n" << "  " << k << "\n"; //plys_vec->getNameOfElement ((*plys)[k]) << std::endl;
+				os << " $POLYLINES" << "\n" << "  " << k << "\n"; //plys_vec->getNameOfElement ((*plys)[k]) << "\n";
 			}
 	}
 
diff --git a/FileIO/MeshIO/GMSHInterface.cpp b/FileIO/MeshIO/GMSHInterface.cpp
index 923c3fdbfd5df1a95243017a0e83a898a85a0bee..2e585a3e344f5cd257e091c28a4e1171788ffc45 100644
--- a/FileIO/MeshIO/GMSHInterface.cpp
+++ b/FileIO/MeshIO/GMSHInterface.cpp
@@ -247,7 +247,7 @@ int GMSHInterface::write(std::ostream& out)
 #ifdef BUILD_TIMESTAMP
 	out << " built on " << BUILD_TIMESTAMP;
 #endif
-	out << std::endl << std::endl;
+	out << "\n\n";
 
 	writeGMSHInputFile(out);
 	return 1;
@@ -357,7 +357,7 @@ void GMSHInterface::writePoints(std::ostream& out) const
 	const size_t n_gmsh_pnts(_gmsh_pnts.size());
 	for (size_t k(0); k<n_gmsh_pnts; k++) {
 		if (_gmsh_pnts[k]) {
-			out << *(_gmsh_pnts[k]) << std::endl;
+			out << *(_gmsh_pnts[k]) << "\n";
 		}
 	}
 }
diff --git a/FileIO/MeshIO/GMSHLine.cpp b/FileIO/MeshIO/GMSHLine.cpp
index 461629730f810d3ebe09af77a93be252f3b902e6..7511806d22e6f92324aae48e42dd975caef98a24 100644
--- a/FileIO/MeshIO/GMSHLine.cpp
+++ b/FileIO/MeshIO/GMSHLine.cpp
@@ -25,7 +25,7 @@ GMSHLine::~GMSHLine()
 
 void GMSHLine::write(std::ostream &os, size_t id) const
 {
-	os << "Line(" << id << ") = {" << _start_pnt_id << "," << _end_pnt_id << "};" << std::endl;
+	os << "Line(" << id << ") = {" << _start_pnt_id << "," << _end_pnt_id << "};\n";
 }
 
 void GMSHLine::resetLineData(size_t start_point_id, size_t end_point_id)
diff --git a/FileIO/MeshIO/GMSHLineLoop.cpp b/FileIO/MeshIO/GMSHLineLoop.cpp
index 0ee01f83ac9d86a6b5530c60e99659ea3d798449..e464e3582e0052100012995f8d51a5de36d617dc 100644
--- a/FileIO/MeshIO/GMSHLineLoop.cpp
+++ b/FileIO/MeshIO/GMSHLineLoop.cpp
@@ -42,11 +42,11 @@ void GMSHLineLoop::write(std::ostream &os, size_t line_offset, size_t sfc_offset
 	os << "Line Loop(" << line_offset+n_lines << ") = {";
 	for (size_t k(0); k < n_lines - 1; k++)
 		os << line_offset + k << ",";
-	os << line_offset + n_lines - 1 << "};" << std::endl;
+	os << line_offset + n_lines - 1 << "};\n";
 
 	if (_is_sfc) {
 		// write plane surface
-		os << "Plane Surface (" << sfc_offset << ") = {" << line_offset+n_lines << "};" << std::endl;
+		os << "Plane Surface (" << sfc_offset << ") = {" << line_offset+n_lines << "};\n";
 	}
 
 }
diff --git a/FileIO/MeshIO/GMSHPolygonTree.cpp b/FileIO/MeshIO/GMSHPolygonTree.cpp
index 3ad1ea0afac2605c6699c97246a0d9c6a3efc5c6..c2e3ef8f90cd8b6c2eec426ffb1579db7a8fa2f4 100644
--- a/FileIO/MeshIO/GMSHPolygonTree.cpp
+++ b/FileIO/MeshIO/GMSHPolygonTree.cpp
@@ -183,15 +183,15 @@ void GMSHPolygonTree::writeLineLoop(size_t &line_offset, size_t &sfc_offset, std
 	size_t first_pnt_id(_node_polygon->getPointID(0)), second_pnt_id;
 	for (size_t k(1); k<n_pnts; k++) {
 		second_pnt_id = _node_polygon->getPointID(k);
-		out << "Line(" << line_offset + k-1 << ") = {" << first_pnt_id << "," << second_pnt_id << "};" << std::endl;
+		out << "Line(" << line_offset + k-1 << ") = {" << first_pnt_id << "," << second_pnt_id << "};\n";
 		first_pnt_id = second_pnt_id;
 	}
 	out << "Line Loop(" << line_offset + n_pnts-1 << ") = {";
 	for (size_t k(0); k<n_pnts - 2; k++) {
 		out << line_offset+k << ",";
 	}
-	out << line_offset+n_pnts-2 << "};" << std::endl;
-	out << "Plane Surface(" << sfc_offset << ") = {" << line_offset+n_pnts-1 << "};" << std::endl;
+	out << line_offset+n_pnts-2 << "};\n";
+	out << "Plane Surface(" << sfc_offset << ") = {" << line_offset+n_pnts-1 << "};\n";
 	line_offset += n_pnts;
 	sfc_offset++;
 }
@@ -205,8 +205,8 @@ void GMSHPolygonTree::writeLineConstraints(size_t &line_offset, size_t sfc_numbe
 		for (size_t k(1); k<n_pnts; k++) {
 			second_pnt_id = _plys[j]->getPointID(k);
 			if (_plys[j]->isSegmentMarked(k-1) && _node_polygon->isPntInPolygon(*(_plys[j]->getPoint(k)))) {
-				out << "Line(" << line_offset + k-1 << ") = {" << first_pnt_id << "," << second_pnt_id << "};" << std::endl;
-				out << "Line { " << line_offset+k-1 << " } In Surface { " << sfc_number << " };" << std::endl;
+				out << "Line(" << line_offset + k-1 << ") = {" << first_pnt_id << "," << second_pnt_id << "};\n";
+				out << "Line { " << line_offset+k-1 << " } In Surface { " << sfc_number << " };\n";
 			}
 			first_pnt_id = second_pnt_id;
 		}
@@ -225,9 +225,9 @@ void GMSHPolygonTree::writeSubPolygonsAsLineConstraints(size_t &line_offset, siz
 		size_t first_pnt_id(_node_polygon->getPointID(0)), second_pnt_id;
 		for (size_t k(1); k<n_pnts; k++) {
 			second_pnt_id = _node_polygon->getPointID(k);
-			out << "Line(" << line_offset + k-1 << ") = {" << first_pnt_id << "," << second_pnt_id << "};" << std::endl;
+			out << "Line(" << line_offset + k-1 << ") = {" << first_pnt_id << "," << second_pnt_id << "};\n";
 			first_pnt_id = second_pnt_id;
-			out << "Line { " << line_offset+k-1 << " } In Surface { " << sfc_number << " };" << std::endl;
+			out << "Line { " << line_offset+k-1 << " } In Surface { " << sfc_number << " };\n";
 		}
 		line_offset += n_pnts;
 	}
@@ -239,8 +239,8 @@ void GMSHPolygonTree::writeStations(size_t & pnt_id_offset, size_t sfc_number, s
 	const size_t n_stations(_stations.size());
 	for (size_t k(0); k<n_stations; k++) {
 		out << "Point(" << pnt_id_offset + k << ") = {" << (*(_stations[k]))[0] << "," << (*(_stations[k]))[1] << ", 0.0, ";
-		out << _mesh_density_strategy->getMeshDensityAtPoint(_stations[k]) << "};" << std::endl;
-		out << "Point { " << pnt_id_offset + k << " } In Surface { " << sfc_number << " }; " << std::endl;
+		out << _mesh_density_strategy->getMeshDensityAtPoint(_stations[k]) << "};\n";
+		out << "Point { " << pnt_id_offset + k << " } In Surface { " << sfc_number << " };\n";
 	}
 	pnt_id_offset += n_stations;
 }
@@ -254,8 +254,8 @@ void GMSHPolygonTree::writeAdditionalPointData(size_t & pnt_id_offset, size_t sf
 		for (size_t k(0); k<n; k++) {
 			if (_node_polygon->isPntInPolygon(*(steiner_pnts[k]))) {
 				out << "Point(" << pnt_id_offset + k << ") = {" << (*(steiner_pnts[k]))[0] << "," << (*(steiner_pnts[k]))[1] << ", 0.0, ";
-				out << _mesh_density_strategy->getMeshDensityAtPoint(steiner_pnts[k]) << "};" << std::endl;
-				out << "Point { " << pnt_id_offset + k << " } In Surface { " << sfc_number << " }; " << std::endl;
+				out << _mesh_density_strategy->getMeshDensityAtPoint(steiner_pnts[k]) << "};\n";
+				out << "Point { " << pnt_id_offset + k << " } In Surface { " << sfc_number << " };\n";
 			}
 			delete steiner_pnts[k];
 		}
diff --git a/FileIO/RapidXmlIO/RapidVtuInterface.cpp b/FileIO/RapidXmlIO/RapidVtuInterface.cpp
index d4a0b1459bf23be087f1a22ca89351547fcff3b6..83644417e94218451c57714023341115a6dbb875 100644
--- a/FileIO/RapidXmlIO/RapidVtuInterface.cpp
+++ b/FileIO/RapidXmlIO/RapidVtuInterface.cpp
@@ -345,7 +345,7 @@ int RapidVtuInterface::write(std::ostream& stream)
 	const std::string data_array_close("\t\t\t\t");
 	const std::string data_array_indent("\t\t\t\t  ");
 
-	stream << "<?xml version=\"1.0\"?>" << std::endl;
+	stream << "<?xml version=\"1.0\"?>\n";
 
 	xml_node<> *root_node (_doc->allocate_node(node_element, "VTKFile"));
 	_doc->append_node(root_node);
diff --git a/FileIO/Writer.cpp b/FileIO/Writer.cpp
index 33c6867eac411aa951834e975d9a7c5571db5fa0..e15b125a7f52ec1ab2868efd6392f6da46650ab6 100644
--- a/FileIO/Writer.cpp
+++ b/FileIO/Writer.cpp
@@ -47,7 +47,7 @@ int Writer::writeToFile(std::string const& filename)
 		// check file stream
 		if (!fileStream)
 		{
-			std::cerr << "Could not open file " << filename << " !" << std::endl;
+			std::cerr << "Could not open file " << filename << " !\n";
 			return 0;
 		}
 
diff --git a/GeoLib/Polyline.cpp b/GeoLib/Polyline.cpp
index e11f865a70944657d5312fe04e024d8334eb7fb3..302814e7574e7735824abec4c70f5404c6035eab 100644
--- a/GeoLib/Polyline.cpp
+++ b/GeoLib/Polyline.cpp
@@ -47,7 +47,7 @@ void Polyline::write(std::ostream &os) const
 {
 	std::size_t size(_ply_pnt_ids.size());
 	for (std::size_t k(0); k < size; k++)
-		os << *(_ply_pnts[_ply_pnt_ids[k]]) << std::endl;
+		os << *(_ply_pnts[_ply_pnt_ids[k]]) << "\n";
 }
 
 void Polyline::addPoint(std::size_t pnt_id)
diff --git a/GeoLib/Raster.cpp b/GeoLib/Raster.cpp
index e4e01383895b7340acf8e013b53900799a4a8e89..a23da64906b076448c97ee224c8920afa6cebb97 100644
--- a/GeoLib/Raster.cpp
+++ b/GeoLib/Raster.cpp
@@ -108,19 +108,19 @@ Raster* Raster::getRasterFromSurface(Surface const& sfc, double cell_size, doubl
 void Raster::writeRasterAsASC(std::ostream &os) const
 {
 	// write header
-	os << "ncols " << _n_cols << std::endl;
-	os << "nrows " << _n_rows << std::endl;
-	os << "xllcorner " << _ll_pnt[0] << std::endl;
-	os << "yllcorner " << _ll_pnt[1] << std::endl;
-	os << "cellsize " <<  _cell_size << std::endl;
-	os << "NODATA_value " << _no_data_val << std::endl;
+	os << "ncols " << _n_cols << "\n";
+	os << "nrows " << _n_rows << "\n";
+	os << "xllcorner " << _ll_pnt[0] << "\n";
+	os << "yllcorner " << _ll_pnt[1] << "\n";
+	os << "cellsize " <<  _cell_size << "\n";
+	os << "NODATA_value " << _no_data_val << "\n";
 
 	// write data
 	for (unsigned row(0); row<_n_rows; row++) {
 		for (unsigned col(0); col<_n_cols; col++) {
 			os << _raster_data[(_n_rows-row-1)*_n_cols+col] << " ";
 		}
-		os << std::endl;
+		os << "\n";
 	}
 }
 
diff --git a/Gui/DataView/DirectConditionGenerator.cpp b/Gui/DataView/DirectConditionGenerator.cpp
index cb9a759a6ae2fe845e05d84905858e541defa1a6..cc47af71af14ae5cd329b03913ccab2db20d7232 100644
--- a/Gui/DataView/DirectConditionGenerator.cpp
+++ b/Gui/DataView/DirectConditionGenerator.cpp
@@ -183,7 +183,7 @@ int DirectConditionGenerator::writeToFile(const std::string &name) const
 	if (out)
 	{
 		for (std::vector< std::pair<size_t,double> >::const_iterator it = _direct_values.begin(); it != _direct_values.end(); ++it)
-			out << it->first << "\t" << it->second << std::endl;
+			out << it->first << "\t" << it->second << "\n";
 
 		out.close();
 	}
diff --git a/Gui/VtkVis/VtkColorLookupTable.cpp b/Gui/VtkVis/VtkColorLookupTable.cpp
index d8c7b1d10ad2e11edd9fb76e00ea1d549113d40d..cd1d7b0d906dd0f0694efe95a314a2a0c3c9c460 100644
--- a/Gui/VtkVis/VtkColorLookupTable.cpp
+++ b/Gui/VtkVis/VtkColorLookupTable.cpp
@@ -106,7 +106,7 @@ void VtkColorLookupTable::writeToFile(const std::string &filename)
 	{
 		unsigned char rgba[4];
 		this->GetTableValue(i, rgba);
-		out << i << "\t" << rgba[0] << "\t" << rgba[1] << "\t" << rgba[2] << std::endl;
+		out << i << "\t" << rgba[0] << "\t" << rgba[1] << "\t" << rgba[2] << "\n";
 	}
 
 	std::cout << " done." << std::endl;
diff --git a/Gui/VtkVis/VtkMeshSource.cpp b/Gui/VtkVis/VtkMeshSource.cpp
index 3b5dde40083d6cbc25457c889d7c76f81d6ede32..0dd45a26f98da756bad7571dbc9e7cb7b24203b4 100644
--- a/Gui/VtkVis/VtkMeshSource.cpp
+++ b/Gui/VtkVis/VtkMeshSource.cpp
@@ -76,7 +76,7 @@ void VtkMeshSource::PrintSelf( ostream& os, vtkIndent indent )
 	int i = 0;
 	for (std::vector<MeshLib::Node*>::const_iterator it = nodes.begin(); it != nodes.end(); ++it)
 	{
-		os << indent << "Point " << i << " (" << (*it)[0] << ", " << (*it)[1] << ", " << (*it)[2] << ")" << std::endl;
+		os << indent << "Point " << i << " (" << (*it)[0] << ", " << (*it)[1] << ", " << (*it)[2] << ")\n";
 	}
 
 	i = 0;
@@ -85,7 +85,7 @@ void VtkMeshSource::PrintSelf( ostream& os, vtkIndent indent )
 		os << indent << "Element " << i << ": ";
 		for (unsigned t = 0; t < (*it)->getNNodes(); ++t)
 			os << (*it)->getNode(t)->getID() << " ";
-		os << std::endl;
+		os << "\n";
 	}
 }
 
diff --git a/Gui/VtkVis/VtkVisPipeline.cpp b/Gui/VtkVis/VtkVisPipeline.cpp
index 535e07e06b219bf58a5913377c87363926742b89..bcd82492fb6c61d0eebb2a4b0868aa8cca4a1e7f 100644
--- a/Gui/VtkVis/VtkVisPipeline.cpp
+++ b/Gui/VtkVis/VtkVisPipeline.cpp
@@ -173,7 +173,7 @@ void VtkVisPipeline::loadFromFile(QString filename)
 	QTime myTimer;
 	myTimer.start();
 	std::cout << "VTK Read: " << filename.toStdString() <<
-	std::endl << std::flush;
+	std::endl;
 #endif
 
 	if (filename.size() > 0)
@@ -533,17 +533,17 @@ void VtkVisPipeline::checkMeshQuality(VtkMeshSource* source, MshQualityType::typ
 		std::ofstream out ("mesh_histogram.txt");
 		if (out) {
 			out << "# histogram depicts mesh quality criterion " << MshQualityType2String(t)
-				<< " for mesh " << source->GetMesh()->getName() << std::endl;
+				<< " for mesh " << source->GetMesh()->getName() << "\n";
 			nclasses = histogram.getNrBins();
 			std::vector<size_t> const& bin_cnts(histogram.getBinCounts());
 			const double min (histogram.getMinimum());
 			const double bin_width (histogram.getBinWidth());
 
 			for (size_t k(0); k < nclasses; k++)
-				out << min+k*bin_width << " " << bin_cnts[k] << std::endl;
+				out << min+k*bin_width << " " << bin_cnts[k] << "\n";
 			out.close ();
 		} else {
-			std::cerr << "could not open file mesh_histgram.txt" << std::endl;
+			std::cerr << "could not open file mesh_histgram.txt\n";
 		}
 
 //		size_t size (100);
@@ -552,8 +552,7 @@ void VtkVisPipeline::checkMeshQuality(VtkMeshSource* source, MshQualityType::typ
 //		std::ofstream out ("mesh_histogram.txt");
 //		const size_t histogram_size (histogram.size());
 //		for (size_t k(0); k < histogram_size; k++)
-//			out << k / static_cast<double>(histogram_size) << " " << histogram[k] <<
-//			std::endl;
+//			out << k / static_cast<double>(histogram_size) << " " << histogram[k] << "\n";
 //		out.close ();
 
 		delete checker;
diff --git a/MathLib/LinAlg/Dense/Matrix.h b/MathLib/LinAlg/Dense/Matrix.h
index 7aafbac963723bdd937652e64d06c1b678bdebf1..5fc2aa738122c58ab39bebd819f6e48cb4b2307c 100644
--- a/MathLib/LinAlg/Dense/Matrix.h
+++ b/MathLib/LinAlg/Dense/Matrix.h
@@ -275,7 +275,7 @@ template <class T> void Matrix<T>::write (std::ostream &out) const
 		for (std::size_t j = 0; j < ncols; j++) {
 			out << data[address(i, j)] << "\t";
 		}
-		out << std::endl;
+		out << "\n";
 	}
 }
 
diff --git a/MathLib/sparse.h b/MathLib/sparse.h
index 3e3423bf5103ab2c8ebf55c6373a47543e378bb9..7d884050c8168dbd4d79161706925115fd3e8b05 100644
--- a/MathLib/sparse.h
+++ b/MathLib/sparse.h
@@ -51,15 +51,13 @@ template<class T> void CS_read(std::istream &is, unsigned &n, unsigned* &iA, uns
 
 #ifndef NDEBUG
 	// do simple checks
-	if (iA[0] != 0) std::cerr << std::endl << "CRS matrix: array iA doesn't start with 0"
-					<< std::endl;
+	if (iA[0] != 0) std::cerr << "\nCRS matrix: array iA doesn't start with 0\n";
 
 	unsigned i = 0;
 	while (i < iA[n] && jA[i] < n)
 		++i;
-	if (i < iA[n]) std::cerr << std::endl << "CRS matrix: the " << i
-					<< "th entry of jA has the value " << jA[i] << ", which is out of bounds."
-					<< std::endl;
+	if (i < iA[n]) std::cerr << "\nCRS matrix: the " << i
+					<< "th entry of jA has the value " << jA[i] << ", which is out of bounds.\n";
 #endif
 }
 
diff --git a/MeshLib/Mesh2MeshPropertyInterpolation.cpp b/MeshLib/Mesh2MeshPropertyInterpolation.cpp
index 025b50e87394a3930aa8ed7d11a420d275ee34ae..6415de0982f7be1adf1837e15788d8729f94a178 100644
--- a/MeshLib/Mesh2MeshPropertyInterpolation.cpp
+++ b/MeshLib/Mesh2MeshPropertyInterpolation.cpp
@@ -135,7 +135,7 @@ void Mesh2MeshPropertyInterpolation::interpolatePropertiesForMesh(Mesh *dest_mes
 			}
 			out_src << "#STOP" << "\n";
 			out_src.close();
-			std::cerr << "no source nodes in dest element " << k << std::endl;
+			std::cerr << "no source nodes in dest element " << k << "\n";
 		}
 	}
 }
diff --git a/Utils/FileConverter/ConvertSHPToGLI.cpp b/Utils/FileConverter/ConvertSHPToGLI.cpp
index a0e2756aecd8e1d00baeb8b7dc117a52a2954c54..39da935caea6152b1fa2b26babdcc467d794c4a9 100644
--- a/Utils/FileConverter/ConvertSHPToGLI.cpp
+++ b/Utils/FileConverter/ConvertSHPToGLI.cpp
@@ -48,7 +48,7 @@ void convertPoints (DBFHandle dbf_handle,
 	int n_records (DBFGetRecordCount (dbf_handle));
 	std::cout << "writing " << n_records << " records" << std::endl;
 
-//	out << "#POINTS" << std::endl;
+//	out << "#POINTS\n";
 //
 //	for (int k(0); k<n_records; k++) {
 //		double x (DBFReadDoubleAttribute( dbf_handle, k, x_id));
@@ -68,9 +68,9 @@ void convertPoints (DBFHandle dbf_handle,
 //				}
 //			}
 //		}
-//		out << std::endl;
+//		out << "\n";
 //	}
-//	out << "#STOP" << std::endl;
+//	out << "#STOP\n";
 
 	std::vector<GeoLib::Point*>* points (new std::vector<GeoLib::Point*>);
 	points->reserve (n_records);
diff --git a/Utils/FileConverter/GMSH2OGS.cpp b/Utils/FileConverter/GMSH2OGS.cpp
index adb59dd84d451ead9ae6941e47a15d8d30b08cc1..dbb4789d94e8df7bd5f43f7309af52717d1e8caf 100644
--- a/Utils/FileConverter/GMSH2OGS.cpp
+++ b/Utils/FileConverter/GMSH2OGS.cpp
@@ -51,7 +51,7 @@ int main (int argc, char* argv[])
 	FEMRead(file_base_name, mesh_vec);
 	if (mesh_vec.empty())
 	{
-		std::cerr << "could not read mesh from file " << tmp << std::endl;
+		std::cerr << "could not read mesh from file " << tmp << "\n";
 		return -1;
 	}
 	MeshLib::CFEMesh* mesh (mesh_vec[mesh_vec.size() - 1]);