diff --git a/Minetestmapper/PaintEngine_libgd.cpp b/Minetestmapper/PaintEngine_libgd.cpp
index 13fd48b..380f96b 100644
--- a/Minetestmapper/PaintEngine_libgd.cpp
+++ b/Minetestmapper/PaintEngine_libgd.cpp
@@ -10,6 +10,8 @@
 #include <gdfonts.h>
 #include <gdfontt.h>
 
+#include "porting.h"
+
 
 PaintEngine_libgd::PaintEngine_libgd()
 {
@@ -83,10 +85,10 @@ void PaintEngine_libgd::drawPixel(int x, int y, const Color &color)
 bool PaintEngine_libgd::save(const std::string & filename, const std::string & format, int quality)
 {
 	FILE *out;
-	out = fopen(filename.c_str(), "wb");
+	out = porting::fopen(filename.c_str(), "wb");
 	if (!out) {
 		std::ostringstream oss;
-		oss << "Error opening '" << filename << "': " << std::strerror(errno);
+		oss << "Error opening '" << filename << "': " << porting::strerror(errno);
 		throw std::runtime_error(oss.str());
 	}
 	gdImagePng(image, out);
diff --git a/Minetestmapper/mapper.cpp b/Minetestmapper/mapper.cpp
index 710ed93..b846d0d 100644
--- a/Minetestmapper/mapper.cpp
+++ b/Minetestmapper/mapper.cpp
@@ -969,7 +969,7 @@ void Mapper::parseDataFile(TileGenerator & generator, const string & input, stri
 	// Check if input/../.. looks like a valid minetest directory
 	string minetestPath = input + PATH_SEPARATOR + ".." + PATH_SEPARATOR + "..";
 	string minetestConf = minetestPath + PATH_SEPARATOR + "minetest.conf";
-	if (FILE *file = fopen(minetestConf.c_str(), "r")) {
+	if (FILE *file = porting::fopen(minetestConf.c_str(), "r")) {
 		fclose(file);
 		colorPaths.push_back(minetestPath);
 	}