diff --git a/src/Context.cpp b/src/Context.cpp
index b620e5812..8b43039bb 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <unordered_map>
 #include <Utility/Debug.h>
-#include <Utility/utilities.h>
+#include <Utility/String.h>
 
 #include "AbstractShaderProgram.h"
 #include "AbstractTexture.h"
@@ -253,7 +253,7 @@ Context::Context() {
         /* Don't crash when glGetString() returns nullptr */
         const char* e = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
         if(e) {
-            vector<string> extensions = Corrade::Utility::split(e, ' ');
+            vector<string> extensions = Corrade::Utility::String::split(e, ' ');
             for(const string& extension: extensions) {
                 auto found = futureExtensions.find(extension);
                 if(found != futureExtensions.end()) {
diff --git a/src/Platform/AbstractXApplication.h b/src/Platform/AbstractXApplication.h
index aef67aef4..783f7c479 100644
--- a/src/Platform/AbstractXApplication.h
+++ b/src/Platform/AbstractXApplication.h
@@ -32,8 +32,6 @@
 #include "Math/Vector2.h"
 #include "AbstractContextHandler.h"
 
-#include "magnumCompatibility.h"
-
 namespace Magnum {
 
 class Context;
diff --git a/src/Platform/EglContextHandler.h b/src/Platform/EglContextHandler.h
index 1198695d0..878e5d3ab 100644
--- a/src/Platform/EglContextHandler.h
+++ b/src/Platform/EglContextHandler.h
@@ -31,7 +31,7 @@
 
 #include "AbstractContextHandler.h"
 
-#include "magnumCompatibility.h"
+#include "corradeCompatibility.h"
 
 namespace Magnum { namespace Platform {
 
diff --git a/src/Platform/GlutApplication.h b/src/Platform/GlutApplication.h
index d476ebcc6..07e5c4572 100644
--- a/src/Platform/GlutApplication.h
+++ b/src/Platform/GlutApplication.h
@@ -26,8 +26,6 @@
 
 #include <GL/freeglut.h>
 
-#include "magnumCompatibility.h"
-
 namespace Magnum {
 
 class Context;
diff --git a/src/Platform/GlxContextHandler.h b/src/Platform/GlxContextHandler.h
index e59eb8083..8922f9bf5 100644
--- a/src/Platform/GlxContextHandler.h
+++ b/src/Platform/GlxContextHandler.h
@@ -27,7 +27,7 @@
 
 #include "AbstractContextHandler.h"
 
-#include "magnumCompatibility.h"
+#include "corradeCompatibility.h"
 
 namespace Magnum { namespace Platform {
 
diff --git a/src/Platform/NaClApplication.h b/src/Platform/NaClApplication.h
index 7a32d68cf..aabdb6c9a 100644
--- a/src/Platform/NaClApplication.h
+++ b/src/Platform/NaClApplication.h
@@ -31,7 +31,7 @@
 #include "Math/Vector2.h"
 #include "Magnum.h"
 
-#include "magnumCompatibility.h"
+#include "corradeCompatibility.h"
 
 namespace pp {
     class Graphics3D;
diff --git a/src/Platform/Sdl2Application.h b/src/Platform/Sdl2Application.h
index ab3eb217d..c7b634d31 100644
--- a/src/Platform/Sdl2Application.h
+++ b/src/Platform/Sdl2Application.h
@@ -26,8 +26,6 @@
 #include <SDL2/SDL_scancode.h>
 #include <Corrade/Containers/EnumSet.h>
 
-#include "magnumCompatibility.h"
-
 namespace Magnum {
 
 class Context;