diff --git a/include/Nazara/Widgets/BoxLayout.hpp b/include/Nazara/Widgets/BoxLayout.hpp
index adbd7deda..35f71ad9e 100644
--- a/include/Nazara/Widgets/BoxLayout.hpp
+++ b/include/Nazara/Widgets/BoxLayout.hpp
@@ -7,14 +7,13 @@
 #ifndef NAZARA_WIDGETS_BOXLAYOUT_HPP
 #define NAZARA_WIDGETS_BOXLAYOUT_HPP
 
-#include <NDK/BaseWidget.hpp>
-#include <NDK/ClientPrerequisites.hpp>
-#include <NDK/Widgets/Enums.hpp>
+#include <Nazara/Widgets/BaseWidget.hpp>
+#include <Nazara/Widgets/Enums.hpp>
 #include <memory>
 
 namespace Nz
 {
-	class NDK_CLIENT_API BoxLayout : public BaseWidget
+	class NAZARA_WIDGETS_API BoxLayout : public BaseWidget
 	{
 		public:
 			BoxLayout(BaseWidget* parent, BoxLayoutOrientation orientation);
@@ -36,6 +35,6 @@ namespace Nz
 	};
 }
 
-#include <NDK/Widgets/BoxLayout.inl>
+#include <Nazara/Widgets/BoxLayout.inl>
 
 #endif // NAZARA_WIDGETS_BOXLAYOUT_HPP
diff --git a/include/Nazara/Widgets/BoxLayout.inl b/include/Nazara/Widgets/BoxLayout.inl
index 2264db0bc..72c67f392 100644
--- a/include/Nazara/Widgets/BoxLayout.inl
+++ b/include/Nazara/Widgets/BoxLayout.inl
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Widgets/BoxLayout.hpp>
-#include <NDK/Widgets/BoxLayout.hpp>
 #include <Nazara/Widgets/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Widgets/BoxLayout.cpp b/src/Nazara/Widgets/BoxLayout.cpp
index 2a72ba1a6..1cd00c65c 100644
--- a/src/Nazara/Widgets/BoxLayout.cpp
+++ b/src/Nazara/Widgets/BoxLayout.cpp
@@ -2,13 +2,10 @@
 // This file is part of the "Nazara Engine - Widgets module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#if 0
-
 #include <Nazara/Widgets/BoxLayout.hpp>
 #include <Nazara/Core/Log.hpp>
-#include <Nazara/Core/StackVector.hpp>
+#include <Nazara/Utils/StackVector.hpp>
 #include <kiwi/kiwi.h>
-#include <NDK/Widgets/BoxLayout.hpp>
 #include <cassert>
 #include <vector>
 #include <Nazara/Widgets/Debug.hpp>
@@ -39,11 +36,11 @@ namespace Nz
 
 		switch (m_orientation)
 		{
-			case BoxLayoutOrientation_Horizontal:
+			case BoxLayoutOrientation::Horizontal:
 				axis = 0; //< x
 				break;
 
-			case BoxLayoutOrientation_Vertical:
+			case BoxLayoutOrientation::Vertical:
 				axis = 1; //< y
 				break;
 
@@ -138,5 +135,3 @@ namespace Nz
 		});
 	}
 }
-
-#endif
diff --git a/src/Nazara/Widgets/ScrollAreaWidget.cpp b/src/Nazara/Widgets/ScrollAreaWidget.cpp
index c70c7d970..fd7bc352a 100644
--- a/src/Nazara/Widgets/ScrollAreaWidget.cpp
+++ b/src/Nazara/Widgets/ScrollAreaWidget.cpp
@@ -3,8 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Widgets/ScrollAreaWidget.hpp>
-#include <Nazara/Widgets/ScrollbarWidget.hpp>
 #include <Nazara/Math/Algorithm.hpp>
+#include <Nazara/Widgets/ScrollbarWidget.hpp>
 #include <Nazara/Widgets/Debug.hpp>
 
 namespace Nz