diff --git a/src/Primitives/Cylinder.cpp b/src/Primitives/Cylinder.cpp
index 025242e39..0b9b2488d 100644
--- a/src/Primitives/Cylinder.cpp
+++ b/src/Primitives/Cylinder.cpp
@@ -16,6 +16,7 @@
 #include "Cylinder.h"
 
 #include "Math/Constants.h"
+#include "Math/Point3D.h"
 
 namespace Magnum { namespace Primitives {
 
diff --git a/src/Primitives/Icosphere.cpp b/src/Primitives/Icosphere.cpp
index f5cc0c1f3..d5e79bbf8 100644
--- a/src/Primitives/Icosphere.cpp
+++ b/src/Primitives/Icosphere.cpp
@@ -15,7 +15,7 @@
 
 #include "Icosphere.h"
 
-#include "Math/Vector4.h"
+#include "Math/Point3D.h"
 
 namespace Magnum { namespace Primitives {
 
@@ -41,18 +41,18 @@ Icosphere<0>::Icosphere(): MeshData3D(Mesh::Primitive::Triangles, new std::vecto
     3, 9, 8,
     4, 8, 0
 }, {new std::vector<Point3D>}, {new std::vector<Vector3>{
-    Vector3(0, -0.525731f, 0.850651f),
-    Vector3(0.850651f, 0, 0.525731f),
-    Vector3(0.850651f, 0, -0.525731f),
-    Vector3(-0.850651f, 0, -0.525731f),
-    Vector3(-0.850651f, 0, 0.525731f),
-    Vector3(-0.525731f, 0.850651f, 0),
-    Vector3(0.525731f, 0.850651f, 0),
-    Vector3(0.525731f, -0.850651f, 0),
-    Vector3(-0.525731f, -0.850651f, 0),
-    Vector3(0, -0.525731f, -0.850651f),
-    Vector3(0, 0.525731f, -0.850651f),
-    Vector3(0, 0.525731f, 0.850651f)
+    {0.0f, -0.525731f, 0.850651f},
+    {0.850651f, 0.0f, 0.525731f},
+    {0.850651f, 0.0f, -0.525731f},
+    {-0.850651f, 0.0f, -0.525731f},
+    {-0.850651f, 0.0f, 0.525731f},
+    {-0.525731f, 0.850651f, 0.0f},
+    {0.525731f, 0.850651f, 0.0f},
+    {0.525731f, -0.850651f, 0.0f},
+    {-0.525731f, -0.850651f, 0.0f},
+    {0.0f, -0.525731f, -0.850651f},
+    {0.0f, 0.525731f, -0.850651f},
+    {0.0f, 0.525731f, 0.850651f}
 }}, {}) {
     positions(0)->assign(normals(0)->begin(), normals(0)->end());
 }
diff --git a/src/Trade/MeshData2D.cpp b/src/Trade/MeshData2D.cpp
index 8fee8177d..b143396bb 100644
--- a/src/Trade/MeshData2D.cpp
+++ b/src/Trade/MeshData2D.cpp
@@ -15,6 +15,8 @@
 
 #include "MeshData2D.h"
 
+#include "Math/Point2D.h"
+
 namespace Magnum { namespace Trade {
 
 MeshData2D::~MeshData2D() {
diff --git a/src/Trade/MeshData2D.h b/src/Trade/MeshData2D.h
index b3457956d..c41ae1697 100644
--- a/src/Trade/MeshData2D.h
+++ b/src/Trade/MeshData2D.h
@@ -21,7 +21,6 @@
 
 #include <string>
 
-#include "Math/Point2D.h"
 #include "Mesh.h"
 
 namespace Magnum { namespace Trade {
diff --git a/src/Trade/MeshData3D.cpp b/src/Trade/MeshData3D.cpp
index 65d59fbd9..e76968720 100644
--- a/src/Trade/MeshData3D.cpp
+++ b/src/Trade/MeshData3D.cpp
@@ -15,6 +15,8 @@
 
 #include "MeshData3D.h"
 
+#include "Math/Point3D.h"
+
 namespace Magnum { namespace Trade {
 
 MeshData3D::~MeshData3D() {
diff --git a/src/Trade/MeshData3D.h b/src/Trade/MeshData3D.h
index 0d83b152a..eed0c1650 100644
--- a/src/Trade/MeshData3D.h
+++ b/src/Trade/MeshData3D.h
@@ -21,7 +21,6 @@
 
 #include <string>
 
-#include "Math/Point3D.h"
 #include "Mesh.h"
 
 namespace Magnum { namespace Trade {