diff --git a/src/Magnum/Math/Angle.h b/src/Magnum/Math/Angle.h
index 7f082c89f..91d3ebca1 100644
--- a/src/Magnum/Math/Angle.h
+++ b/src/Magnum/Math/Angle.h
@@ -29,7 +29,6 @@
  * @brief Class @ref Magnum::Math::Deg, @ref Magnum::Math::Rad, literal @link Magnum::Math::Literals::operator""_degf() @endlink, @link Magnum::Math::Literals::operator""_radf() @endlink, @link Magnum::Math::Literals::operator""_deg() @endlink, @link Magnum::Math::Literals::operator""_rad() @endlink
  */
 
-#include <Corrade/configure.h>
 #include <Corrade/Utility/Debug.h>
 
 #include "Magnum/visibility.h"
diff --git a/src/Magnum/Math/BoolVector.h b/src/Magnum/Math/BoolVector.h
index b0bdf7198..f597fa2b2 100644
--- a/src/Magnum/Math/BoolVector.h
+++ b/src/Magnum/Math/BoolVector.h
@@ -29,7 +29,6 @@
  * @brief Class @ref Magnum::Math::BoolVector
  */
 
-#include <Corrade/configure.h>
 #include <Corrade/Utility/Debug.h>
 
 #include "Magnum/Types.h"
diff --git a/src/Magnum/Math/Math.h b/src/Magnum/Math/Math.h
index b7f5d6c3d..6fe7918e6 100644
--- a/src/Magnum/Math/Math.h
+++ b/src/Magnum/Math/Math.h
@@ -30,7 +30,6 @@
  */
 
 #include <cstddef>
-#include <Corrade/configure.h>
 
 #include "Magnum/Types.h"
 
diff --git a/src/Magnum/Math/Range.h b/src/Magnum/Math/Range.h
index b6d187d4a..317e4ea49 100644
--- a/src/Magnum/Math/Range.h
+++ b/src/Magnum/Math/Range.h
@@ -736,13 +736,6 @@ template<UnsignedInt dimensions, class T> Corrade::Utility::Debug& operator<<(Co
     return debug << Corrade::Utility::Debug::nospace << "})";
 }
 
-template<UnsignedInt dimensions, class T> inline bool Range<dimensions, T>::operator==(const Range<dimensions, T>& other) const {
-    /* For non-scalar types default implementation of TypeTraits would be used,
-       which is just operator== */
-    return TypeTraits<VectorType>::equals(_min, other._min) &&
-        TypeTraits<VectorType>::equals(_max, other._max);
-}
-
 /* Explicit instantiation for commonly used types */
 #ifndef DOXYGEN_GENERATING_OUTPUT
 extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const Range<1, Float>&);
@@ -756,6 +749,13 @@ extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utili
 extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const Range<3, Double>&);
 #endif
 
+template<UnsignedInt dimensions, class T> inline bool Range<dimensions, T>::operator==(const Range<dimensions, T>& other) const {
+    /* For non-scalar types default implementation of TypeTraits would be used,
+       which is just operator== */
+    return TypeTraits<VectorType>::equals(_min, other._min) &&
+        TypeTraits<VectorType>::equals(_max, other._max);
+}
+
 namespace Implementation {
 
 template<UnsignedInt dimensions, class T> struct StrictWeakOrdering<Range<dimensions, T>> {
diff --git a/src/Magnum/Math/Test/CubicHermiteTest.cpp b/src/Magnum/Math/Test/CubicHermiteTest.cpp
index 544bf54f0..5f48aa822 100644
--- a/src/Magnum/Math/Test/CubicHermiteTest.cpp
+++ b/src/Magnum/Math/Test/CubicHermiteTest.cpp
@@ -32,7 +32,6 @@
 #include "Magnum/Math/Vector2.h"
 #include "Magnum/Math/StrictWeakOrdering.h"
 
-
 namespace Magnum { namespace Math { namespace Test { namespace {
 
 struct CubicHermiteTest: Corrade::TestSuite::Tester {