diff --git a/src/python/corrade/PyBuffer.h b/src/python/corrade/PyBuffer.h
index 5e51d3c..62265f7 100644
--- a/src/python/corrade/PyBuffer.h
+++ b/src/python/corrade/PyBuffer.h
@@ -79,4 +79,10 @@ template<class Class, bool(*getter)(Class&, Py_buffer&, int)> void enableBetterB
 
 }
 
+/** @todo remove when https://github.com/pybind/pybind11/pull/1852 is merged
+    and released */
+namespace pybind11 {
+    PYBIND11_RUNTIME_EXCEPTION(buffer_error, PyExc_BufferError)
+}
+
 #endif
diff --git a/src/python/corrade/PybindExtras.h b/src/python/corrade/PybindExtras.h
deleted file mode 100644
index 42b021a..0000000
--- a/src/python/corrade/PybindExtras.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef corrade_PybindExtras_h
-#define corrade_PybindExtras_h
-/*
-    This file is part of Magnum.
-
-    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
-              Vladimír Vondruš <mosra@centrum.cz>
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included
-    in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-*/
-
-#include <pybind11/pybind11.h>
-
-namespace pybind11 {
-
-// TODO: remove when https://github.com/pybind/pybind11/pull/1852 is merged and
-// released
-PYBIND11_RUNTIME_EXCEPTION(buffer_error, PyExc_BufferError)
-
-}
-
-#endif
diff --git a/src/python/corrade/containers.cpp b/src/python/corrade/containers.cpp
index e7d6f86..f1664fb 100644
--- a/src/python/corrade/containers.cpp
+++ b/src/python/corrade/containers.cpp
@@ -31,7 +31,6 @@
 
 #include "corrade/bootstrap.h"
 #include "corrade/PyArrayView.h"
-#include "corrade/PybindExtras.h"
 #include "corrade/PyBuffer.h"
 
 namespace corrade {
diff --git a/src/python/magnum/math.matrix.h b/src/python/magnum/math.matrix.h
index 2330699..b592a05 100644
--- a/src/python/magnum/math.matrix.h
+++ b/src/python/magnum/math.matrix.h
@@ -32,7 +32,6 @@
 #include <Magnum/Math/Matrix3.h>
 #include <Magnum/Math/Matrix4.h>
 
-#include "corrade/PybindExtras.h"
 #include "corrade/PyBuffer.h"
 
 #include "magnum/math.h"
diff --git a/src/python/magnum/math.vector.h b/src/python/magnum/math.vector.h
index 2a3f4a8..73dbed3 100644
--- a/src/python/magnum/math.vector.h
+++ b/src/python/magnum/math.vector.h
@@ -31,7 +31,6 @@
 #include <Magnum/Math/Color.h>
 #include <Magnum/Math/Vector4.h>
 
-#include "corrade/PybindExtras.h"
 #include "corrade/PyBuffer.h"
 
 #include "magnum/math.h"