diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h
index b52513f3a..355330a44 100644
--- a/src/AbstractShaderProgram.h
+++ b/src/AbstractShaderProgram.h
@@ -21,6 +21,7 @@
 
 #include <map>
 
+#include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
 #include "Math/Vector4.h"
 #include "Magnum.h"
diff --git a/src/Math/Matrix4.h b/src/Math/Matrix4.h
index 2563646b9..7bf1dc1b1 100644
--- a/src/Math/Matrix4.h
+++ b/src/Math/Matrix4.h
@@ -19,7 +19,7 @@
  * @brief Class Magnum::Math::Matrix4
  */
 
-#include "Matrix3.h"
+#include "Matrix.h"
 #include "Point3D.h"
 
 namespace Magnum { namespace Math {
diff --git a/src/Math/Test/Matrix4Test.cpp b/src/Math/Test/Matrix4Test.cpp
index fdb051277..496cb5627 100644
--- a/src/Math/Test/Matrix4Test.cpp
+++ b/src/Math/Test/Matrix4Test.cpp
@@ -28,7 +28,7 @@ using namespace Corrade::Utility;
 namespace Magnum { namespace Math { namespace Test {
 
 typedef Math::Matrix4<float> Matrix4;
-typedef Math::Matrix3<float> Matrix3;
+typedef Math::Matrix<3, float> Matrix3;
 typedef Math::Vector3<float> Vector3;
 
 Matrix4Test::Matrix4Test() {
diff --git a/src/Physics/AxisAlignedBox.cpp b/src/Physics/AxisAlignedBox.cpp
index e9e9c254e..49a7c919f 100644
--- a/src/Physics/AxisAlignedBox.cpp
+++ b/src/Physics/AxisAlignedBox.cpp
@@ -15,8 +15,8 @@
 
 #include "AxisAlignedBox.h"
 
+#include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
-#include "Math/Point3D.h"
 
 namespace Magnum { namespace Physics {
 
diff --git a/src/Physics/Box.h b/src/Physics/Box.h
index 9c5aa6e5d..02515d976 100644
--- a/src/Physics/Box.h
+++ b/src/Physics/Box.h
@@ -19,6 +19,7 @@
  * @brief Class Magnum::Physics::Box, typedef Magnum::Physics::Box2D, Magnum::Physics::Box3D
  */
 
+#include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
 #include "AbstractShape.h"
 
diff --git a/src/Physics/Capsule.cpp b/src/Physics/Capsule.cpp
index a8109e1a8..9dd3715a4 100644
--- a/src/Physics/Capsule.cpp
+++ b/src/Physics/Capsule.cpp
@@ -17,8 +17,8 @@
 
 #include "Math/Constants.h"
 #include "Math/Math.h"
+#include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
-#include "Math/Point3D.h"
 #include "Math/Geometry/Distance.h"
 #include "Point.h"
 #include "Sphere.h"
diff --git a/src/Physics/Line.cpp b/src/Physics/Line.cpp
index 882c516b7..5adf4f61a 100644
--- a/src/Physics/Line.cpp
+++ b/src/Physics/Line.cpp
@@ -15,8 +15,8 @@
 
 #include "Line.h"
 
+#include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
-#include "Math/Point3D.h"
 
 namespace Magnum { namespace Physics {
 
diff --git a/src/Physics/Point.cpp b/src/Physics/Point.cpp
index 048e66207..67657450c 100644
--- a/src/Physics/Point.cpp
+++ b/src/Physics/Point.cpp
@@ -15,8 +15,8 @@
 
 #include "Point.h"
 
+#include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
-#include "Math/Point3D.h"
 
 namespace Magnum { namespace Physics {
 
diff --git a/src/Physics/Sphere.cpp b/src/Physics/Sphere.cpp
index b2f6d00fb..6015f5950 100644
--- a/src/Physics/Sphere.cpp
+++ b/src/Physics/Sphere.cpp
@@ -17,8 +17,8 @@
 
 #include "Math/Constants.h"
 #include "Math/Math.h"
+#include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
-#include "Math/Point3D.h"
 #include "Math/Geometry/Distance.h"
 #include "LineSegment.h"
 #include "Point.h"
diff --git a/src/SceneGraph/Object.h b/src/SceneGraph/Object.h
index cdeaf5a69..ddb8f6191 100644
--- a/src/SceneGraph/Object.h
+++ b/src/SceneGraph/Object.h
@@ -21,6 +21,7 @@
 
 #include <Containers/LinkedList.h>
 
+#include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
 #include "Magnum.h"