Don't include Matrix3 in Matrix4, as it isn't used.

Also updated includes in dependent headers.

src/AbstractShaderProgram.h

@@ -21,6 +21,7 @@
 
 #include <map>
 
+#include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
 #include "Math/Vector4.h"
 #include "Magnum.h"

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 {

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() {

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 {
 

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"
 

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"

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 {
 

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 {
 

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"

src/SceneGraph/Object.h

@@ -21,6 +21,7 @@
 
 #include <Containers/LinkedList.h>
 
+#include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
 #include "Magnum.h"