diff --git a/include/Nazara/Graphics/Scene.hpp b/include/Nazara/Graphics/Scene.hpp
index cabe82ebf..f317207c0 100644
--- a/include/Nazara/Graphics/Scene.hpp
+++ b/include/Nazara/Graphics/Scene.hpp
@@ -8,11 +8,15 @@
 #define NAZARA_SCENE_HPP
 
 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/Clock.hpp>
 #include <Nazara/Core/Color.hpp>
 #include <Nazara/Core/Updatable.hpp>
 #include <Nazara/Graphics/AbstractBackground.hpp>
 #include <Nazara/Graphics/AbstractRenderTechnique.hpp>
+#include <Nazara/Graphics/SceneRoot.hpp>
 #include <Nazara/Math/Frustum.hpp>
+#include <memory>
+#include <vector>
 
 class NzAbstractRenderQueue;
 class NzAbstractViewer;
@@ -22,7 +26,6 @@ class NzModel;
 class NzNode;
 class NzRenderQueue;
 class NzSceneNode;
-struct NzSceneImpl;
 
 class NAZARA_API NzScene
 {
@@ -30,7 +33,7 @@ class NAZARA_API NzScene
 
 	public:
 		NzScene();
-		~NzScene();
+		~NzScene() = default;
 
 		void AddToVisibilityList(NzUpdatable* object);
 
@@ -47,7 +50,8 @@ class NAZARA_API NzScene
 		NzVector3f GetLeft() const;
 		NzAbstractRenderTechnique* GetRenderTechnique() const;
 		NzVector3f GetRight() const;
-		NzSceneNode& GetRoot() const;
+		NzSceneNode& GetRoot();
+		const NzSceneNode& GetRoot() const;
 		NzAbstractViewer* GetViewer() const;
 		NzVector3f GetUp() const;
 		float GetUpdateTime() const;
@@ -76,7 +80,20 @@ class NAZARA_API NzScene
 	private:
 		void RecursiveFrustumCull(NzAbstractRenderQueue* renderQueue, const NzFrustumf& frustum, NzNode* node);
 
-		NzSceneImpl* m_impl;
+		mutable std::unique_ptr<NzAbstractBackground> m_background;
+		mutable std::unique_ptr<NzAbstractRenderTechnique> m_renderTechnique;
+		std::vector<NzUpdatable*> m_updateList;
+		std::vector<NzUpdatable*> m_visibleUpdateList;
+		NzClock m_updateClock;
+		NzColor m_ambientColor;
+		NzSceneRoot m_root;
+		NzAbstractViewer* m_viewer;
+		bool m_backgroundEnabled;
+		bool m_update;
+		float m_frameTime;
+		float m_updateTime;
+		mutable int m_renderTechniqueRanking;
+		unsigned int m_updatePerSecond;
 };
 
 #endif // NAZARA_SCENE_HPP
diff --git a/include/Nazara/Graphics/SceneNode.hpp b/include/Nazara/Graphics/SceneNode.hpp
index 3cbfde9e9..ccb62806e 100644
--- a/include/Nazara/Graphics/SceneNode.hpp
+++ b/include/Nazara/Graphics/SceneNode.hpp
@@ -9,11 +9,11 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Graphics/Enums.hpp>
-#include <Nazara/Graphics/Scene.hpp>
 #include <Nazara/Math/BoundingVolume.hpp>
 #include <Nazara/Math/Frustum.hpp>
 #include <Nazara/Utility/Node.hpp>
 
+class NzAbstractRenderQueue;
 class NzScene;
 
 class NAZARA_API NzSceneNode : public NzNode
diff --git a/include/Nazara/Graphics/SceneRoot.hpp b/include/Nazara/Graphics/SceneRoot.hpp
index 9e09281ac..28aa9b20e 100644
--- a/include/Nazara/Graphics/SceneRoot.hpp
+++ b/include/Nazara/Graphics/SceneRoot.hpp
@@ -10,9 +10,11 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Graphics/SceneNode.hpp>
 
