diff --git a/include/Nazara/Audio.hpp b/include/Nazara/Audio.hpp
index 8ff04e028..d50bc1f22 100644
--- a/include/Nazara/Audio.hpp
+++ b/include/Nazara/Audio.hpp
@@ -34,11 +34,11 @@
 #include <Nazara/Audio/AudioBuffer.hpp>
 #include <Nazara/Audio/AudioDevice.hpp>
 #include <Nazara/Audio/AudioSource.hpp>
-#include <Nazara/Audio/Export.hpp>
 #include <Nazara/Audio/DummyAudioBuffer.hpp>
 #include <Nazara/Audio/DummyAudioDevice.hpp>
 #include <Nazara/Audio/DummyAudioSource.hpp>
 #include <Nazara/Audio/Enums.hpp>
+#include <Nazara/Audio/Export.hpp>
 #include <Nazara/Audio/Music.hpp>
 #include <Nazara/Audio/OpenAL.hpp>
 #include <Nazara/Audio/OpenALBuffer.hpp>
diff --git a/include/Nazara/Core.hpp b/include/Nazara/Core.hpp
index f7e0c2b56..a1670f3d6 100644
--- a/include/Nazara/Core.hpp
+++ b/include/Nazara/Core.hpp
@@ -48,7 +48,6 @@
 #include <Nazara/Core/Clock.hpp>
 #include <Nazara/Core/Color.hpp>
 #include <Nazara/Core/CommandLineParameters.hpp>
-#include <Nazara/Core/Export.hpp>
 #include <Nazara/Core/Core.hpp>
 #include <Nazara/Core/CubemapParams.hpp>
 #include <Nazara/Core/DynLib.hpp>
@@ -59,6 +58,7 @@
 #include <Nazara/Core/EnvironmentVariables.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
+#include <Nazara/Core/Export.hpp>
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/FileLogger.hpp>
 #include <Nazara/Core/FilesystemAppComponent.hpp>
diff --git a/include/Nazara/Graphics.hpp b/include/Nazara/Graphics.hpp
index 416826fe2..4ae8e4d5c 100644
--- a/include/Nazara/Graphics.hpp
+++ b/include/Nazara/Graphics.hpp
@@ -34,7 +34,6 @@
 #include <Nazara/Graphics/BakedFrameGraph.hpp>
 #include <Nazara/Graphics/Billboard.hpp>
 #include <Nazara/Graphics/Camera.hpp>
-#include <Nazara/Graphics/Export.hpp>
 #include <Nazara/Graphics/DebugDrawPipelinePass.hpp>
 #include <Nazara/Graphics/DepthPipelinePass.hpp>
 #include <Nazara/Graphics/DirectionalLight.hpp>
@@ -42,6 +41,7 @@
 #include <Nazara/Graphics/ElementRenderer.hpp>
 #include <Nazara/Graphics/ElementRendererRegistry.hpp>
 #include <Nazara/Graphics/Enums.hpp>
+#include <Nazara/Graphics/Export.hpp>
 #include <Nazara/Graphics/ForwardFramePipeline.hpp>
 #include <Nazara/Graphics/ForwardPipelinePass.hpp>
 #include <Nazara/Graphics/FrameGraph.hpp>
diff --git a/include/Nazara/Math.hpp b/include/Nazara/Math.hpp
index d8e02d7f8..cc6bf972c 100644
--- a/include/Nazara/Math.hpp
+++ b/include/Nazara/Math.hpp
@@ -35,6 +35,7 @@
 #include <Nazara/Math/Box.hpp>
 #include <Nazara/Math/Enums.hpp>
 #include <Nazara/Math/EulerAngles.hpp>
+#include <Nazara/Math/Export.hpp>
 #include <Nazara/Math/Frustum.hpp>
 #include <Nazara/Math/Matrix4.hpp>
 #include <Nazara/Math/OrientedBox.hpp>
diff --git a/include/Nazara/Network.hpp b/include/Nazara/Network.hpp
index 2e2c45bf4..2ec8fdd66 100644
--- a/include/Nazara/Network.hpp
+++ b/include/Nazara/Network.hpp
@@ -31,13 +31,13 @@
 
 #include <Nazara/Network/AbstractSocket.hpp>
 #include <Nazara/Network/Algorithm.hpp>
-#include <Nazara/Network/Export.hpp>
 #include <Nazara/Network/ENetCompressor.hpp>
 #include <Nazara/Network/ENetHost.hpp>
 #include <Nazara/Network/ENetPacket.hpp>
 #include <Nazara/Network/ENetPeer.hpp>
 #include <Nazara/Network/ENetProtocol.hpp>
 #include <Nazara/Network/Enums.hpp>
+#include <Nazara/Network/Export.hpp>
 #include <Nazara/Network/IpAddress.hpp>
 #include <Nazara/Network/NetBuffer.hpp>
 #include <Nazara/Network/NetPacket.hpp>
