diff --git a/src/basics/ColorProfile.cpp b/src/basics/ColorProfile.cpp
index cfeaf13..dc3b37a 100644
--- a/src/basics/ColorProfile.cpp
+++ b/src/basics/ColorProfile.cpp
@@ -1,6 +1,7 @@
 #include "ColorProfile.h"
 
 #include "PackStream.h"
+#include <cmath>
 
 ColorProfile::ColorProfile() {
     setToneMapping(TONE_MAPPING_UNCHARTED, 1.6);
diff --git a/src/basics/NoiseState.h b/src/basics/NoiseState.h
index c4d8157..f336095 100644
--- a/src/basics/NoiseState.h
+++ b/src/basics/NoiseState.h
@@ -3,6 +3,8 @@
 
 #include "basics_global.h"
 
+#include <vector>
+
 namespace paysages {
 namespace basics {
 
diff --git a/src/basics/Texture2D.cpp b/src/basics/Texture2D.cpp
index 5cbc9cc..fc2d77c 100644
--- a/src/basics/Texture2D.cpp
+++ b/src/basics/Texture2D.cpp
@@ -1,6 +1,7 @@
 #include "Texture2D.h"
 
 #include <cassert>
+#include <cmath>
 #include "Color.h"
 #include "PackStream.h"
 #include "PictureWriter.h"
diff --git a/src/basics/Texture3D.cpp b/src/basics/Texture3D.cpp
index 98ac93a..80fff9b 100644
--- a/src/basics/Texture3D.cpp
+++ b/src/basics/Texture3D.cpp
@@ -1,6 +1,7 @@
 #include "Texture3D.h"
 
 #include <cassert>
+#include <cmath>
 #include "Color.h"
 #include "PackStream.h"
 #include "PictureWriter.h"
diff --git a/src/basics/Texture4D.cpp b/src/basics/Texture4D.cpp
index b7cfcd5..d7ba180 100644
--- a/src/basics/Texture4D.cpp
+++ b/src/basics/Texture4D.cpp
@@ -1,6 +1,7 @@
 #include "Texture4D.h"
 
 #include <cassert>
+#include <cmath>
 #include "Color.h"
 #include "PackStream.h"
 #include "PictureWriter.h"
diff --git a/src/basics/basics_global.h b/src/basics/basics_global.h
index 027eee7..3c80e4b 100644
--- a/src/basics/basics_global.h
+++ b/src/basics/basics_global.h
@@ -1,15 +1,14 @@
 #ifndef BASICS_GLOBAL_H
 #define BASICS_GLOBAL_H
 
-#include <QtCore/qglobal.h>
+#include "system_global.h"
+
 #if defined(BASICS_LIBRARY)
 #define BASICSSHARED_EXPORT Q_DECL_EXPORT
 #else
 #define BASICSSHARED_EXPORT Q_DECL_IMPORT
 #endif
 
-#include "system_global.h"
-
 namespace paysages {
 namespace basics {
 class Vector3;
diff --git a/src/definition/DefinitionNode.cpp b/src/definition/DefinitionNode.cpp
index 540dbd1..af999b4 100644
--- a/src/definition/DefinitionNode.cpp
+++ b/src/definition/DefinitionNode.cpp
@@ -7,6 +7,7 @@
 #include "DiffManager.h"
 
 #include <cassert>
+#include <algorithm>
 
 DefinitionNode::DefinitionNode(DefinitionNode *parent, const std::string &name, const std::string &type_name)
     : parent(parent), type_name(type_name), name(name) {
diff --git a/src/definition/DefinitionNode.h b/src/definition/DefinitionNode.h
index f1d6afb..030ce42 100644
--- a/src/definition/DefinitionNode.h
+++ b/src/definition/DefinitionNode.h
@@ -3,6 +3,8 @@
 
 #include "definition_global.h"
 
+#include <vector>
+
 namespace paysages {
 namespace definition {
 
diff --git a/src/definition/DiffManager.cpp b/src/definition/DiffManager.cpp
index c84fb4e..e841262 100644
--- a/src/definition/DiffManager.cpp
+++ b/src/definition/DiffManager.cpp
@@ -1,5 +1,6 @@
 #include "DiffManager.h"
 
+#include <algorithm>
 #include "DefinitionNode.h"
 #include "DefinitionDiff.h"
 #include "DefinitionWatcher.h"
diff --git a/src/definition/PaintedGrid.cpp b/src/definition/PaintedGrid.cpp
index a92be11..27a9d0c 100644
--- a/src/definition/PaintedGrid.cpp
+++ b/src/definition/PaintedGrid.cpp
@@ -1,6 +1,7 @@
 #include "PaintedGrid.h"
 
 #include <cassert>
+#include <cmath>
 #include "Memory.h"
 #include "Interpolation.h"
 #include "PaintedGridData.h"
diff --git a/src/definition/TerrainDefinition.cpp b/src/definition/TerrainDefinition.cpp
index d7be658..2bb7bcf 100644
--- a/src/definition/TerrainDefinition.cpp
+++ b/src/definition/TerrainDefinition.cpp
@@ -1,5 +1,6 @@
 #include "TerrainDefinition.h"
 
+#include <cmath>
 #include "TerrainHeightMap.h"
 #include "NoiseGenerator.h"
 #include "PackStream.h"
diff --git a/src/definition/definition_global.h b/src/definition/definition_global.h
index 1496366..c3b5d9e 100644
--- a/src/definition/definition_global.h
+++ b/src/definition/definition_global.h
@@ -1,7 +1,7 @@
 #ifndef DEFINITION_GLOBAL_H
 #define DEFINITION_GLOBAL_H
 
-#include <QtCore/qglobal.h>
+#include "basics_global.h"
 
 #if defined(DEFINITION_LIBRARY)
 #define DEFINITIONSHARED_EXPORT Q_DECL_EXPORT
@@ -9,8 +9,6 @@
 #define DEFINITIONSHARED_EXPORT Q_DECL_IMPORT
 #endif
 
-#include "basics_global.h"
-
 namespace paysages {
 namespace definition {
 class DefinitionNode;
diff --git a/src/render/opengl/opengl_global.h b/src/render/opengl/opengl_global.h
index cd956ea..1d1c56c 100644
--- a/src/render/opengl/opengl_global.h
+++ b/src/render/opengl/opengl_global.h
@@ -1,7 +1,7 @@
 #ifndef OPENGL_GLOBAL_H
 #define OPENGL_GLOBAL_H
 
-#include <QtCore/qglobal.h>
+#include "software_global.h"
 
 #if defined(OPENGL_LIBRARY)
 #define OPENGLSHARED_EXPORT Q_DECL_EXPORT
@@ -9,8 +9,6 @@
 #define OPENGLSHARED_EXPORT Q_DECL_IMPORT
 #endif
 
-#include "software_global.h"
-
 namespace paysages {
 namespace opengl {
 class WidgetExplorer;
diff --git a/src/render/software/Canvas.h b/src/render/software/Canvas.h
index b352527..0643b0e 100644
--- a/src/render/software/Canvas.h
+++ b/src/render/software/Canvas.h
@@ -3,6 +3,8 @@
 
 #include "software_global.h"
 
+#include <vector>
+
 namespace paysages {
 namespace software {
 
diff --git a/src/render/software/CloudsRenderer.cpp b/src/render/software/CloudsRenderer.cpp
index 1d8fdb8..29c9ecf 100644
--- a/src/render/software/CloudsRenderer.cpp
+++ b/src/render/software/CloudsRenderer.cpp
@@ -7,6 +7,7 @@
 #include "BaseCloudLayerRenderer.h"
 #include "CloudBasicLayerRenderer.h"
 #include "CameraDefinition.h"
+#include "Logs.h"
 
 #include "clouds/BaseCloudsModel.h"
 #include "clouds/CloudModelAltoCumulus.h"
@@ -99,7 +100,7 @@ BaseCloudLayerRenderer *CloudsRenderer::getLayerRenderer(unsigned int layer) {
     if (layer < layer_renderers.size()) {
         return layer_renderers[layer];
     } else {
-        qWarning("Asked for unknown layer renderer %d", layer);
+        Logs::warning() << "Asked for unknown layer renderer " << layer << std::endl;
         return fake_renderer;
     }
 }
@@ -108,7 +109,7 @@ BaseCloudsModel *CloudsRenderer::getLayerModel(unsigned int layer) {
     if (layer < layer_models.size()) {
         return layer_models[layer];
     } else {
-        qWarning("Asked for unknown layer model %d", layer);
+        Logs::warning() << "Asked for unknown layer model" << layer << std::endl;
         return fake_model;
     }
 }
@@ -120,7 +121,7 @@ void CloudsRenderer::setLayerModel(unsigned int layer, BaseCloudsModel *model, b
         }
         layer_models[layer] = model;
     } else {
-        qWarning("Asked to set an unknown layer model %d", layer);
+        Logs::warning() << "Asked to set an unknown layer model" << layer << std::endl;
         delete model;
     }
 }
diff --git a/src/render/software/CloudsRenderer.h b/src/render/software/CloudsRenderer.h
index a97e49b..7112af4 100644
--- a/src/render/software/CloudsRenderer.h
+++ b/src/render/software/CloudsRenderer.h
@@ -5,6 +5,8 @@
 
 #include "LightFilter.h"
 
+#include <vector>
+
 namespace paysages {
 namespace software {
 
diff --git a/src/render/software/FluidMediumManager.h b/src/render/software/FluidMediumManager.h
index 1f9917c..96e4624 100644
--- a/src/render/software/FluidMediumManager.h
+++ b/src/render/software/FluidMediumManager.h
@@ -5,6 +5,8 @@
 
 #include "SpaceSegment.h"
 
+#include <vector>
+
 namespace paysages {
 namespace software {
 
diff --git a/src/render/software/GodRaysResult.cpp b/src/render/software/GodRaysResult.cpp
index ce30313..c49e779 100644
--- a/src/render/software/GodRaysResult.cpp
+++ b/src/render/software/GodRaysResult.cpp
@@ -1,5 +1,7 @@
 #include "GodRaysResult.h"
 
+#include <cmath>
+
 GodRaysResult::GodRaysResult(double inside_length, double full_length)
     : inside_length(inside_length), full_length(full_length) {
 }
diff --git a/src/render/software/LightSource.h b/src/render/software/LightSource.h
index 8d472ad..20f6e45 100644
--- a/src/render/software/LightSource.h
+++ b/src/render/software/LightSource.h
@@ -3,6 +3,8 @@
 
 #include "software_global.h"
 
+#include <vector>
+
 namespace paysages {
 namespace software {
 
diff --git a/src/render/software/LightStatus.h b/src/render/software/LightStatus.h
index 166b0ce..d0c36ba 100644
--- a/src/render/software/LightStatus.h
+++ b/src/render/software/LightStatus.h
@@ -5,6 +5,8 @@
 
 #include "LightComponent.h"
 
+#include <vector>
+
 namespace paysages {
 namespace software {
 
diff --git a/src/render/software/LightingManager.cpp b/src/render/software/LightingManager.cpp
index b9744d1..f247da9 100644
--- a/src/render/software/LightingManager.cpp
+++ b/src/render/software/LightingManager.cpp
@@ -1,5 +1,6 @@
 #include "LightingManager.h"
 
+#include <algorithm>
 #include "LightFilter.h"
 #include "LightComponent.h"
 #include "LightStatus.h"
diff --git a/src/render/software/LightingManager.h b/src/render/software/LightingManager.h
index 83e569b..ec503bc 100644
--- a/src/render/software/LightingManager.h
+++ b/src/render/software/LightingManager.h
@@ -5,6 +5,8 @@
 
 #include "LightComponent.h"
 
+#include <vector>
+
 namespace paysages {
 namespace software {
 
diff --git a/src/render/software/SoftwareCanvasRenderer.h b/src/render/software/SoftwareCanvasRenderer.h
index 73737a9..1e5b30c 100644
--- a/src/render/software/SoftwareCanvasRenderer.h
+++ b/src/render/software/SoftwareCanvasRenderer.h
@@ -5,6 +5,8 @@
 
 #include "SoftwareRenderer.h"
 
+#include <vector>
+
 namespace paysages {
 namespace software {
 
diff --git a/src/render/software/software_global.h b/src/render/software/software_global.h
index b220dd4..0aaf3d8 100644
--- a/src/render/software/software_global.h
+++ b/src/render/software/software_global.h
@@ -1,7 +1,7 @@
 #ifndef SOFTWARE_GLOBAL_H
 #define SOFTWARE_GLOBAL_H
 
-#include <QtCore/qglobal.h>
+#include "definition_global.h"
 
 #if defined(SOFTWARE_LIBRARY)
 #define SOFTWARESHARED_EXPORT Q_DECL_EXPORT
@@ -9,8 +9,6 @@
 #define SOFTWARESHARED_EXPORT Q_DECL_IMPORT
 #endif
 
-#include "definition_global.h"
-
 namespace paysages {
 namespace software {
 class SoftwareRenderer;
diff --git a/src/system/Memory.cpp b/src/system/Memory.cpp
index 7ad83bb..ffe31eb 100644
--- a/src/system/Memory.cpp
+++ b/src/system/Memory.cpp
@@ -1,5 +1,6 @@
 #include "Memory.h"
 
+#include <string>
 #include <cstring>
 #include <cassert>
 
diff --git a/src/system/PackStream.h b/src/system/PackStream.h
index 45e2bf7..475289c 100644
--- a/src/system/PackStream.h
+++ b/src/system/PackStream.h
@@ -5,6 +5,7 @@
 
 class QFile;
 class QDataStream;
+class QByteArray;
 
 namespace paysages {
 namespace system {
diff --git a/src/system/ParallelPool.h b/src/system/ParallelPool.h
index 78ad253..206f975 100644
--- a/src/system/ParallelPool.h
+++ b/src/system/ParallelPool.h
@@ -3,6 +3,8 @@
 
 #include "system_global.h"
 
+#include <vector>
+
 namespace paysages {
 namespace system {
 
diff --git a/src/system/system_global.h b/src/system/system_global.h
index 5e79530..e723387 100644
--- a/src/system/system_global.h
+++ b/src/system/system_global.h
@@ -1,11 +1,17 @@
 #ifndef SYSTEM_GLOBAL_H
 #define SYSTEM_GLOBAL_H
 
-#ifndef __MINGW32__
+#include <string>
+
+#ifdef __MINGW32__
+#define Q_DECL_EXPORT __declspec(dllexport)
+#define Q_DECL_IMPORT __declspec(dllimport)
+#else
 #define PAYSAGES_USE_INLINING 1
+#define Q_DECL_EXPORT __attribute__((visibility("default")))
+#define Q_DECL_IMPORT __attribute__((visibility("default")))
 #endif
 
-#include <QtCore/qglobal.h>
 #if defined(SYSTEM_LIBRARY)
 #define SYSTEMSHARED_EXPORT Q_DECL_EXPORT
 #else