+class NzScene;
+
 class NAZARA_API NzSceneRoot : public NzSceneNode
 {
-	friend struct NzSceneImpl;
+	friend NzScene;
 
 	public:
 		void AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const override;
diff --git a/src/Nazara/Graphics/DeferredRenderTechnique.cpp b/src/Nazara/Graphics/DeferredRenderTechnique.cpp
index d05b39fe7..cb86db239 100644
--- a/src/Nazara/Graphics/DeferredRenderTechnique.cpp
+++ b/src/Nazara/Graphics/DeferredRenderTechnique.cpp
@@ -21,6 +21,7 @@
 #include <Nazara/Graphics/Drawable.hpp>
 #include <Nazara/Graphics/Light.hpp>
 #include <Nazara/Graphics/Material.hpp>
+#include <Nazara/Graphics/Scene.hpp>
 #include <Nazara/Graphics/Sprite.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/OpenGL.hpp>
diff --git a/src/Nazara/Graphics/ForwardRenderTechnique.cpp b/src/Nazara/Graphics/ForwardRenderTechnique.cpp
index 09e4e7910..d5de9bc65 100644
--- a/src/Nazara/Graphics/ForwardRenderTechnique.cpp
+++ b/src/Nazara/Graphics/ForwardRenderTechnique.cpp
@@ -10,6 +10,7 @@
 #include <Nazara/Graphics/Drawable.hpp>
 #include <Nazara/Graphics/Light.hpp>
 #include <Nazara/Graphics/Material.hpp>
+#include <Nazara/Graphics/Scene.hpp>
 #include <Nazara/Graphics/Sprite.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
diff --git a/src/Nazara/Graphics/ParticleSystem.cpp b/src/Nazara/Graphics/ParticleSystem.cpp
index 1ded1113b..2fa2e9601 100644
--- a/src/Nazara/Graphics/ParticleSystem.cpp
+++ b/src/Nazara/Graphics/ParticleSystem.cpp
@@ -7,6 +7,7 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/StringStream.hpp>
 #include <Nazara/Graphics/ParticleMapper.hpp>
+#include <Nazara/Graphics/Scene.hpp>
 #include <cstdlib>
 #include <memory>
 #include <Nazara/Graphics/Debug.hpp>
diff --git a/src/Nazara/Graphics/Scene.cpp b/src/Nazara/Graphics/Scene.cpp
index a89fc5d93..33624d6bd 100644
--- a/src/Nazara/Graphics/Scene.cpp
+++ b/src/Nazara/Graphics/Scene.cpp
@@ -9,57 +9,30 @@
 #include <Nazara/Graphics/Camera.hpp>
 #include <Nazara/Graphics/ColorBackground.hpp>
 #include <Nazara/Graphics/RenderTechniques.hpp>
-#include <Nazara/Graphics/SceneRoot.hpp>
 #include <Nazara/Graphics/SkinningManager.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <functional>
-#include <memory>
-#include <set>
-#include <vector>
 #include <Nazara/Graphics/Debug.hpp>
 
-struct NzSceneImpl
+NzScene::NzScene() :
+m_ambientColor(25, 25, 25),
+m_root(this),
+m_viewer(nullptr),
+m_backgroundEnabled(true),
+m_update(false),
+m_updatePerSecond(60)
 {
-	NzSceneImpl(NzScene* scene) :
-	root(scene)
-	{
-	}
-
-	std::unique_ptr<NzAbstractBackground> background;
-	std::unique_ptr<NzAbstractRenderTechnique> renderTechnique;
-	std::vector<NzUpdatable*> updateList;
-	std::vector<NzUpdatable*> visibleUpdateList;
-	NzClock updateClock;
-	NzColor ambientColor = NzColor(25,25,25);
-	NzSceneRoot root;
-	NzAbstractViewer* viewer = nullptr;
-	bool backgroundEnabled = true;
-	bool update = false;
-	float frameTime;
-	float updateTime;
-	int renderTechniqueRanking;
-	unsigned int updatePerSecond = 60;
-};
-
-NzScene::NzScene()
-{
-	m_impl = new NzSceneImpl(this);
-}
-
-NzScene::~NzScene()
-{
-	delete m_impl;
 }
 
 void NzScene::AddToVisibilityList(NzUpdatable* object)
 {
-	m_impl->visibleUpdateList.push_back(object);
+	m_visibleUpdateList.push_back(object);
 }
 
 void NzScene::Cull()
 {
 	#if NAZARA_GRAPHICS_SAFE
-	if (!m_impl->viewer)
+	if (!m_viewer)
 	{
 		NazaraError("No viewer");
 		return;
@@ -69,10 +42,10 @@ void NzScene::Cull()
 	NzAbstractRenderQueue* renderQueue = GetRenderTechnique()->GetRenderQueue();
 	renderQueue->Clear(false);
 
-	m_impl->visibleUpdateList.clear();
+	m_visibleUpdateList.clear();
 
 	// Frustum culling
-	RecursiveFrustumCull(renderQueue, m_impl->viewer->GetFrustum(), &m_impl->root);
+	RecursiveFrustumCull(renderQueue, m_viewer->GetFrustum(), &m_root);
 
 	///TODO: Occlusion culling
 
@@ -82,29 +55,29 @@ void NzScene::Cull()
 void NzScene::Draw()
 {
 	#if NAZARA_GRAPHICS_SAFE
-	if (!m_impl->viewer)
+	if (!m_viewer)
 	{
 		NazaraError("No viewer");
 		return;
 	}
 	#endif
 
-	m_impl->viewer->ApplyView();
+	m_viewer->ApplyView();
 
 	try
 	{
-		NzErrorFlags errFlags(nzErrorFlag_ThrowException);
-		m_impl->renderTechnique->Clear(this);
-		m_impl->renderTechnique->Draw(this);
+		NzErrorFlags errFlags(nzErrorFlag_ThrowException, true);
+		m_renderTechnique->Clear(this);
+		m_renderTechnique->Draw(this);
 	}
 	catch (const std::exception& e)
 	{
-		NzString oldName = m_impl->renderTechnique->GetName();
+		NzString oldName = m_renderTechnique->GetName();
 
-		if (m_impl->renderTechniqueRanking > 0)
+		if (m_renderTechniqueRanking > 0)
 		{
-			m_impl->renderTechnique.reset(NzRenderTechniques::GetByRanking(m_impl->renderTechniqueRanking-1, &m_impl->renderTechniqueRanking));
-			NazaraError("Render technique \"" + oldName + "\" failed, fallback to \"" + m_impl->renderTechnique->GetName() + '"');
+			m_renderTechnique.reset(NzRenderTechniques::GetByRanking(m_renderTechniqueRanking-1, &m_renderTechniqueRanking));
+			NazaraError("Render technique \"" + oldName + "\" failed, fallback to \"" + m_renderTechnique->GetName() + '"');
 		}
 		else
 		{
@@ -118,131 +91,136 @@ void NzScene::Draw()
 
 void NzScene::EnableBackground(bool enable)
 {
-	m_impl->backgroundEnabled = enable;
+	m_backgroundEnabled = enable;
 }
 
 NzColor NzScene::GetAmbientColor() const
 {
-	return m_impl->ambientColor;
+	return m_ambientColor;
 }
 
 NzAbstractBackground* NzScene::GetBackground() const
 {
-	if (!m_impl->background)
-		m_impl->background.reset(new NzColorBackground);
+	if (!m_background)
+		m_background.reset(new NzColorBackground);
 
-	return m_impl->background.get();
+	return m_background.get();
 }
 
 NzVector3f NzScene::GetBackward() const
 {
 	#if NAZARA_GRAPHICS_SAFE
-	if (!m_impl->viewer)
+	if (!m_viewer)
 	{
 		NazaraError("No viewer");
 		return NzVector3f::Backward();
 	}
 	#endif
 
-	return -m_impl->viewer->GetGlobalForward();
+	return -m_viewer->GetGlobalForward();
 }
 
 NzVector3f NzScene::GetDown() const
 {
 	#if NAZARA_GRAPHICS_SAFE
-	if (!m_impl->viewer)
+	if (!m_viewer)
 	{
 		NazaraError("No viewer");
 		return NzVector3f::Down();
 	}
 	#endif
 
-	return -m_impl->viewer->GetGlobalUp();
+	return -m_viewer->GetGlobalUp();
 }
 
 NzVector3f NzScene::GetForward() const
 {
 	#if NAZARA_GRAPHICS_SAFE
-	if (!m_impl->viewer)
+	if (!m_viewer)
 	{
 		NazaraError("No viewer");
 		return NzVector3f::Forward();
 	}
 	#endif
 
-	return m_impl->viewer->GetGlobalForward();
+	return m_viewer->GetGlobalForward();
 }
 
 NzVector3f NzScene::GetLeft() const
 {
 	#if NAZARA_GRAPHICS_SAFE
-	if (!m_impl->viewer)
+	if (!m_viewer)
 	{
 		NazaraError("No viewer");
 		return NzVector3f::Left();
 	}
 	#endif
 
-	return -m_impl->viewer->GetGlobalRight();
+	return -m_viewer->GetGlobalRight();
 }
 
 NzAbstractRenderTechnique* NzScene::GetRenderTechnique() const
 {
-	if (!m_impl->renderTechnique)
-		m_impl->renderTechnique.reset(NzRenderTechniques::GetByRanking(-1, &m_impl->renderTechniqueRanking));
+	if (!m_renderTechnique)
+		m_renderTechnique.reset(NzRenderTechniques::GetByRanking(-1, &m_renderTechniqueRanking));
 
-	return m_impl->renderTechnique.get();
+	return m_renderTechnique.get();
 }
 
 NzVector3f NzScene::GetRight() const
 {
 	#if NAZARA_GRAPHICS_SAFE
-	if (!m_impl->viewer)
+	if (!m_viewer)
 	{
 		NazaraError("No viewer");
 		return NzVector3f::Right();
 	}
 	#endif
 
-	return m_impl->viewer->GetGlobalRight();
+	return m_viewer->GetGlobalRight();
 }
 
-NzSceneNode& NzScene::GetRoot() const
+NzSceneNode& NzScene::GetRoot()
 {
-	return m_impl->root;
+	return m_root;
+}
+
+const NzSceneNode& NzScene::GetRoot() const
+{
+	return m_root;
 }
 
 NzAbstractViewer* NzScene::GetViewer() const
 {
-	return m_impl->viewer;
+	return m_viewer;
 }
 
 NzVector3f NzScene::GetUp() const
 {
 	#if NAZARA_GRAPHICS_SAFE
-	if (!m_impl->viewer)
+	if (!m_viewer)
 	{
 		NazaraError("No viewer");
 		return NzVector3f::Up();
 	}
 	#endif
 
-	return m_impl->viewer->GetGlobalUp();
+	return m_viewer->GetGlobalUp();
 }
 
 float NzScene::GetUpdateTime() const
 {
-	return m_impl->updateTime;
+	return m_updateTime;
 }
 
 unsigned int NzScene::GetUpdatePerSecond() const
 {
-	return m_impl->updatePerSecond;
+	return m_updatePerSecond;
 }
 
 bool NzScene::IsBackgroundEnabled() const
 {
-	return m_impl->backgroundEnabled;
+	return m_backgroundEnabled;
 }
 
 void NzScene::RenderFrame()
@@ -271,32 +249,32 @@ void NzScene::RegisterForUpdate(NzUpdatable* object)
 	}
 	#endif
 
-	m_impl->updateList.push_back(object);
+	m_updateList.push_back(object);
 }
 
 void NzScene::SetAmbientColor(const NzColor& color)
 {
-	m_impl->ambientColor = color;
+	m_ambientColor = color;
 }
 
 void NzScene::SetBackground(NzAbstractBackground* background)
 {
-	m_impl->background.reset(background);
+	m_background.reset(background);
 }
 
 void NzScene::SetRenderTechnique(NzAbstractRenderTechnique* renderTechnique)
 {
-	m_impl->renderTechnique.reset(renderTechnique);
+	m_renderTechnique.reset(renderTechnique);
 }
 
 void NzScene::SetViewer(NzAbstractViewer* viewer)
 {
-	if (m_impl->viewer != viewer)
+	if (m_viewer != viewer)
 	{
-		m_impl->viewer = viewer;
+		m_viewer = viewer;
 
 		// Invalidation de tous les nodes de la scène (utile pour la régénération des sommets dépendant du viewer)
-		m_impl->root.InvalidateNode();
+		m_root.InvalidateNode();
 	}
 }
 
@@ -307,7 +285,7 @@ void NzScene::SetViewer(NzAbstractViewer& viewer)
 
 void NzScene::SetUpdatePerSecond(unsigned int updatePerSecond)
 {
-	m_impl->updatePerSecond = updatePerSecond;
+	m_updatePerSecond = updatePerSecond;
 }
 
 void NzScene::UnregisterForUpdate(NzUpdatable* object)
@@ -320,20 +298,20 @@ void NzScene::UnregisterForUpdate(NzUpdatable* object)
 	}
 	#endif
 
-	auto it = std::find(m_impl->updateList.begin(), m_impl->updateList.end(), object);
-	if (it != m_impl->updateList.end())
-		m_impl->updateList.erase(it);
+	auto it = std::find(m_updateList.begin(), m_updateList.end(), object);
+	if (it != m_updateList.end())
+		m_updateList.erase(it);
 }
 
 void NzScene::Update()
 {
-	m_impl->update = (m_impl->updatePerSecond == 0 || m_impl->updateClock.GetMilliseconds() > 1000/m_impl->updatePerSecond);
-	if (m_impl->update)
+	m_update = (m_updatePerSecond == 0 || m_updateClock.GetMilliseconds() > 1000/m_updatePerSecond);
+	if (m_update)
 	{
-		m_impl->updateTime = m_impl->updateClock.GetSeconds();
-		m_impl->updateClock.Restart();
+		m_updateTime = m_updateClock.GetSeconds();
+		m_updateClock.Restart();
 
-		for (NzUpdatable* updatable : m_impl->updateList)
+		for (NzUpdatable* updatable : m_updateList)
 			///TODO: Multihreading
 			updatable->Update();
 	}
@@ -343,16 +321,16 @@ void NzScene::UpdateVisible()
 {
 	NzSkinningManager::Skin();
 
-	if (m_impl->update)
+	if (m_update)
 	{
-		for (NzUpdatable* node : m_impl->visibleUpdateList)
+		for (NzUpdatable* node : m_visibleUpdateList)
 			node->Update();
 	}
 }
 
 NzScene::operator const NzSceneNode&() const
 {
-	return m_impl->root;
+	return m_root;
 }
 
 void NzScene::RecursiveFrustumCull(NzAbstractRenderQueue* renderQueue, const NzFrustumf& frustum, NzNode* node)
diff --git a/src/Nazara/Graphics/SkeletalModel.cpp b/src/Nazara/Graphics/SkeletalModel.cpp
index 16b01f01f..07e8b76ef 100644
--- a/src/Nazara/Graphics/SkeletalModel.cpp
+++ b/src/Nazara/Graphics/SkeletalModel.cpp
@@ -7,6 +7,7 @@
 #include <Nazara/Graphics/Camera.hpp>
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Graphics/SkinningManager.hpp>
+#include <Nazara/Graphics/Scene.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
 #include <Nazara/Utility/MeshData.hpp>
 #include <Nazara/Utility/SkeletalMesh.hpp>
diff --git a/src/Nazara/Graphics/Sprite.cpp b/src/Nazara/Graphics/Sprite.cpp
index d660adc23..e3ec9752b 100644
--- a/src/Nazara/Graphics/Sprite.cpp
+++ b/src/Nazara/Graphics/Sprite.cpp
@@ -3,7 +3,9 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/Sprite.hpp>
+#include <Nazara/Graphics/AbstractRenderQueue.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
+#include <Nazara/Graphics/Scene.hpp>
 #include <cstring>
 #include <memory>
 #include <Nazara/Graphics/Debug.hpp>
diff --git a/src/Nazara/Graphics/TextSprite.cpp b/src/Nazara/Graphics/TextSprite.cpp
index ac3b67a35..fb0f64f1e 100644
--- a/src/Nazara/Graphics/TextSprite.cpp
+++ b/src/Nazara/Graphics/TextSprite.cpp
@@ -5,7 +5,9 @@
 #include <Nazara/Graphics/TextSprite.hpp>
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/SparsePtr.hpp>
+#include <Nazara/Graphics/AbstractRenderQueue.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
+#include <Nazara/Graphics/Scene.hpp>
 #include <memory>
 #include <Nazara/Utility/Font.hpp>
 #include <Nazara/Graphics/Debug.hpp>