diff --git a/include/Nazara/Physics2D.hpp b/include/Nazara/Physics2D.hpp
index cacfceed8..825d680a8 100644
--- a/include/Nazara/Physics2D.hpp
+++ b/include/Nazara/Physics2D.hpp
@@ -30,8 +30,8 @@
 #define NAZARA_GLOBAL_PHYSICS2D_HPP
 
 #include <Nazara/Physics2D/Collider2D.hpp>
-#include <Nazara/Physics2D/Export.hpp>
 #include <Nazara/Physics2D/Enums.hpp>
+#include <Nazara/Physics2D/Export.hpp>
 #include <Nazara/Physics2D/PhysArbiter2D.hpp>
 #include <Nazara/Physics2D/PhysConstraint2D.hpp>
 #include <Nazara/Physics2D/Physics2D.hpp>
diff --git a/include/Nazara/Physics3D.hpp b/include/Nazara/Physics3D.hpp
index 0ec62aeb2..b72aa1b1a 100644
--- a/include/Nazara/Physics3D.hpp
+++ b/include/Nazara/Physics3D.hpp
@@ -30,8 +30,8 @@
 #define NAZARA_GLOBAL_PHYSICS3D_HPP
 
 #include <Nazara/Physics3D/Collider3D.hpp>
-#include <Nazara/Physics3D/Export.hpp>
 #include <Nazara/Physics3D/Enums.hpp>
+#include <Nazara/Physics3D/Export.hpp>
 #include <Nazara/Physics3D/PhysBody3D.hpp>
 #include <Nazara/Physics3D/PhysCharacter3D.hpp>
 #include <Nazara/Physics3D/PhysConstraint3D.hpp>
diff --git a/include/Nazara/Platform.hpp b/include/Nazara/Platform.hpp
index 7c638eaa9..bf598b02a 100644
--- a/include/Nazara/Platform.hpp
+++ b/include/Nazara/Platform.hpp
@@ -30,10 +30,10 @@
 #define NAZARA_GLOBAL_PLATFORM_HPP
 
 #include <Nazara/Platform/Clipboard.hpp>
-#include <Nazara/Platform/Export.hpp>
 #include <Nazara/Platform/Cursor.hpp>
 #include <Nazara/Platform/CursorController.hpp>
 #include <Nazara/Platform/Enums.hpp>
+#include <Nazara/Platform/Export.hpp>
 #include <Nazara/Platform/Icon.hpp>
 #include <Nazara/Platform/Keyboard.hpp>
 #include <Nazara/Platform/MessageBox.hpp>
diff --git a/include/Nazara/Renderer.hpp b/include/Nazara/Renderer.hpp
index 344b4c572..2e0ca6261 100644
--- a/include/Nazara/Renderer.hpp
+++ b/include/Nazara/Renderer.hpp
@@ -33,9 +33,9 @@
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
 #include <Nazara/Renderer/CommandPool.hpp>
 #include <Nazara/Renderer/ComputePipeline.hpp>
-#include <Nazara/Renderer/Export.hpp>
 #include <Nazara/Renderer/DebugDrawer.hpp>
 #include <Nazara/Renderer/Enums.hpp>
+#include <Nazara/Renderer/Export.hpp>
 #include <Nazara/Renderer/Framebuffer.hpp>
 #include <Nazara/Renderer/GpuSwitch.hpp>
 #include <Nazara/Renderer/RenderBuffer.hpp>
diff --git a/include/Nazara/Widgets.hpp b/include/Nazara/Widgets.hpp
index 07b131e62..8545234a9 100644
--- a/include/Nazara/Widgets.hpp
+++ b/include/Nazara/Widgets.hpp
@@ -36,9 +36,9 @@
 #include <Nazara/Widgets/ButtonWidget.hpp>
 #include <Nazara/Widgets/Canvas.hpp>
 #include <Nazara/Widgets/CheckboxWidget.hpp>
-#include <Nazara/Widgets/Export.hpp>
 #include <Nazara/Widgets/DefaultWidgetTheme.hpp>
 #include <Nazara/Widgets/Enums.hpp>
+#include <Nazara/Widgets/Export.hpp>
 #include <Nazara/Widgets/ImageButtonWidget.hpp>
 #include <Nazara/Widgets/ImageWidget.hpp>
 #include <Nazara/Widgets/LabelWidget.hpp>
diff --git a/xmake/actions/generateheaders.lua b/xmake/actions/generateheaders.lua
index e91b63ede..90299024d 100644
--- a/xmake/actions/generateheaders.lua
+++ b/xmake/actions/generateheaders.lua
@@ -22,10 +22,10 @@ on_run(function ()
 	for _, modulePath in pairs(modules) do
 		local moduleName = modulePath:match(".*[\\/](.*)")
 
-		local config, err = io.open(modulePath .. "/Config.hpp", "r")
+		local config, err = io.open(modulePath .. "/Export.hpp", "r")
 		local head = ""
 		if (not config) then
-			error("Failed to read config file: " .. err)
+			error("Failed to read export file: " .. err)
 		end
 
 		for line in config:lines() do