diff --git a/src/Math/Math.h b/src/Math/Math.h
index c822e3d1e..e6e7e24b5 100644
--- a/src/Math/Math.h
+++ b/src/Math/Math.h
@@ -17,7 +17,7 @@
 
 #include <cstddef>
 
-#include "visibility.h"
+#include "magnumVisibility.h"
 
 /** @file
  * @brief Math constants and utilities
diff --git a/src/MeshTools/FlipNormals.h b/src/MeshTools/FlipNormals.h
index e939bf13b..2c5be2216 100644
--- a/src/MeshTools/FlipNormals.h
+++ b/src/MeshTools/FlipNormals.h
@@ -20,7 +20,7 @@
  */
 
 #include "Magnum.h"
-#include "visibilityMeshTools.h"
+#include "magnumMeshToolsVisibility.h"
 
 namespace Magnum { namespace MeshTools {
 
diff --git a/src/MeshTools/GenerateFlatNormals.h b/src/MeshTools/GenerateFlatNormals.h
index bc702fc3e..1af39d95e 100644
--- a/src/MeshTools/GenerateFlatNormals.h
+++ b/src/MeshTools/GenerateFlatNormals.h
@@ -22,7 +22,7 @@
 #include <tuple>
 
 #include "Magnum.h"
-#include "visibilityMeshTools.h"
+#include "magnumMeshToolsVisibility.h"
 
 namespace Magnum { namespace MeshTools {
 
diff --git a/src/MeshTools/Tipsify.h b/src/MeshTools/Tipsify.h
index 11ba841b7..58e2425e8 100644
--- a/src/MeshTools/Tipsify.h
+++ b/src/MeshTools/Tipsify.h
@@ -22,7 +22,7 @@
 #include <cstddef>
 #include <vector>
 
-#include "visibilityMeshTools.h"
+#include "magnumMeshToolsVisibility.h"
 
 namespace Magnum { namespace MeshTools {
 
diff --git a/src/MeshTools/visibilityMeshTools.h b/src/MeshTools/magnumMeshToolsVisibility.h
similarity index 89%
rename from src/MeshTools/visibilityMeshTools.h
rename to src/MeshTools/magnumMeshToolsVisibility.h
index 4db87ced7..61b0a0d39 100644
--- a/src/MeshTools/visibilityMeshTools.h
+++ b/src/MeshTools/magnumMeshToolsVisibility.h
@@ -1,5 +1,5 @@
-#ifndef Magnum_MeshTools_visibilityMeshTools_h
-#define Magnum_MeshTools_visibilityMeshTools_h
+#ifndef Magnum_MeshTools_magnumMeshToolsVisibility_h
+#define Magnum_MeshTools_magnumMeshToolsVisibility_h
 /*
     Copyright © 2010, 2011, 2012 Vladimír Vondruš <mosra@centrum.cz>
 
diff --git a/src/Physics/AbstractShape.h b/src/Physics/AbstractShape.h
index 80aa4056a..2af5cda40 100644
--- a/src/Physics/AbstractShape.h
+++ b/src/Physics/AbstractShape.h
@@ -20,7 +20,7 @@
  */
 
 #include "Magnum.h"
-#include "visibilityPhysics.h"
+#include "magnumPhysicsVisibility.h"
 
 namespace Magnum { namespace Physics {
 
diff --git a/src/Physics/visibilityPhysics.h b/src/Physics/magnumPhysicsVisibility.h
similarity index 89%
rename from src/Physics/visibilityPhysics.h
rename to src/Physics/magnumPhysicsVisibility.h
index e0e1fec9d..f7af6cd73 100644
--- a/src/Physics/visibilityPhysics.h
+++ b/src/Physics/magnumPhysicsVisibility.h
@@ -1,5 +1,5 @@
-#ifndef Magnum_Physics_visibilityPhysics_h
-#define Magnum_Physics_visibilityPhysics_h
+#ifndef Magnum_Physics_magnumPhysicsVisibility_h
+#define Magnum_Physics_magnumPhysicsVisibility_h
 /*
     Copyright © 2010, 2011, 2012 Vladimír Vondruš <mosra@centrum.cz>
 
diff --git a/src/Shaders/PhongShader.h b/src/Shaders/PhongShader.h
index 1f0285dc0..119676cc4 100644
--- a/src/Shaders/PhongShader.h
+++ b/src/Shaders/PhongShader.h
@@ -20,7 +20,7 @@
  */
 
 #include "AbstractShaderProgram.h"
-#include "visibilityShaders.h"
+#include "magnumShadersVisibility.h"
 
 namespace Magnum { namespace Shaders {
 
diff --git a/src/Shaders/visibilityShaders.h b/src/Shaders/magnumShadersVisibility.h
similarity index 89%
rename from src/Shaders/visibilityShaders.h
rename to src/Shaders/magnumShadersVisibility.h
index b964557a1..75d681731 100644
--- a/src/Shaders/visibilityShaders.h
+++ b/src/Shaders/magnumShadersVisibility.h
@@ -1,5 +1,5 @@
-#ifndef Magnum_Shaders_visibilityShaders_h
-#define Magnum_Shaders_visibilityShaders_h
+#ifndef Magnum_Shaders_magnumShadersVisibility_h
+#define Magnum_Shaders_magnumShadersVisibility_h
 /*
     Copyright © 2010, 2011, 2012 Vladimír Vondruš <mosra@centrum.cz>
 
diff --git a/src/visibility.h b/src/magnumVisibility.h
similarity index 93%
rename from src/visibility.h
rename to src/magnumVisibility.h
index 833cab183..e37af8242 100644
--- a/src/visibility.h
+++ b/src/magnumVisibility.h
@@ -1,5 +1,5 @@
-#ifndef Magnum_visibility_h
-#define Magnum_visibility_h
+#ifndef Magnum_magnumVisibility_h
+#define Magnum_magnumVisibility_h
 /*
     Copyright © 2010, 2011, 2012 Vladimír Vondruš <mosra@centrum.cz>