diff --git a/include/Nazara/Graphics.hpp b/include/Nazara/Graphics.hpp
index 038715937..f79410bc8 100644
--- a/include/Nazara/Graphics.hpp
+++ b/include/Nazara/Graphics.hpp
@@ -35,6 +35,7 @@
 #include <Nazara/Graphics/BasicMaterial.hpp>
 #include <Nazara/Graphics/Camera.hpp>
 #include <Nazara/Graphics/Config.hpp>
+#include <Nazara/Graphics/DebugDrawPipelinePass.hpp>
 #include <Nazara/Graphics/DepthMaterial.hpp>
 #include <Nazara/Graphics/DepthPipelinePass.hpp>
 #include <Nazara/Graphics/DirectionalLight.hpp>
diff --git a/include/Nazara/Renderer/DebugDrawer.hpp b/include/Nazara/Renderer/DebugDrawer.hpp
index 1df7802d2..8cfb6ecce 100644
--- a/include/Nazara/Renderer/DebugDrawer.hpp
+++ b/include/Nazara/Renderer/DebugDrawer.hpp
@@ -71,7 +71,7 @@ namespace Nz
 			struct DrawCall
 			{
 				std::shared_ptr<RenderBuffer> vertexBuffer;
-				std::uint64_t vertexCount;
+				std::size_t vertexCount;
 			};
 
 			struct PendingUpload
diff --git a/include/Nazara/Utility/Plugins/AssimpPlugin.hpp b/include/Nazara/Utility/Plugins/AssimpPlugin.hpp
index 439496783..0f8484ab2 100644
--- a/include/Nazara/Utility/Plugins/AssimpPlugin.hpp
+++ b/include/Nazara/Utility/Plugins/AssimpPlugin.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef NAZARA_UTILITY_PLUGIN_ASSIMPPLUGIN_HPP
-#define NAZARA_UTILITY_PLUGIN_ASSIMPPLUGIN_HPP
+#ifndef NAZARA_UTILITY_PLUGINS_ASSIMPPLUGIN_HPP
+#define NAZARA_UTILITY_PLUGINS_ASSIMPPLUGIN_HPP
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/PluginInterface.hpp>
@@ -34,4 +34,4 @@ namespace Nz
 
 #include <Nazara/Utility/Plugins/AssimpPlugin.inl>
 
-#endif // NAZARA_UTILITY_PLUGIN_ASSIMPPLUGIN_HPP
+#endif // NAZARA_UTILITY_PLUGINS_ASSIMPPLUGIN_HPP
diff --git a/include/Nazara/Utility/Plugins/FFmpegPlugin.hpp b/include/Nazara/Utility/Plugins/FFmpegPlugin.hpp
index 488ee2d73..44298f1a5 100644
--- a/include/Nazara/Utility/Plugins/FFmpegPlugin.hpp
+++ b/include/Nazara/Utility/Plugins/FFmpegPlugin.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef NAZARA_UTILITY_PLUGIN_FFMPEGPLUGIN_HPP
-#define NAZARA_UTILITY_PLUGIN_FFMPEGPLUGIN_HPP
+#ifndef NAZARA_UTILITY_PLUGINS_FFMPEGPLUGIN_HPP
+#define NAZARA_UTILITY_PLUGINS_FFMPEGPLUGIN_HPP
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/PluginInterface.hpp>
@@ -36,4 +36,4 @@ namespace Nz
 
 #include <Nazara/Utility/Plugins/FFmpegPlugin.inl>
 
-#endif // NAZARA_UTILITY_PLUGIN_FFMPEGPLUGIN_HPP
+#endif // NAZARA_UTILITY_PLUGINS_FFMPEGPLUGIN_HPP
diff --git a/src/Nazara/Renderer/DebugDrawer.cpp b/src/Nazara/Renderer/DebugDrawer.cpp
index 81cb8c47a..22d2427ac 100644
--- a/src/Nazara/Renderer/DebugDrawer.cpp
+++ b/src/Nazara/Renderer/DebugDrawer.cpp
@@ -88,7 +88,7 @@ namespace Nz
 		for (auto& drawCall : m_drawCalls)
 		{
 			builder.BindVertexBuffer(0, *drawCall.vertexBuffer);
-			builder.Draw(drawCall.vertexCount);
+			builder.Draw(SafeCast<UInt32>(drawCall.vertexCount));
 		}
 	}